Merge pull request #120 from EAT-SSU/117-hotfix-one-ANR-two-init

[Hotfix] 앱 실행시 원트: ANR -> 이트: 성공 버그 수정
EAT-SSU · Nov 27, 2023 · 7e95b00 · 7e95b00
2 parents 51139e7 + 1d8bd70
commit 7e95b00
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 46 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         minSdk 23
         compileSdkVersion 34
         targetSdk 34
-        versionCode 3
-        versionName "1.1.1"
+        versionCode 4
+        versionName "1.1.2"
 
 
         buildConfigField "String", "BASE_URL", properties["BASE_URL"]

diff --git a/app/src/main/java/com/eatssu/android/base/BaseActivity.kt b/app/src/main/java/com/eatssu/android/base/BaseActivity.kt
@@ -22,6 +22,7 @@ import com.eatssu.android.ui.common.ForceUpdateDialogActivity
 import com.eatssu.android.ui.common.VersionViewModel
 import com.eatssu.android.ui.common.VersionViewModelFactory
 import com.eatssu.android.util.NetworkConnection
+import com.google.android.material.card.MaterialCardView
 
 
 abstract class BaseActivity<B : ViewBinding>(
@@ -33,7 +34,7 @@ abstract class BaseActivity<B : ViewBinding>(
 
     protected lateinit var toolbar: Toolbar
     protected lateinit var toolbarTitle: TextView
-    protected lateinit var backBtn: ImageButton
+    protected lateinit var backBtn: MaterialCardView
 
     private lateinit var versionViewModel: VersionViewModel
     private lateinit var firebaseRemoteConfigRepository: FirebaseRemoteConfigRepository
@@ -49,7 +50,7 @@ abstract class BaseActivity<B : ViewBinding>(
 
         toolbar = findViewById(R.id.toolbar)
         toolbarTitle = findViewById(R.id.toolbar_title)
-        backBtn =findViewById(R.id.btn_back)
+        backBtn =findViewById(R.id.mcv_setting)
 
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayShowTitleEnabled(false) // 툴바 기본 제목 비활성화

diff --git a/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt b/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt
@@ -56,7 +56,7 @@ class SocialLoginActivity : BaseActivity<ActivitySocialLoginBinding>(ActivitySoc
         val context = this
 
 
-        binding.imbKakao.setOnClickListener {
+        binding.mcvKakaoLogin.setOnClickListener {
 
             Log.d("post", "버튼 클릭")
             lifecycleScope.launch {

diff --git a/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt b/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt
@@ -72,7 +72,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
         // 2. TabLayout과 ViewPager2를 연결하고, TabItem의 메뉴명을 설정한다.
         TabLayoutMediator(tabLayout, viewPager) { tab, position -> tab.text = tabTitles[position] }.attach()
 
-        binding.btnSetting.setOnClickListener {
+        binding.mcvSetting.setOnClickListener {
             val intent = Intent(this, MyPageActivity::class.java)  // 인텐트를 생성해줌,
             startActivity(intent)  // 화면 전환을 시켜줌
         }

diff --git a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt
@@ -9,8 +9,14 @@ import com.eatssu.android.ui.main.menu.MenuFragment
 
 class ViewPager2Adapter(fragmentActivity: FragmentActivity) :
     FragmentStateAdapter(fragmentActivity) {
+
     // 1. ViewPager2에 연결할 Fragment 들을 생성
-    val fragmentList = listOf<Fragment>(MenuFragment(Time.MORNING), MenuFragment(Time.LUNCH), MenuFragment(Time.DINNER))
+    private val fragmentList = listOf(
+        MenuFragment.newInstance(Time.MORNING),
+        MenuFragment.newInstance(Time.LUNCH),
+        MenuFragment.newInstance(Time.DINNER)
+    )
+
     lateinit var menuDate : String
 
     // 2. ViesPager2에서 노출시킬 Fragment 의 갯수 설정

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
@@ -29,7 +29,7 @@ import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
-class MenuFragment(val time: Time) : Fragment() {
+class MenuFragment : Fragment() {
     private var _binding: FragmentMenuBinding? = null
     private val binding get() = _binding!!
 
@@ -46,6 +46,20 @@ class MenuFragment(val time: Time) : Fragment() {
 
     private val totalMenuList = ArrayList<Section>()
 
+
+    companion object {
+        fun newInstance(time: Time): MenuFragment {
+            val fragment = MenuFragment()
+            val args = Bundle()
+            args.putSerializable("TIME", time)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    private val time: Time
+        get() = arguments?.getSerializable("TIME") as Time //Todo deprecated
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
@@ -1,35 +1,52 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
-        android:orientation="horizontal"
-        android:gravity="center_horizontal"
-        android:layout_gravity="center_horizontal"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize">
-
-        <ImageButton
-            android:id="@+id/btn_back"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="start"
-            android:background="@android:color/transparent"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/mcv_setting"
+            app:cardCornerRadius="27.5dp"
+            app:cardElevation="0dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_eat_ssu"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tv_eat_ssu"
+            app:rippleColor="#fff"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:layout_marginStart="20dp"
-            android:src="@drawable/ic_arrow_left"
-            android:scaleType="fitCenter"
-            android:contentDescription="@string/back_btn" />
+            android:backgroundTint="@android:color/transparent"
+            android:clickable="true"
+            android:focusable="true">
+
+            <ImageView
+                android:id="@+id/btn_back"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center"
+                android:background="@android:color/transparent"
+                android:contentDescription="@string/back_btn"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_arrow_left" />
+        </com.google.android.material.card.MaterialCardView>
 
         <TextView
             android:id="@+id/toolbar_title"
+            style="@style/AndroidH2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            style="@style/AndroidH2"
             android:text=""
-            android:textColor="@color/Primary_Light"/>
+            android:textColor="@color/Primary_Light" />
     </androidx.appcompat.widget.Toolbar>
 
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -21,30 +21,40 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
-    <ImageButton
-        android:id="@+id/btn_setting"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/mcv_setting"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:layout_gravity="center"
+        android:backgroundTint="@android:color/transparent"
+        android:clickable="true"
+        android:focusable="true"
         android:layout_marginTop="-5dp"
         android:layout_marginEnd="20dp"
-        android:background="@android:color/transparent"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_dot"
+        app:cardCornerRadius="27.5dp"
+        app:cardElevation="0dp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_eat_ssu"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_eat_ssu"
-        app:layout_constraintVertical_bias="0.5" />
+        app:rippleColor="#fff">
+
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:background="@drawable/ic_dot" />
+
+    </com.google.android.material.card.MaterialCardView>
 
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="vertical"
-        app:layout_constraintTop_toBottomOf="@id/tv_eat_ssu"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_eat_ssu">
 
 
         <LinearLayout
@@ -64,8 +74,8 @@
 
         <!-- TabLayou 을 배치한다. -->
         <com.google.android.material.tabs.TabLayout
-            style="@style/AndroidSubtitle2"
             android:id="@+id/tabLayout"
+            style="@style/AndroidSubtitle2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/activity_social_login.xml b/app/src/main/res/layout/activity_social_login.xml
@@ -13,7 +13,7 @@
         android:layout_width="120dp"
         android:layout_height="120dp"
         android:src="@drawable/image_logo_none"
-        app:layout_constraintBottom_toTopOf="@+id/imb_kakao"
+        app:layout_constraintBottom_toTopOf="@+id/mcv_kakao_login"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -38,19 +38,25 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_title_for_eatssu" />
 
-
-    <ImageButton
-        android:id="@+id/imb_kakao"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/mcv_kakao_login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="30dp"
-        android:layout_marginTop="70dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginBottom="100dp"
-        android:background="@drawable/imgkakao_login_large"
-        android:scaleType="fitCenter"
+        android:clickable="true"
+        app:cardElevation="0dp"
+        android:layout_marginBottom="30dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:rippleColor="@color/gray100"
+        android:focusable="true">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/img_kakao_login_large_wide" />
+
+    </com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">EatSSU</string>
+    <string name="app_name">EAT-SSU</string>
     <string-array name="custom_weekdays">
         <item>월</item>
         <item>화</item>