Merge branch 'release/1.1.11' into develop

EAT-SSU · Apr 3, 2024 · b2de877 · b2de877
2 parents c9b8a4e + 5d65f7c
commit b2de877
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.eatssu.android"
         minSdk 23
         targetSdk 34
-        versionCode 12
-        versionName "1.1.10"
+        versionCode 13
+        versionName "1.1.11"
 
 
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", "\"${properties.get('KAKAO_NATIVE_APP_KEY')}\"")

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 11,
-      "versionName": "1.1.9",
+      "versionCode": 13,
+      "versionName": "1.1.11",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/ReviewListResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/ReviewListResponse.kt
@@ -15,7 +15,7 @@ data class GetReviewListResponse(
         @SerializedName("menu") var menu: String,
         @SerializedName("writerId") var writerId: Long,
         @SerializedName("isWriter") var isWriter: Boolean,
-        @SerializedName("writerNickname") var writerNickname: String,
+        @SerializedName("writerNickname") var writerNickname: String?,
         @SerializedName("mainRating") var mainRating: Int,
         @SerializedName("amountRating") var amountRating: Int,
         @SerializedName("tasteRating") var tasteRating: Int,
@@ -32,7 +32,7 @@ fun GetReviewListResponse.toReviewList(): List<Review> {
             reviewId = data.reviewId,
             isWriter = data.isWriter,
             menu = data.menu,
-            writerNickname = data.writerNickname,
+            writerNickname = data.writerNickname ?: "유저",
             mainGrade = data.mainRating,
             amountGrade = data.amountRating,
             tasteGrade = data.tasteRating,

diff --git a/app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt b/app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt
@@ -15,7 +15,7 @@ class FirebaseRemoteConfigRepository {
     fun init() {
         // Firebase Remote Config 초기화 설정
         val configSettings = FirebaseRemoteConfigSettings.Builder()
-            .setMinimumFetchIntervalInSeconds(3600) // 캐시된 값을 1시간마다 업데이트
+            .setMinimumFetchIntervalInSeconds(600) // 캐시된 값을 1시간마다 업데이트 -> 10분
             .build()
         instance.setConfigSettingsAsync(configSettings)
         instance.setDefaultsAsync(R.xml.firebase_remote_config)

diff --git a/app/src/main/java/com/eatssu/android/ui/login/LoginActivity.kt b/app/src/main/java/com/eatssu/android/ui/login/LoginActivity.kt
@@ -89,4 +89,10 @@ class LoginActivity :
             }
         }
     }
+
+    override fun onBackPressed() {
+        super.onBackPressed()
+        finishAffinity()
+        //탈퇴나 로그아웃 하고 로그인 화면으로 오고, 그 뒤에 뒤로 가기를 눌렀을 때에 백스택 방지
+    }
 }
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
@@ -163,6 +163,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
         lifecycleScope.launch {
             mainViewModel.uiState.collectLatest {
                 if (it.isNicknameNull) {
+                    //닉네임이 null일 때는 닉네임 설정을 안하면 서비스를 못쓰게 막아야함
+                    intent.putExtra("force", true)
                     startActivity<UserNameChangeActivity>()
                     showToast(it.toastMessage)
                 } else {

diff --git a/app/src/main/java/com/eatssu/android/ui/main/MainViewModel.kt b/app/src/main/java/com/eatssu/android/ui/main/MainViewModel.kt
@@ -26,9 +26,9 @@ class MainViewModel @Inject constructor(
     private val _uiState: MutableStateFlow<MainState> = MutableStateFlow(MainState())
     val uiState: StateFlow<MainState> = _uiState.asStateFlow()
 
-    init {
-        checkNameNull()
-    }
+//    init {
+//        checkNameNull()
+//    } 얘 떄문에 두번씩 처리됨.
 
     fun checkNameNull() {
         viewModelScope.launch {

diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeActivity.kt
@@ -19,10 +19,18 @@ class UserNameChangeActivity : BaseActivity<ActivityUserNameChangeBinding>(Activ
 
     private var inputNickname: String = ""
 
+    private var force: Boolean = false
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         toolbarTitle.text = "닉네임 설정" // 툴바 제목 설정
 
+
+        force = intent.getBooleanExtra("force", false)
+        //Todo null 일때 한정으로 화면에서 못 벗어나게 기능 추가
+
+
         binding.btnCheckNickname.isEnabled = false
         binding.btnComplete.isEnabled = false
 
@@ -46,6 +54,17 @@ class UserNameChangeActivity : BaseActivity<ActivityUserNameChangeBinding>(Activ
         setOnClickListener()
     }
 
+//    override fun onBackPressed() {
+//        if (force) {
+//            // force가 true일 때는 뒤로가기 버튼을 무시하고 현재 화면에 머물게 함
+//            // 여기에 다른 동작을 추가할 수도 있음
+//            showToast("닉네임 설정 후, 서비스를 이용하실 수 있습니다.")
+//        } else {
+//            // force가 false일 때는 기본 뒤로가기 동작을 수행
+//            super.onBackPressed()
+//        }
+//    }
+
     private fun setOnClickListener() {
         binding.btnCheckNickname.setOnClickListener {
             userNameChangeViewModel.checkNickname(inputNickname)