[chore/#195] change new color scheme (#196)

* chore: change new color scheme * chore: naming * chore: naming lower * chore: missing "1" * chore: change missing color * [Redesign] change home design (#198) * redesign: calendar * redesign: item_cafeteria_section.xml * fix: top 여백을 fragment에서 item으로 변경 * feat: 장소 바인딩
EAT-SSU · Aug 21, 2024 · 8bdd539 · 8bdd539
1 parent 6749a28
commit 8bdd539
Show file tree

Hide file tree

Showing 66 changed files with 565 additions and 2,543 deletions.
diff --git 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
@@ -7,5 +7,6 @@ data class Section(
     val menuType: MenuType,
     val cafeteria: Restaurant,
     val menuList: List<Menu>?,
+    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
@@ -1,17 +1,15 @@
 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
 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,17 +32,16 @@ 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()
         holder.dayText.text =
             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
@@ -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<MenuAdapter.MyViewHolder>() {
 
     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
@@ -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<Boolean>()
     val snackCornerDataLoaded = MutableLiveData<Boolean>()
@@ -47,6 +51,10 @@ class MenuFragment : Fragment() {
 
     private val totalMenuList = ArrayList<Section>()
 
+    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
diff --git a/app/src/main/res/drawable/ic_arrow_left.png b/app/src/main/res/drawable/ic_arrow_left.png
diff --git a/app/src/main/res/drawable/ic_arrow_right.png b/app/src/main/res/drawable/ic_arrow_right.png
diff --git a/app/src/main/res/drawable/ic_info_12.png b/app/src/main/res/drawable/ic_info_12.png
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
@@ -1,4 +1,4 @@
-<vector android:height="30dp" android:tint="@color/Primary_Light"
+<vector android:height="30dp" android:tint="@color/primary"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>

diff --git a/app/src/main/res/drawable/ic_menu_24.png b/app/src/main/res/drawable/ic_menu_24.png
diff --git a/app/src/main/res/drawable/layer_bottom_shadow.xml b/app/src/main/res/drawable/layer_bottom_shadow.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- 하단에 그림자 표시 -->
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="90"
+                android:endColor="@android:color/transparent"
+                android:startColor="#55000000" />
+        </shape>
+    </item>
+
+</layer-list>
diff --git a/app/src/main/res/drawable/layer_progress.xml b/app/src/main/res/drawable/layer_progress.xml
@@ -15,7 +15,7 @@
         <scale android:scaleWidth="100%">
             <shape>
                 <corners android:radius="4dp"/>
-                <solid android:color="@color/Primary_Light"/>
+                <solid android:color="@color/primary"/>
             </shape>
         </scale>
     </item>

diff --git a/app/src/main/res/drawable/selector_background_blue.xml b/app/src/main/res/drawable/selector_background_blue.xml
@@ -2,10 +2,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="false" android:state_pressed="false">
         <shape android:shape="oval">
-            <solid android:color="@color/Primary_Light"/>
+            <solid android:color="@color/primary"/>
             <!-- 선 굵기 -->
             <stroke android:width="1dp"
-                android:color="@color/Primary_Light" />
+                android:color="@color/primary" />
             <!-- 여기 모서리 둥글게 -->
             <corners android:radius="600dp" />
         </shape>

diff --git a/app/src/main/res/drawable/selector_calendar.xml b/app/src/main/res/drawable/selector_calendar.xml
@@ -2,10 +2,8 @@
 <selector android:exitFadeDuration="@android:integer/config_shortAnimTime"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:state_checked="true"
-        android:drawable="@drawable/transparent_calendar_element" />
+        android:drawable="@drawable/shape_transparent_calendar_element" android:state_checked="true" />
     <item
-        android:state_pressed="true"
-        android:drawable="@drawable/transparent_calendar_element" />
+        android:drawable="@drawable/shape_transparent_calendar_element" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/app/src/main/res/drawable/shape_btn.xml b/app/src/main/res/drawable/shape_btn.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <solid android:color="@color/Primary_Light" />
+    <solid android:color="@color/primary" />
     <corners
         android:radius="10dp"/>
     <padding android:right="10dp"

diff --git a/app/src/main/res/drawable/shape_btn_mini.xml b/app/src/main/res/drawable/shape_btn_mini.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <solid android:color="@color/Primary_Light" />
+    <solid android:color="@color/primary" />
     <corners
         android:radius="20dp"/>
     <padding

diff --git a/app/src/main/res/drawable/shape_cafeteria_corner.xml b/app/src/main/res/drawable/shape_cafeteria_corner.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+
+    <corners
+        android:bottomLeftRadius="30dp"
+        android:bottomRightRadius="30dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+</shape>
diff --git a/app/src/main/res/drawable/shape_cafeteria_section.xml b/app/src/main/res/drawable/shape_cafeteria_section.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/gray200" />
+
+    <corners
+        android:bottomLeftRadius="20dp"
+        android:bottomRightRadius="20dp"
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/shape_edittext_small.xml b/app/src/main/res/drawable/shape_edittext_small.xml
@@ -4,7 +4,7 @@
     <solid android:color="@color/white" />
     <stroke
         android:width="1dp"
-        android:color="@color/Primary_Light"/>
+        android:color="@color/primary"/>
     <corners
         android:radius="10dp"/>
     <padding

diff --git a/...drawable/transparent_calendar_element.xml → ...le/shape_transparent_calendar_element.xml b/...drawable/transparent_calendar_element.xml → ...le/shape_transparent_calendar_element.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <solid
-        android:color="@color/Primary_Light"/>
+        android:color="@color/primary"/>
 </shape>
diff --git 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">
 
     <font
-        android:font="@font/noto_bold"
-        app:font="@font/noto_bold" />
+        android:font="@font/pretendard_black"
+        app:font="@font/pretendard_black" />
 
     <font
-        android:font="@font/noto_semibold"
+        android:font="@font/pretendard_bold"
         android:fontWeight="700"
-        app:font="@font/noto_semibold" />
+        app:font="@font/pretendard_bold" />
 
     <font
-        android:font="@font/noto_light"
-        app:font="@font/noto_light" />
+        android:font="@font/pretendard_extrabold"
+        app:font="@font/pretendard_extrabold" />
 
     <font
-        android:font="@font/noto_medium"
-        app:font="@font/noto_medium" />
+        android:font="@font/pretendard_extralight"
+        app:font="@font/pretendard_extralight" />
 
     <font
-        android:font="@font/noto_regular"
-        app:font="@font/noto_regular" />
+        android:font="@font/pretendard_light"
+        app:font="@font/pretendard_light" />
 
     <font
-        android:font="@font/noto_thin"
-        app:font="@font/noto_thin" />
+        android:font="@font/pretendard_medium"
+        app:font="@font/pretendard_medium" />
 
+    <font
+        android:font="@font/pretendard_regular"
+        app:font="@font/pretendard_regular" />
+
+    <font
+        android:font="@font/pretendard_semibold"
+        app:font="@font/pretendard_semibold" />
 
+    <font
+        android:font="@font/pretendard_thin"
+        app:font="@font/pretendard_thin" />
 </font-family>
 
diff --git a/app/src/main/res/font/noto_bold.otf b/app/src/main/res/font/noto_bold.otf
diff --git a/app/src/main/res/font/noto_light.otf b/app/src/main/res/font/noto_light.otf
diff --git a/app/src/main/res/font/noto_medium.otf b/app/src/main/res/font/noto_medium.otf
diff --git a/app/src/main/res/font/noto_regular.otf b/app/src/main/res/font/noto_regular.otf
diff --git a/app/src/main/res/font/noto_semibold.otf b/app/src/main/res/font/noto_semibold.otf
diff --git a/app/src/main/res/font/noto_thin.otf b/app/src/main/res/font/noto_thin.otf
diff --git a/app/src/main/res/font/pretendard_black.ttf b/app/src/main/res/font/pretendard_black.ttf
diff --git a/app/src/main/res/font/pretendard_bold.ttf b/app/src/main/res/font/pretendard_bold.ttf
diff --git a/app/src/main/res/font/pretendard_extrabold.ttf b/app/src/main/res/font/pretendard_extrabold.ttf
diff --git a/app/src/main/res/font/pretendard_extralight.ttf b/app/src/main/res/font/pretendard_extralight.ttf
diff --git a/app/src/main/res/font/pretendard_light.ttf b/app/src/main/res/font/pretendard_light.ttf
diff --git a/app/src/main/res/font/pretendard_medium.ttf b/app/src/main/res/font/pretendard_medium.ttf
diff --git a/app/src/main/res/font/pretendard_regular.ttf b/app/src/main/res/font/pretendard_regular.ttf
diff --git a/app/src/main/res/font/pretendard_semibold.ttf b/app/src/main/res/font/pretendard_semibold.ttf
diff --git a/app/src/main/res/font/pretendard_thin.ttf b/app/src/main/res/font/pretendard_thin.ttf
diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
@@ -41,12 +41,12 @@
 
         <TextView
             android:id="@+id/toolbar_title"
-            style="@style/AndroidH2"
+            style="@style/H2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text=""
-            android:textColor="@color/Primary_Light" />
+            android:textColor="@color/primary" />
     </androidx.appcompat.widget.Toolbar>