Merge pull request #437 from team-mohaeng/develop

Fetch Develop To Release
team-mohaeng · Nov 30, 2021 · 237bb16 · 237bb16
2 parents 7eea3b2 + 8ce29ac
commit 237bb16
Show file tree

Hide file tree

Showing 34 changed files with 102 additions and 86 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,7 +19,7 @@ android {
         applicationId "org.journey.android"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 3
+        versionCode 4
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,12 +19,10 @@
         android:windowSoftInputMode="adjustResize">
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_launcher_foreground" />
+            android:resource="@drawable/mohaeng_char" />
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_color"
             android:resource="@android:color/holo_orange_light" />
-
-        <!-- Set color used with incoming notification messages (알림 채널 메타 데이터 추가) -->
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="@string/default_notification_channel_id" />
@@ -37,7 +35,7 @@
         </service>
 
         <activity
-            android:name="org.journey.android.entry.frame.EntryActivity"
+            android:name="org.journey.android.splash.frame.EntryActivity"
             android:exported="true">
         </activity>
         <activity

diff --git a/app/src/main/java/org/journey/android/challenge/ui/dialog/ChallengeCertifyDialog.kt b/app/src/main/java/org/journey/android/challenge/ui/dialog/ChallengeCertifyDialog.kt
@@ -1,13 +1,11 @@
 package org.journey.android.challenge.ui.dialog
 
-import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import androidx.fragment.app.DialogFragment
-import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import org.journey.android.R
 import org.journey.android.databinding.DialogCertifyChallengeBinding

diff --git a/app/src/main/java/org/journey/android/character/ui/fragment/CharacterFragment.kt b/app/src/main/java/org/journey/android/character/ui/fragment/CharacterFragment.kt
@@ -85,6 +85,7 @@ class CharacterFragment : Fragment() {
     }
 
     private fun selectCharacterOption(){
+        //Default checked index 1 character, skin, option
         viewModel.changeSelectedType(1)
         binding.recyclerviewSelectStyle.apply {
             isNestedScrollingEnabled = false

diff --git a/app/src/main/java/org/journey/android/frame/FrameAdapter.kt b/app/src/main/java/org/journey/android/frame/FrameAdapter.kt
@@ -13,7 +13,7 @@ class FrameAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
             0 -> MainFragment()
             1 -> ChallengeFragment()
             2 -> CommunityFragment()
-            else -> throw RuntimeException("Error")
+            else -> throw RuntimeException("Fragment Load Error")
         }
         notifyDataSetChanged()
     }

diff --git a/app/src/main/java/org/journey/android/frame/MainActivity.kt b/app/src/main/java/org/journey/android/frame/MainActivity.kt
@@ -1,11 +1,6 @@
 package org.journey.android.frame
 
-import android.os.Build
-import android.os.Build.VERSION_CODES
 import android.os.Bundle
-import android.view.View
-import android.view.WindowInsets
-import android.view.WindowInsetsController
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment

diff --git a/app/src/main/java/org/journey/android/login/ui/LoginFragment.kt b/app/src/main/java/org/journey/android/login/ui/LoginFragment.kt
@@ -46,6 +46,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding>() {
         super.onViewCreated(view, savedInstanceState)
         auth = FirebaseAuth.getInstance()
         viewModel.getFcmDeviceToken()
+
         setAction()
         launchKakaoLogin()
         checkLoginSuccess()
@@ -92,6 +93,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding>() {
             try {
                 val task = GoogleSignIn.getSignedInAccountFromIntent(it.data)
                 val account = task.getResult(ApiException::class.java)!!
+
                 firebaseAuthWithGoogle(account.idToken!!)
                 viewModel.saveAccessToken(account.idToken)
 

diff --git a/app/src/main/java/org/journey/android/login/viewmodel/LoginViewModel.kt b/app/src/main/java/org/journey/android/login/viewmodel/LoginViewModel.kt
@@ -11,6 +11,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.journey.android.base.DisposableViewModel
 import org.journey.android.login.controller.SignInController
 import org.journey.android.login.data.request.RequestEmailSignInDTO
+import org.journey.android.network.dto.ResponseAuthDTO
 import org.journey.android.preference.UserPreferenceManager
 import javax.inject.Inject
 
@@ -67,7 +68,7 @@ class LoginViewModel @Inject constructor(
                 }, {
                     it.printStackTrace()
                     _loginSuccess.postValue(false)
-                    Log.e("email signin fail","signin email fail")
+                    _isLoginSuccessed.postValue(LOGIN_UNAUTHORIZATION)
                 })
         )
     }
@@ -107,6 +108,7 @@ class LoginViewModel @Inject constructor(
                     _loginSuccess.postValue(true)
                 },{
                     _loginSuccess.postValue(false)
+                    _isLoginSuccessed.postValue(LOGIN_FAIL)
                     it.printStackTrace()
                 })
         )
