diff --git a/app/build.gradle b/app/build.gradle index d4c7fffd..8cc92d1b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { defaultConfig { applicationId "com.eatssu.android" - minSdk 23 + minSdk 28 targetSdk 34 versionCode 17 versionName "1.1.15" diff --git a/app/src/main/java/com/eatssu/android/data/model/Section.kt b/app/src/main/java/com/eatssu/android/data/model/Section.kt index 34c0443b..9234439d 100644 --- a/app/src/main/java/com/eatssu/android/data/model/Section.kt +++ b/app/src/main/java/com/eatssu/android/data/model/Section.kt @@ -7,5 +7,6 @@ data class Section( val menuType: MenuType, val cafeteria: Restaurant, val menuList: List?, + val cafeteriaLocation: String // val sortOrder: Int ) diff --git a/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarAdapter.kt b/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarAdapter.kt index 5ef2e128..421ee62d 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarAdapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarAdapter.kt @@ -1,9 +1,7 @@ package com.eatssu.android.ui.main.calendar -import android.os.Build import android.view.LayoutInflater import android.view.ViewGroup -import androidx.annotation.RequiresApi import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.eatssu.android.R @@ -11,7 +9,7 @@ import com.eatssu.android.databinding.ItemCalendarListBinding import com.eatssu.android.util.CalendarUtils import java.time.LocalDate import java.time.format.TextStyle -import java.util.* +import java.util.Locale internal class CalendarAdapter( @@ -34,7 +32,6 @@ internal class CalendarAdapter( } - @RequiresApi(Build.VERSION_CODES.O) override fun onBindViewHolder(holder: CalendarViewHolder, position: Int) { val date = days[position] holder.dayOfMonth.text = date.dayOfMonth.toString() @@ -42,9 +39,9 @@ internal class CalendarAdapter( date.dayOfWeek.getDisplayName(TextStyle.SHORT, Locale.KOREAN).toString() if (date == CalendarUtils.selectedDate) { - holder.parentView.setBackgroundResource(R.drawable.selector_background_blue) + //날짜 + holder.dayOfMonth.setBackgroundResource(R.drawable.selector_background_blue) holder.dayOfMonth.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.selector_calendar_colortext)) - holder.dayText.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.selector_calendar_colortext)) } else { holder.parentView.setBackgroundResource(R.drawable.ic_selector_background_white) diff --git a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt index d9347da2..7d8f6858 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt @@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.eatssu.android.data.model.Section -import com.eatssu.android.databinding.ItemSectionBinding +import com.eatssu.android.databinding.ItemCafeteriaSectionBinding import com.eatssu.android.ui.info.InfoActivity class MenuAdapter( @@ -16,7 +16,7 @@ class MenuAdapter( ) : RecyclerView.Adapter() { class MyViewHolder( - private val binding: ItemSectionBinding + private val binding: ItemCafeteriaSectionBinding ) : RecyclerView.ViewHolder(binding.root) { fun bind(sectionModel: Section) { @@ -28,6 +28,8 @@ class MenuAdapter( } binding.tvCafeteria.text = sectionModel.cafeteria.displayName + binding.tvCafeteriaLocation.text = sectionModel.cafeteriaLocation + binding.rvMenu.apply { setHasFixedSize(true) layoutManager = LinearLayoutManager(binding.root.context) @@ -39,7 +41,8 @@ class MenuAdapter( } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder { - return MyViewHolder(ItemSectionBinding.inflate( + return MyViewHolder( + ItemCafeteriaSectionBinding.inflate( LayoutInflater.from(parent.context), parent, false)) } diff --git a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt index b9d89a4d..16c2edb2 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt @@ -17,9 +17,12 @@ import com.eatssu.android.data.enums.MenuType import com.eatssu.android.data.enums.Restaurant import com.eatssu.android.data.enums.Time import com.eatssu.android.data.model.Section +import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository import com.eatssu.android.data.service.MealService import com.eatssu.android.data.service.MenuService import com.eatssu.android.databinding.FragmentMenuBinding +import com.eatssu.android.ui.info.InfoViewModel +import com.eatssu.android.ui.info.InfoViewModelFactory import com.eatssu.android.ui.main.calendar.CalendarViewModel import com.eatssu.android.util.RetrofitImpl import java.time.DayOfWeek @@ -38,6 +41,7 @@ class MenuFragment : Fragment() { private lateinit var mealService: MealService private lateinit var menuDate: String + private lateinit var cafeteriaLocation: String val foodCourtDataLoaded = MutableLiveData() val snackCornerDataLoaded = MutableLiveData() @@ -47,6 +51,10 @@ class MenuFragment : Fragment() { private val totalMenuList = ArrayList
() + private lateinit var infoViewModel: InfoViewModel + private lateinit var restaurantType: Restaurant + private lateinit var firebaseRemoteConfigRepository: FirebaseRemoteConfigRepository + companion object { fun newInstance(time: Time): MenuFragment { @@ -67,6 +75,13 @@ class MenuFragment : Fragment() { savedInstanceState: Bundle?, ): View { _binding = FragmentMenuBinding.inflate(inflater, container, false) + + firebaseRemoteConfigRepository = FirebaseRemoteConfigRepository() + infoViewModel = ViewModelProvider( + this, + InfoViewModelFactory(firebaseRemoteConfigRepository) + )[InfoViewModel::class.java] + return binding.root } @@ -129,7 +144,8 @@ class MenuFragment : Fragment() { Section( MenuType.FIXED, Restaurant.FOOD_COURT, - result.mapFixedMenuResponseToMenu() + result.mapFixedMenuResponseToMenu(), + infoViewModel.foodLocation.value.toString() ) ) } @@ -146,7 +162,8 @@ class MenuFragment : Fragment() { Section( MenuType.FIXED, Restaurant.SNACK_CORNER, - result.mapFixedMenuResponseToMenu() + result.mapFixedMenuResponseToMenu(), + infoViewModel.snackLocation.value.toString() ) ) } @@ -180,7 +197,8 @@ class MenuFragment : Fragment() { Section( MenuType.VARIABLE, Restaurant.HAKSIK, - result.mapTodayMenuResponseToMenu() + result.mapTodayMenuResponseToMenu(), + infoViewModel.haksikLocation.value.toString() ) ) @@ -198,7 +216,8 @@ class MenuFragment : Fragment() { Section( MenuType.VARIABLE, Restaurant.DODAM, - result.mapTodayMenuResponseToMenu() + result.mapTodayMenuResponseToMenu(), + infoViewModel.dodamLocation.value.toString() ) ) } @@ -214,7 +233,8 @@ class MenuFragment : Fragment() { Section( MenuType.VARIABLE, Restaurant.DORMITORY, - result.mapTodayMenuResponseToMenu() + result.mapTodayMenuResponseToMenu(), + infoViewModel.dormitoryLocation.value.toString() ) ) } diff --git a/app/src/main/res/drawable-v24/ic_arrow_left.png b/app/src/main/res/drawable-v24/ic_arrow_left.png deleted file mode 100644 index cc69cc54..00000000 Binary files a/app/src/main/res/drawable-v24/ic_arrow_left.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_arrow_left.png b/app/src/main/res/drawable/ic_arrow_left.png new file mode 100644 index 00000000..654b0d10 Binary files /dev/null and b/app/src/main/res/drawable/ic_arrow_left.png differ diff --git a/app/src/main/res/drawable/ic_arrow_right.png b/app/src/main/res/drawable/ic_arrow_right.png index a226513d..98f0b1cb 100644 Binary files a/app/src/main/res/drawable/ic_arrow_right.png and b/app/src/main/res/drawable/ic_arrow_right.png differ diff --git a/app/src/main/res/drawable/ic_info_12.png b/app/src/main/res/drawable/ic_info_12.png new file mode 100644 index 00000000..fc7153c7 Binary files /dev/null and b/app/src/main/res/drawable/ic_info_12.png differ diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml index 1c3922dd..988af48b 100644 --- a/app/src/main/res/drawable/ic_location.xml +++ b/app/src/main/res/drawable/ic_location.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/ic_menu_24.png b/app/src/main/res/drawable/ic_menu_24.png new file mode 100644 index 00000000..4bae24d7 Binary files /dev/null and b/app/src/main/res/drawable/ic_menu_24.png differ diff --git a/app/src/main/res/drawable/layer_bottom_shadow.xml b/app/src/main/res/drawable/layer_bottom_shadow.xml new file mode 100644 index 00000000..af688ec7 --- /dev/null +++ b/app/src/main/res/drawable/layer_bottom_shadow.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/layer_progress.xml b/app/src/main/res/drawable/layer_progress.xml index be17f305..e68d739d 100644 --- a/app/src/main/res/drawable/layer_progress.xml +++ b/app/src/main/res/drawable/layer_progress.xml @@ -15,7 +15,7 @@ - + diff --git a/app/src/main/res/drawable/selector_background_blue.xml b/app/src/main/res/drawable/selector_background_blue.xml index d4543eff..63376d4a 100644 --- a/app/src/main/res/drawable/selector_background_blue.xml +++ b/app/src/main/res/drawable/selector_background_blue.xml @@ -2,10 +2,10 @@ - + + android:color="@color/primary" /> diff --git a/app/src/main/res/drawable/selector_calendar.xml b/app/src/main/res/drawable/selector_calendar.xml index ad4a83c6..9fe7bed3 100644 --- a/app/src/main/res/drawable/selector_calendar.xml +++ b/app/src/main/res/drawable/selector_calendar.xml @@ -2,10 +2,8 @@ + android:drawable="@drawable/shape_transparent_calendar_element" android:state_checked="true" /> + android:drawable="@drawable/shape_transparent_calendar_element" android:state_pressed="true" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_btn.xml b/app/src/main/res/drawable/shape_btn.xml index 49c590f5..a0249fa6 100644 --- a/app/src/main/res/drawable/shape_btn.xml +++ b/app/src/main/res/drawable/shape_btn.xml @@ -1,7 +1,7 @@ - + - + + + + + + diff --git a/app/src/main/res/drawable/shape_cafeteria_section.xml b/app/src/main/res/drawable/shape_cafeteria_section.xml new file mode 100644 index 00000000..8b01b582 --- /dev/null +++ b/app/src/main/res/drawable/shape_cafeteria_section.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/shape_edittext_small.xml b/app/src/main/res/drawable/shape_edittext_small.xml index 1f63afbb..1662d578 100644 --- a/app/src/main/res/drawable/shape_edittext_small.xml +++ b/app/src/main/res/drawable/shape_edittext_small.xml @@ -4,7 +4,7 @@ + android:color="@color/primary"/> + android:color="@color/primary"/> \ No newline at end of file diff --git a/app/src/main/res/font-v26/font.xml b/app/src/main/res/font-v26/font.xml index f7441df2..699cbc1c 100644 --- a/app/src/main/res/font-v26/font.xml +++ b/app/src/main/res/font-v26/font.xml @@ -3,30 +3,40 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> + android:font="@font/pretendard_black" + app:font="@font/pretendard_black" /> + app:font="@font/pretendard_bold" /> + android:font="@font/pretendard_extrabold" + app:font="@font/pretendard_extrabold" /> + android:font="@font/pretendard_extralight" + app:font="@font/pretendard_extralight" /> + android:font="@font/pretendard_light" + app:font="@font/pretendard_light" /> + android:font="@font/pretendard_medium" + app:font="@font/pretendard_medium" /> + + + + diff --git a/app/src/main/res/font/noto_bold.otf b/app/src/main/res/font/noto_bold.otf deleted file mode 100644 index 5599581d..00000000 Binary files a/app/src/main/res/font/noto_bold.otf and /dev/null differ diff --git a/app/src/main/res/font/noto_light.otf b/app/src/main/res/font/noto_light.otf deleted file mode 100644 index 548e667e..00000000 Binary files a/app/src/main/res/font/noto_light.otf and /dev/null differ diff --git a/app/src/main/res/font/noto_medium.otf b/app/src/main/res/font/noto_medium.otf deleted file mode 100644 index 5ddbbc03..00000000 Binary files a/app/src/main/res/font/noto_medium.otf and /dev/null differ diff --git a/app/src/main/res/font/noto_regular.otf b/app/src/main/res/font/noto_regular.otf deleted file mode 100644 index 7c5c2fae..00000000 Binary files a/app/src/main/res/font/noto_regular.otf and /dev/null differ diff --git a/app/src/main/res/font/noto_semibold.otf b/app/src/main/res/font/noto_semibold.otf deleted file mode 100644 index be388bf5..00000000 Binary files a/app/src/main/res/font/noto_semibold.otf and /dev/null differ diff --git a/app/src/main/res/font/noto_thin.otf b/app/src/main/res/font/noto_thin.otf deleted file mode 100644 index 1299fef0..00000000 Binary files a/app/src/main/res/font/noto_thin.otf and /dev/null differ diff --git a/app/src/main/res/font/pretendard_black.ttf b/app/src/main/res/font/pretendard_black.ttf new file mode 100644 index 00000000..d0c1db81 Binary files /dev/null and b/app/src/main/res/font/pretendard_black.ttf differ diff --git a/app/src/main/res/font/pretendard_bold.ttf b/app/src/main/res/font/pretendard_bold.ttf new file mode 100644 index 00000000..fb07fc65 Binary files /dev/null and b/app/src/main/res/font/pretendard_bold.ttf differ diff --git a/app/src/main/res/font/pretendard_extrabold.ttf b/app/src/main/res/font/pretendard_extrabold.ttf new file mode 100644 index 00000000..9d5fe072 Binary files /dev/null and b/app/src/main/res/font/pretendard_extrabold.ttf differ diff --git a/app/src/main/res/font/pretendard_extralight.ttf b/app/src/main/res/font/pretendard_extralight.ttf new file mode 100644 index 00000000..09e65428 Binary files /dev/null and b/app/src/main/res/font/pretendard_extralight.ttf differ diff --git a/app/src/main/res/font/pretendard_light.ttf b/app/src/main/res/font/pretendard_light.ttf new file mode 100644 index 00000000..2e8541d6 Binary files /dev/null and b/app/src/main/res/font/pretendard_light.ttf differ diff --git a/app/src/main/res/font/pretendard_medium.ttf b/app/src/main/res/font/pretendard_medium.ttf new file mode 100644 index 00000000..1db67c68 Binary files /dev/null and b/app/src/main/res/font/pretendard_medium.ttf differ diff --git a/app/src/main/res/font/pretendard_regular.ttf b/app/src/main/res/font/pretendard_regular.ttf new file mode 100644 index 00000000..01147e99 Binary files /dev/null and b/app/src/main/res/font/pretendard_regular.ttf differ diff --git a/app/src/main/res/font/pretendard_semibold.ttf b/app/src/main/res/font/pretendard_semibold.ttf new file mode 100644 index 00000000..9f2690f0 Binary files /dev/null and b/app/src/main/res/font/pretendard_semibold.ttf differ diff --git a/app/src/main/res/font/pretendard_thin.ttf b/app/src/main/res/font/pretendard_thin.ttf new file mode 100644 index 00000000..fe9825f1 Binary files /dev/null and b/app/src/main/res/font/pretendard_thin.ttf differ diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml index 3242eae6..3ec988e9 100644 --- a/app/src/main/res/layout/activity_base.xml +++ b/app/src/main/res/layout/activity_base.xml @@ -41,12 +41,12 @@ + android:textColor="@color/primary" /> diff --git a/app/src/main/res/layout/activity_fix_menu.xml b/app/src/main/res/layout/activity_fix_menu.xml index 57d5e7cb..550b1cca 100644 --- a/app/src/main/res/layout/activity_fix_menu.xml +++ b/app/src/main/res/layout/activity_fix_menu.xml @@ -18,7 +18,7 @@ app:layout_constraintTop_toTopOf="parent"> + android:background="@color/primary" /> - - + - - - + app:layout_constraintTop_toTopOf="parent"> + android:id="@+id/tv_eat_ssu" + android:layout_width="wrap_content" + android:layout_height="28dp" + android:background="@color/white" + android:src="@drawable/img_app_bar" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + - + + + + + + app:layout_constraintTop_toBottomOf="@id/fl_action_bar"> + + android:src="@drawable/ic_arrow_left" /> + android:textColor="@color/gray600" /> + android:src="@drawable/ic_arrow_right" /> - - + + android:numColumns="7" + android:overScrollMode="never" + android:paddingTop="8dp" + tools:listitem="@layout/item_calendar_list" /> + - - + + android:background="@color/gray100"> + + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_page.xml b/app/src/main/res/layout/activity_my_page.xml index 4f78cab8..1df7041e 100644 --- a/app/src/main/res/layout/activity_my_page.xml +++ b/app/src/main/res/layout/activity_my_page.xml @@ -32,7 +32,7 @@ @@ -20,7 +19,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?android:attr/selectableItemBackground" - android:fontFamily="@font/noto_bold" android:gravity="center" android:text="@string/delete" /> diff --git a/app/src/main/res/layout/activity_my_review_list.xml b/app/src/main/res/layout/activity_my_review_list.xml index f87e7f9a..aea37af7 100644 --- a/app/src/main/res/layout/activity_my_review_list.xml +++ b/app/src/main/res/layout/activity_my_review_list.xml @@ -28,7 +28,7 @@ app:layout_constraintTop_toTopOf="parent" /> + tools:ignore="MissingConstraints" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml index 45e1e6e8..0f191724 100644 --- a/app/src/main/res/layout/activity_report.xml +++ b/app/src/main/res/layout/activity_report.xml @@ -9,7 +9,7 @@ + android:textColor="@color/primary" /> + android:textColor="@color/primary" /> @@ -179,7 +179,7 @@ @@ -208,7 +208,7 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_breakfast.xml b/app/src/main/res/layout/fragment_breakfast.xml deleted file mode 100644 index 0aa626f2..00000000 --- a/app/src/main/res/layout/fragment_breakfast.xml +++ /dev/null @@ -1,662 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dinner.xml b/app/src/main/res/layout/fragment_dinner.xml deleted file mode 100644 index 462083b9..00000000 --- a/app/src/main/res/layout/fragment_dinner.xml +++ /dev/null @@ -1,652 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_lunch.xml b/app/src/main/res/layout/fragment_lunch.xml deleted file mode 100644 index d3d71010..00000000 --- a/app/src/main/res/layout/fragment_lunch.xml +++ /dev/null @@ -1,687 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_menu.xml b/app/src/main/res/layout/fragment_menu.xml index 8c96c60e..53d15dfa 100644 --- a/app/src/main/res/layout/fragment_menu.xml +++ b/app/src/main/res/layout/fragment_menu.xml @@ -1,19 +1,17 @@ + android:orientation="vertical"> + tools:listitem="@layout/item_cafeteria_section" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_section.xml b/app/src/main/res/layout/item_cafeteria_section.xml similarity index 64% rename from app/src/main/res/layout/item_section.xml rename to app/src/main/res/layout/item_cafeteria_section.xml index 9fe928fb..96912697 100644 --- a/app/src/main/res/layout/item_section.xml +++ b/app/src/main/res/layout/item_cafeteria_section.xml @@ -1,8 +1,12 @@ - @@ -10,23 +14,15 @@ android:id="@+id/linearLayout2" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:orientation="horizontal"> - - + android:orientation="horizontal" + android:padding="2dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@+id/cardView" + app:layout_constraintTop_toTopOf="parent"> + + + - + app:cardUseCompatPadding="true" + android:background="@drawable/shape_cafeteria_section" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout2"> + android:background="@color/gray200" /> - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_calendar_list.xml b/app/src/main/res/layout/item_calendar_list.xml index b336d8d6..76b2593e 100644 --- a/app/src/main/res/layout/item_calendar_list.xml +++ b/app/src/main/res/layout/item_calendar_list.xml @@ -1,43 +1,30 @@ - + android:focusable="true" + android:gravity="center" + android:orientation="vertical"> - + android:gravity="center" + android:text="월" + android:textColor="@color/selector_calendar_colortext" /> - - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/item_menu.xml b/app/src/main/res/layout/item_menu.xml index 1a5e8a3b..5af91b19 100644 --- a/app/src/main/res/layout/item_menu.xml +++ b/app/src/main/res/layout/item_menu.xml @@ -1,6 +1,5 @@ - @@ -59,11 +59,11 @@ @@ -95,16 +95,16 @@ + android:textColor="@color/primary" /> + android:textColor="@color/primary" /> + android:textColor="@color/primary" /> - - @@ -92,16 +92,16 @@ + android:textColor="@color/primary" /> + android:textColor="@color/primary" /> + android:textColor="@color/primary" /> - + + - - - - - - - - - - - - - - + - - - - - - - - + @@ -201,8 +195,8 @@ 16sp - + + @@ -32,94 +31,105 @@ - - - - - - - - - - - - - - - + + + + @@ -166,8 +176,9 @@ 18sp @android:color/darker_gray + - + +