🔀 #19 from boostcampwm-2022/feat/signin

peter-j0y · web-flow · commit 6ddeba0cd6a8 · 2022-11-21T11:34:24.000+09:00
파이어베이스 구글 로그인 로직 구현 및 데이터 스토어에 저장 작업 진행 중
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
         tools:targetApi="31">
         <activity
             android:name="com.whyranoid.signin.SignInActivity"
+            android:theme="@style/Theme.MoGakRun.Splash"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,8 @@ buildscript {
         activityKtxVersion = "1.6.1"
         fragmentKtxVersion = "1.5.4"
         lifecycleViewmodelKtxVersion = "2.5.1"
+        splashVersion = "1.0.0"
+        dataStoreVersion = "1.0.0"
         viewPager2Version = "1.0.0"
     }
     dependencies {
diff --git a/presentation/build.gradle b/presentation/build.gradle
@@ -68,6 +68,9 @@ dependencies {
     // ViewModelScope
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleViewmodelKtxVersion"
 
+    // splash
+    implementation "androidx.core:core-splashscreen:$splashVersion"
+
     // ViewPager2
     implementation "androidx.viewpager2:viewpager2:$viewPager2Version"
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/SignInActivity.kt b/presentation/src/main/java/com/whyranoid/presentation/SignInActivity.kt
diff --git a/presentation/src/main/java/com/whyranoid/presentation/SplashActivity.kt b/presentation/src/main/java/com/whyranoid/presentation/SplashActivity.kt
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt
@@ -1,7 +1,8 @@
-package com.whyranoid.presentation
+package com.whyranoid.presentation.myrun
 
 import android.os.Bundle
 import android.view.View
+import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentMyRunBinding
 
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingFragment.kt
@@ -1,5 +1,6 @@
-package com.whyranoid.presentation
+package com.whyranoid.presentation.myrun
 
+import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentSettingBinding
 
diff --git a/presentation/src/main/res/layout/activity_sign_in.xml b/presentation/src/main/res/layout/activity_sign_in.xml
diff --git a/presentation/src/main/res/layout/activity_splash.xml b/presentation/src/main/res/layout/activity_splash.xml
diff --git a/presentation/src/main/res/layout/fragment_running_start.xml b/presentation/src/main/res/layout/fragment_running_start.xml
@@ -13,6 +13,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <include
+            android:id="@+id/bottom_navigation"
+            layout="@layout/bottom_navigation_bar" />
+
+        <include
+            android:id="@+id/tool_bar"
+            layout="@layout/tool_bar" />
+
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/width_start"
             android:layout_width="wrap_content"
@@ -32,12 +40,12 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginTop="48dp"
+            android:contentDescription="@string/running_start_thumbnail_des"
             android:scaleType="fitXY"
             android:src="@drawable/thumbnail_src_small"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/width_end"
             app:layout_constraintStart_toStartOf="@id/width_start"
-            android:contentDescription="@string/running_start_thumbnail_des"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -96,7 +104,7 @@
             android:layout_height="0dp"
             app:cardBackgroundColor="@color/mogakrun_primary_light"
             app:cardCornerRadius="999dp"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/bottom_navigation"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="@id/width_end"
             app:layout_constraintStart_toStartOf="@id/width_start"
diff --git a/presentation/src/main/res/navigation/navigation_graph.xml b/presentation/src/main/res/navigation/navigation_graph.xml
@@ -3,26 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/navigation_graph.xml"
-    app:startDestination="@id/myRunFragment">
+    app:startDestination="@id/runningStartFragment">
 
-    <activity
-        android:id="@+id/signInActivity"
-        android:name="com.whyranoid.presentation.SignInActivity"
-        android:label="SignInActivity"
-        tools:layout="@layout/activity_sign_in"/>
-    <activity
-        android:id="@+id/splashActivity"
-        android:name="com.whyranoid.presentation.SplashActivity"
-        android:label="SplashActivity"
-        tools:layout="@layout/activity_splash"/>
-    <activity
-        android:id="@+id/mainActivity"
-        android:name="com.whyranoid.presentation.MainActivity"
-        android:label="activity_main"
-        tools:layout="@layout/activity_main" />
     <fragment
         android:id="@+id/myRunFragment"
-        android:name="com.whyranoid.presentation.MyRunFragment"
+        android:name="com.whyranoid.presentation.myrun.MyRunFragment"
         android:label="MyRunFragment"
         tools:layout="@layout/fragment_my_run">
         <action
@@ -31,8 +16,17 @@
     </fragment>
     <fragment
         android:id="@+id/settingFragment"
-        android:name="com.whyranoid.presentation.SettingFragment"
+        android:name="com.whyranoid.presentation.myrun.SettingFragment"
         android:label="SettingFragment"
         tools:layout="@layout/fragment_setting"/>
+    <fragment
+        android:id="@+id/runningStartFragment"
+        android:name="com.whyranoid.presentation.runningstart.RunningStartFragment"
+        android:label="RunningStartFragment"
+        tools:layout="@layout/fragment_running_start">
+        <action
+            android:id="@+id/action_runningStartFragment_to_myRunFragment"
+            app:destination="@id/myRunFragment" />
+    </fragment>
 
 </navigation>
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -7,9 +7,6 @@
     <string name="bottom_navigation_menu_running">러닝</string>
     <string name="bottom_navigation_menu_my_run">마이런</string>
     
-    <!-- 로그인 화면 -->
-    <string name="sign_in_mogakrun_logo_description">로그인 화면의 모각런 로고입니다.</string>
-    
     <!-- 러닝 탭 화면 -->
     <string name="runner_start_runner_unit">명</string>
     <string name="runner_start_prefix">지금,</string>
diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml
@@ -13,4 +13,12 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+
+    <style name="Theme.MoGakRun.Splash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/white</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/thumbnail_src_small</item>
+        <item name="postSplashScreenTheme">@style/Theme.MoGakRun</item>
+        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
 </resources>
diff --git a/signin/build.gradle b/signin/build.gradle
@@ -1,8 +1,13 @@
 plugins {
     id "com.android.library"
     id "org.jetbrains.kotlin.android"
+    id "kotlin-kapt"
+    id "com.google.dagger.hilt.android"
 }
 
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
 android {
     namespace "com.whyranoid.signin"
     compileSdk 33
@@ -11,6 +16,8 @@ android {
         minSdk 23
         targetSdk 33
 
+        buildConfigField "String", "token", properties["token"]
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -26,10 +33,10 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = "11"
     }
-    dataBinding {
-        enable = true
+    buildFeatures{
+        dataBinding true
     }
 }
 
@@ -52,4 +59,15 @@ dependencies {
     implementation platform("com.google.firebase:firebase-bom:$firebaseVersion")
     implementation "com.google.firebase:firebase-auth-ktx"
     implementation "com.google.android.gms:play-services-auth:$playServicesAuthVersion"
+
+    // splash
+    implementation "androidx.core:core-splashscreen:$splashVersion"
+
+    // datastore
+    implementation "androidx.datastore:datastore-preferences:$dataStoreVersion"
+    implementation "androidx.datastore:datastore-preferences-core:$dataStoreVersion"
+
+    // hilt
+    implementation "com.google.dagger:hilt-android:$hiltVersion"
+    kapt "com.google.dagger:hilt-compiler:$hiltVersion"
 }
diff --git a/signin/src/main/java/com/whyranoid/DataStoreModule.kt b/signin/src/main/java/com/whyranoid/DataStoreModule.kt
@@ -0,0 +1,29 @@
+package com.whyranoid
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStoreFile
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+private const val USER_PREFERENCES = "user_preferences"
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DataStoreModule {
+
+    @Singleton
+    @Provides
+    fun providePreferencesDataStore(@ApplicationContext appContext: Context): DataStore<Preferences> =
+        PreferenceDataStoreFactory.create(
+            produceFile = {
+                appContext.preferencesDataStoreFile(USER_PREFERENCES)
+            }
+        )
+}
diff --git a/signin/src/main/java/com/whyranoid/SaveLogInUserInfoUseCase.kt b/signin/src/main/java/com/whyranoid/SaveLogInUserInfoUseCase.kt
@@ -0,0 +1,9 @@
+package com.whyranoid
+
+// class SaveLogInUserInfoUseCase @Inject constructor(
+//    private val signInRepository: SignInRepository
+// ) {
+//    operator fun invoke(uid: String, nickName: String, profileImgUrl: String): Boolean {
+//        //return signInRepository.saveLogInUserInfo(uid, nickName, profileImgUrl)
+//    }
+// }
diff --git a/signin/src/main/java/com/whyranoid/SignInDataSource.kt b/signin/src/main/java/com/whyranoid/SignInDataSource.kt
@@ -0,0 +1,9 @@
+package com.whyranoid
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import javax.inject.Inject
+
+class SignInDataSource @Inject constructor(
+    private val db: DataStore<Preferences>
+)
diff --git a/signin/src/main/java/com/whyranoid/SignInRepository.kt b/signin/src/main/java/com/whyranoid/SignInRepository.kt
@@ -0,0 +1,5 @@
+package com.whyranoid
+
+interface SignInRepository {
+    fun saveLogInUserInfo(uid: String, nickName: String, profileImgUrl: String)
+}
diff --git a/signin/src/main/java/com/whyranoid/SignInRepositoryImpl.kt b/signin/src/main/java/com/whyranoid/SignInRepositoryImpl.kt
@@ -0,0 +1,3 @@
+package com.whyranoid
+
+class SignInRepositoryImpl()
diff --git a/signin/src/main/java/com/whyranoid/SignInViewModel.kt b/signin/src/main/java/com/whyranoid/SignInViewModel.kt
@@ -0,0 +1,10 @@
+package com.whyranoid
+
+// @HiltViewModel
+// class SignInViewModel @Inject constructor(
+//    private val saveLogInUserInfoUseCase: SaveLogInUserInfoUseCase
+// ) : ViewModel() {
+//    fun saveUserInfo() {
+//        // saveLogInUserInfoUseCase()
+//    }
+// }
diff --git a/signin/src/main/java/com/whyranoid/signin/SignInActivity.kt b/signin/src/main/java/com/whyranoid/signin/SignInActivity.kt
diff --git a/signin/src/main/res/layout/activity_sign_in.xml b/signin/src/main/res/layout/activity_sign_in.xml
diff --git a/signin/src/main/res/values/strings.xml b/signin/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ buildscript {`
`20`	`20`	`activityKtxVersion = "1.6.1"`
`21`	`21`	`fragmentKtxVersion = "1.5.4"`
`22`	`22`	`lifecycleViewmodelKtxVersion = "2.5.1"`
	`23`	`+ splashVersion = "1.0.0"`
	`24`	`+ dataStoreVersion = "1.0.0"`
`23`	`25`	`viewPager2Version = "1.0.0"`
`24`	`26`	`}`
`25`	`27`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,9 @@ dependencies {`
`68`	`68`	`// ViewModelScope`
`69`	`69`	`implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleViewmodelKtxVersion"`
`70`	`70`
	`71`	`+ // splash`
	`72`	`+ implementation "androidx.core:core-splashscreen:$splashVersion"`
	`73`	`+`
`71`	`74`	`// ViewPager2`
`72`	`75`	`implementation "androidx.viewpager2:viewpager2:$viewPager2Version"`
`73`	`76`	`}`