@@ -129,4 +131,20 @@ class LoginViewModel @Inject constructor(
     fun saveAccessToken(token: String) {
         userPreferenceManager.saveUserAccessToken(token)
     }
+
+    private fun loginSuccess(response : ResponseAuthDTO) {
+        _isLoginSuccessed.postValue(LOGIN_SUCCESS)
+        userPreferenceManager.apply {
+            saveUserAccessToken(response.accessToken)
+            saveUserEmail(response.userEmail)
+            saveUserRefreshToken(response.refreshToken)
+            saveIsAlreadyLogIn(true)
+        }
+    }
+
+    companion object {
+        const val LOGIN_SUCCESS = "SUCCESS"
+        const val LOGIN_UNAUTHORIZATION = "UNAUTHORIZATION"
+        const val LOGIN_FAIL = "FAIL"
+    }
 }
diff --git a/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingFirstFragment.kt b/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingFirstFragment.kt
@@ -16,7 +16,7 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.journey.android.R
 import org.journey.android.databinding.FragmentOnboardingFirstBinding
-import org.journey.android.entry.frame.EntryActivity
+import org.journey.android.splash.frame.EntryActivity
 import org.journey.android.frame.MainActivity
 import org.journey.android.onboarding.viewmodel.OnboardingViewModel
 import org.journey.android.preference.UserPreferenceManager

diff --git a/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingSixthFragment.kt b/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingSixthFragment.kt
@@ -10,8 +10,7 @@ import androidx.fragment.app.Fragment
 import dagger.hilt.android.AndroidEntryPoint
 import org.journey.android.R
 import org.journey.android.databinding.FragmentOnboardingSixthBinding
-import org.journey.android.entry.frame.EntryActivity
-import org.journey.android.frame.MainActivity
+import org.journey.android.splash.frame.EntryActivity
 import org.journey.android.util.AutoClearedValue
 
 @AndroidEntryPoint

diff --git a/app/src/main/java/org/journey/android/signup/PasswordStatus.kt b/app/src/main/java/org/journey/android/signup/PasswordStatus.kt
@@ -0,0 +1,9 @@
+package org.journey.android.signup
+
+import org.journey.android.R
+
+enum class PasswordStatus(val alertMessage: Int) {
+    NOT_AVAILABLE_PASSWORD(R.string.not_available_password),
+    DOES_NOT_MATCHED_PASSWORD_CHECK(R.string.doesnt_matched_password_check),
+    IS_AVAILABLE_PASSWORD(R.string.is_available_password);
+}
diff --git a/app/src/main/java/org/journey/android/signup/viewmodel/SignupViewModel.kt b/app/src/main/java/org/journey/android/signup/viewmodel/SignupViewModel.kt
@@ -22,4 +22,7 @@ class SignupViewModel @Inject constructor() : DisposableViewModel(){
             serviceAllowed.value = this
         }
     }
+    fun checkEveryPolicyAllowed() {
+        wholePolicyAllowed.value = serviceAgreementList.all { it.value == true }
+    }
 }
diff --git a/...rney/android/entry/frame/EntryActivity.kt → ...ney/android/splash/frame/EntryActivity.kt b/...rney/android/entry/frame/EntryActivity.kt → ...ney/android/splash/frame/EntryActivity.kt
@@ -1,26 +1,18 @@
-package org.journey.android.entry.frame
+package org.journey.android.splash.frame
 
 import android.content.pm.PackageManager
-import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Base64
 import android.util.Log
-import android.view.WindowInsets
-import androidx.annotation.RequiresApi
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
-import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInClient
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.kakao.sdk.common.util.Utility
 import dagger.hilt.android.AndroidEntryPoint
 import org.journey.android.R
 import org.journey.android.databinding.ActivityEntryBinding
