Merge pull request #255 from A-fume/featrue/253-info-skip

[feat] 앱 업데이트 기능
Scents-Note · Feb 18, 2023 · 708328d · 708328d
2 parents 5673e6c + a291c16
commit 708328d
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 50 deletions.
diff --git a/app/src/main/java/com/scentsnote/android/data/local/preference/SharedPreferencesManager.kt b/app/src/main/java/com/scentsnote/android/data/local/preference/SharedPreferencesManager.kt
@@ -35,7 +35,7 @@ class SharedPreferencesManager(context: Context){
         get() = sharedPreferences.getString(USER_NICKNAME)
         set(value) = sharedPreferences.putString(USER_NICKNAME, value)
 
-    var userGender: String
+    var userGender: String?
         get() = sharedPreferences.getString(USER_GENDER)
         set(value) = sharedPreferences.putString(USER_GENDER, value)
 
@@ -89,7 +89,7 @@ class SharedPreferencesManager(context: Context){
         private fun SharedPreferences.getString(key: String) =
             getString(key, "").orEmpty()
 
-        private fun SharedPreferences.putString(key: String, value: String) =
+        private fun SharedPreferences.putString(key: String, value: String?) =
             edit().putString(key, value).apply()
 
         private fun SharedPreferences.putInt(key: String, value: Int) =

diff --git a/app/src/main/java/com/scentsnote/android/data/vo/request/RequestEditMyInfo.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestEditMyInfo.kt
@@ -3,6 +3,6 @@ package com.scentsnote.android.data.vo.request
 data class RequestEditMyInfo(
     val email : String,
     val nickname : String,
-    val gender : String,
+    val gender : String?,
     val birth : Int
 )
diff --git a/app/src/main/java/com/scentsnote/android/data/vo/request/RequestRegister.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestRegister.kt
@@ -4,6 +4,6 @@ data class RequestRegister(
     val email : String,
     val nickname : String,
     val password : String,
-    val gender : String,
+    val gender : String?,
     val birth : Int
 )
diff --git a/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseLogin.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseLogin.kt
@@ -3,7 +3,7 @@ package com.scentsnote.android.data.vo.response
 data class ResponseLogin(
     val userIdx : Int,
     val nickname : String,
-    val gender : String,
+    val gender : String?,
     val birth : Int,
     val token : String,
     val refreshToken : String

diff --git a/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt b/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt
@@ -69,15 +69,30 @@ class HomeFragment : Fragment() {
         if(ScentsNoteApplication.prefManager.haveToken()){
             binding.txtHomeNameTitle.text = ScentsNoteApplication.prefManager.userNickname+ getString(R.string.txt_home_title)
             binding.txtHomeAgeTitle.text = getAgeGroupInfo().toString() + "대 " + getGenderInfo()+getString(R.string.txt_home_age)
-            binding.txtHomeNameSubtitle.text = ScentsNoteApplication.prefManager.userNickname+getString(R.string.txt_home_subtitle)
+            binding.txtHomeNameSubtitle.text = setSubTitle()
         }
     }
 
+    private fun setSubTitle() : String{
+        return if(ScentsNoteApplication.prefManager.userAge == getYear() && ScentsNoteApplication.prefManager.userGender?.isEmpty() == false){
+            getString(R.string.txt_home_subtitle_age_null)
+        }else if(ScentsNoteApplication.prefManager.userAge != getYear() && ScentsNoteApplication.prefManager.userGender?.isEmpty() == true){
+            getString(R.string.txt_home_subtitle_gender_null)
+        }else if(ScentsNoteApplication.prefManager.userAge == getYear() && ScentsNoteApplication.prefManager.userGender?.isEmpty() == true ){
+            getString(R.string.txt_home_subtitle_age_gender_null)
+        }else ScentsNoteApplication.prefManager.userNickname+getString(R.string.txt_home_subtitle)
+    }
+
     // 나이 구하기
     private fun getAgeGroupInfo() : Int{
-        val age = getYear() - ScentsNoteApplication.prefManager.userAge + 1
-
-        return (age/10)*10
+        return if(ScentsNoteApplication.prefManager.userAge == getYear()) {
+            20
+        }else{
+            val age = getYear() - ScentsNoteApplication.prefManager.userAge + 1
+            val group= (age/10)*10
+            if(group == 0) 10
+            else group
+        }
     }
 
     // 현재 년도 구하기

diff --git a/app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoViewModel.kt
@@ -22,7 +22,7 @@ class EditMyInfoViewModel : ViewModel() {
 
     // 입력 내용
     val nickTxt = MutableLiveData<String>("")
-    var genderTxt = ""
+    var genderTxt : String? = null
     val ageTxt = MutableLiveData<String>("")
     val passwordTxt = MutableLiveData<String>("")
     val newPasswordTxt = MutableLiveData<String>("")
@@ -41,15 +41,21 @@ class EditMyInfoViewModel : ViewModel() {
         }
     }
 
-    private fun checkGenderInfo(gender : String){
-        if(gender == "MAN"){
-            _isCheckMan.postValue(true)
-            _isCheckWoman.postValue(false)
-            genderTxt = "MAN"
-        }else{
-            _isCheckMan.postValue(false)
-            _isCheckWoman.postValue(true)
-            genderTxt = "WOMAN"
+    private fun checkGenderInfo(gender : String?){
+        genderTxt = when(gender){
+            "MAN" -> {
+                _isCheckMan.postValue(true)
+                _isCheckWoman.postValue(false)
+                "MAN"
+            }
+            "WOMAN" -> {
+                _isCheckMan.postValue(false)
+                _isCheckWoman.postValue(true)
+                "WOMAN"
+            }
+            else -> {
+                ""
+            }
         }
     }
 
@@ -189,7 +195,8 @@ class EditMyInfoViewModel : ViewModel() {
                 val myInfo = RequestEditMyInfo(
                     ScentsNoteApplication.prefManager.userEmail,
                     nickTxt.value.toString(),
-                    genderTxt,
+                    if(genderTxt=="") null
+                    else genderTxt,
                     ageTxt.value!!.toInt()
                 )
                 editRepository.putMyInfo(

diff --git a/app/src/main/java/com/scentsnote/android/ui/splash/SplashActivity.kt b/app/src/main/java/com/scentsnote/android/ui/splash/SplashActivity.kt
@@ -14,8 +14,10 @@ import com.scentsnote.android.databinding.ActivitySplashBinding
 import com.scentsnote.android.ui.MainActivity
 import com.scentsnote.android.ui.survey.SurveyActivity
 import com.scentsnote.android.util.AppUpdateDialog
+import com.scentsnote.android.util.createDialog
 import com.scentsnote.android.util.startActivityWithFinish
 import com.scentsnote.android.util.toast
+import kotlinx.coroutines.*
 
 
 class SplashActivity : AppCompatActivity() {
@@ -31,30 +33,16 @@ class SplashActivity : AppCompatActivity() {
         )
         binding.lifecycleOwner=this
 
-        setDelayed()
+        initObserver()
 //        startAnimation(binding)
 //        setLottieListener(binding)
     }
 
-    private fun setDelayed(){
-        val handler = Handler()
-        handler.postDelayed({
-            goToNextActivity()
-//            if (splashViewModel.isValidVersion.value == true) {
-//                goToNextActivity()
-//            } else {
-//                createDialog()
-//            }
-        }, 2000)
-
-//        CoroutineScope(Dispatchers.IO).launch {
-//            delay(time)
-//            if (splashViewModel.isValidVersion.value == true) {
-//                goToNextActivity()
-//            } else {
-//                createDialog()
-//            }
-//        }
+    private fun initObserver(){
+        splashViewModel.isValidVersion.observe(this){
+            if(it) goToNextActivity()
+            else createDialog()
+        }
     }
 
 //    private fun startAnimation(binding: ActivitySplashBinding){
@@ -98,7 +86,8 @@ class SplashActivity : AppCompatActivity() {
         val dialog: DialogFragment = AppUpdateDialog().AppUpdateDialogBuilder()
             .setBtnClickListener(object : AppUpdateDialog.AppUpdateDialogListener {
                 override fun onPositiveClicked() {
-                    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.afume.afume_android"))
+                    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.scentsnote.android"))
+                    finish()
                     startActivity(intent)
                 }
 

diff --git a/app/src/main/java/com/scentsnote/android/ui/splash/SplashViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/splash/SplashViewModel.kt
@@ -7,14 +7,16 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.scentsnote.android.BuildConfig
 import com.scentsnote.android.data.repository.SplashRepository
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import retrofit2.HttpException
 
 class SplashViewModel : ViewModel() {
     private val splashRepository = SplashRepository()
 
     // 버전 지원 여부 확인
-    private val _isValidVersion = MutableLiveData<Boolean>(false)
+    private val _isValidVersion = MutableLiveData<Boolean>()
     val isValidVersion : LiveData<Boolean>
         get() = _isValidVersion
 
@@ -25,11 +27,15 @@ class SplashViewModel : ViewModel() {
     }
 
     private suspend fun getVersion(){
-        try{
-            _isValidVersion.value = splashRepository.getVersion(BuildConfig.VERSION_NAME)
-            Log.d("getVersion", _isValidVersion.value.toString())
-        }catch (e : HttpException){
-            Log.d("getVersion error", e.message())
+        withContext(viewModelScope.coroutineContext) {
+            delay(1000)
+            try {
+                _isValidVersion.value = splashRepository.getVersion(BuildConfig.VERSION_NAME)
+                Log.d("getVersion", _isValidVersion.value.toString())
+            } catch (e: HttpException) {
+                Log.d("getVersion error", e.message())
+            }
         }
+
     }
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -207,7 +207,7 @@
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                         app:layout_constraintEnd_toEndOf="@+id/cl_home_recent"
                         app:layout_constraintStart_toStartOf="@+id/cl_home_recent"
-                        app:layout_constraintTop_toBottomOf="@+id/txt_details_review_content"
+                        app:layout_constraintTop_toBottomOf="@+id/textView8"
                         tools:listitem="@layout/rv_item_home_recent" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -59,6 +59,9 @@
     <string name="txt_home_title_null">당신을 위한\n향수 추천</string>
     <string name="txt_home_age_null">20대 여성이\n많이 찾는 향수</string>
     <string name="txt_home_subtitle_null">20대 분들에게 인기 많은 향수 입니다.</string>
+    <string name="txt_home_subtitle_age_null">설정에서 연령을 선택하면 더 잘 맞는 향수를 보여드려요</string>
+    <string name="txt_home_subtitle_gender_null">설정에서 성별을 선택하면 더 잘 맞는 향수를 보여드려요</string>
+    <string name="txt_home_subtitle_age_gender_null">설정에서 연령과 성별을 선택하면 더 잘 맞는 향수를 보여드려요</string>
 
     <string name="txt_detail_note_list_empty">아직 등록된 시향노트가 없어요 :)\n이 향수의 첫번째 시향 노트를 작성해보세요!</string>
     <string name="txt_list_empty"> %1$s 리스트를 불러오지 못했어요.\n 잠시 후 다시 시도해주세요.</string>

diff --git a/buildSrc/src/main/java/ConfigData.kt b/buildSrc/src/main/java/ConfigData.kt
@@ -3,8 +3,8 @@ object ConfigData {
     const val buildToolsVersion = "30.0.3"
     const val minSdkVersion = 23
     const val targetSdkVersion = 31
-    const val versionCode = 1
-    const val versionName = "1.0"
+    const val versionCode = 7
+    const val versionName = "1.4.0"
 
     // gradle
     const val gradleVersion = "7.3.1"