-import org.journey.android.preference.SharedPreferencesManager
 import org.journey.android.util.TedRxKeyboardObserver
 import java.security.MessageDigest
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class EntryActivity : AppCompatActivity() {

diff --git a/...ourney/android/entry/ui/SplashFragment.kt → ...urney/android/splash/ui/SplashFragment.kt b/...ourney/android/entry/ui/SplashFragment.kt → ...urney/android/splash/ui/SplashFragment.kt
@@ -1,4 +1,4 @@
-package org.journey.android.entry.ui
+package org.journey.android.splash.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater

diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
@@ -6,7 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".entry.frame.EntryActivity">
+    tools:context=".splash.frame.EntryActivity">
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:name="androidx.navigation.fragment.NavHostFragment"

diff --git a/app/src/main/res/layout/diary_hashtag_count_dialog.xml b/app/src/main/res/layout/diary_hashtag_count_dialog.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    >
+    android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -14,8 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:background="@drawable/delete_dialog"
-        >
+        android:background="@drawable/delete_dialog">
 
         <TextView
             android:id="@+id/textview_hashtag_count_content"
@@ -31,7 +29,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/button_confirm"
                 style="@style/Widget.AppCompat.Button.Borderless"

diff --git a/app/src/main/res/layout/fragment_character.xml b/app/src/main/res/layout/fragment_character.xml
@@ -35,7 +35,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/spoqahansansneoregular"
-                android:text="캐릭터 스타일"
+                android:text="@string/character_style"
                 android:textColor="@color/mohaeng_black"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="@+id/button_return_back"
@@ -111,6 +111,7 @@
                 android:layout_marginHorizontal="16dp"
                 android:orientation="horizontal"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/view_select_character"
                 tools:listitem="@layout/item_select_character" />

diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragment_chat.xml
@@ -17,7 +17,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mohaeng_yellow5">
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_pop_back"
             android:layout_width="44dp"
@@ -27,13 +26,12 @@
             android:background="@drawable/ic_gnbicnback"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_chat_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/spoqahansansneoregular"
-            android:text="알림"
+            android:text="@string/fcm_title"
             android:textColor="@color/mohaeng_black"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="@+id/button_pop_back"
@@ -46,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/gmarketsansttflight"
-            android:text="앗,알림이 없어요!"
+            android:text="@string/none_alarm_ment"
             android:textColor="@color/mohaeng_gray"
             android:textSize="16sp"
             android:visibility="invisible"
@@ -74,7 +72,7 @@
             android:id="@+id/imageview_chat_character"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="18dp"
+            android:layout_marginStart="18dp"
             android:layout_marginTop="16dp"
             android:background="@drawable/ic_mohaeng_rabbit"
             app:layout_constraintStart_toStartOf="parent"
@@ -84,7 +82,7 @@
             android:id="@+id/textview_name_mohaeng"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
             android:fontFamily="@font/gmarketsansttfmedium"
             android:text="모행"
             android:textColor="@color/journey_black2"

diff --git a/app/src/main/res/layout/fragment_course.xml b/app/src/main/res/layout/fragment_course.xml
@@ -30,20 +30,20 @@
             android:id="@+id/textview_course_ing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="현재 진행중인 코스"
+            android:text="@string/ongoing_course"
             android:textColor="@color/mohaeng_black2"
             android:fontFamily="@font/spoqahansansneoregular"
             android:textSize="12sp"
             android:layout_marginTop="48dp"
-            android:layout_marginLeft="18dp"
+            android:layout_marginStart="18dp"
             app:layout_constraintStart_toStartOf="@id/view_head_line"
             app:layout_constraintTop_toTopOf="@id/view_head_line"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_course_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="18dp"
+            android:layout_marginStart="18dp"
             android:layout_marginTop="16dp"
             android:fontFamily="@font/gmarketsansttfmedium"
             android:text="지구촌 촌장되기"
@@ -59,7 +59,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/ic_rect_date4"
-            android:layout_marginLeft="12dp"
+            android:layout_marginStart="12dp"
             android:text="4일차"
             android:fontFamily="@font/gmarketsansttfmedium"
             android:textSize="10sp"

diff --git a/app/src/main/res/layout/fragment_course_catalog.xml b/app/src/main/res/layout/fragment_course_catalog.xml
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
                 android:fontFamily="@font/spoqahansansneoregular"
-                android:text="코스 목록"
+                android:text="@string/course_catalog"
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/fragment_diary_first.xml b/app/src/main/res/layout/fragment_diary_first.xml
@@ -48,7 +48,7 @@
             android:id="@+id/textview_diary_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="18dp"
+            android:layout_marginStart="18dp"
             android:layout_marginTop="32dp"
             android:fontFamily="@font/gmarketsansttfmedium"
             android:text="아라아랑의 오늘은 어땠어?"
@@ -61,7 +61,7 @@
             android:id="@+id/textview_diary_subtext"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="18dp"
+            android:layout_marginStart="18dp"
             android:layout_marginTop="16dp"
             android:fontFamily="@font/spoqahansansneoregular"
             android:text="오늘을 대표하는 기분을 선택해줘"

diff --git a/app/src/main/res/layout/fragment_edit_nick_name.xml b/app/src/main/res/layout/fragment_edit_nick_name.xml
@@ -58,7 +58,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="18dp"
         android:layout_marginTop="28dp"
-        android:hint="아라아랑아라"
+        android:hint="@string/edit_nickname_hint"
         android:inputType="text"
         android:text="@={viewModel.newNickName}"
         android:gravity="center_horizontal"