Merge branch 'develop' into feature/jaino/#74

.github/workflows/opened-pr-notification.yml

@@ -27,6 +27,7 @@ jobs:
           echo KAKAO_APP_KEY=\"${{ secrets.KAKAO_APP_KEY }}\" >> ./local.properties
           echo SCHEME_KAKAO_APP_KEY=\"${{ secrets.SCHEME_KAKAO_APP_KEY }}\" >> ./local.properties
           echo MOCK_BASE_URL=\"${{ secrets.MOCK_BASE_URL }}\" >> ./local.properties
+          echo FACEBOOK_APP_ID=\"${{ secrets.FACEBOOK_APP_ID }}\" >> ./local.properties
 
       - name: add google-services.json
         run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <application
@@ -29,7 +28,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize"/>
 
 
         <activity

app/src/main/kotlin/com/bff/wespot/AppNavGraphs.kt

@@ -27,7 +27,9 @@ import com.bff.wespot.message.screen.destinations.ReceiverSelectionScreenDestina
 import com.bff.wespot.message.screen.destinations.ReservedMessageScreenDestination
 import com.bff.wespot.message.viewmodel.SendViewModel
 import com.bff.wespot.navigation.Navigator
+import com.bff.wespot.vote.screen.destinations.CharacterSettingScreenDestination
 import com.bff.wespot.vote.screen.destinations.IndividualVoteScreenDestination
+import com.bff.wespot.vote.screen.destinations.IntroductionScreenDestination
 import com.bff.wespot.vote.screen.destinations.VoteHomeScreenDestination
 import com.bff.wespot.vote.screen.destinations.VoteResultScreenDestination
 import com.bff.wespot.vote.screen.destinations.VoteStorageScreenDestination
@@ -54,6 +56,8 @@ object AppNavGraphs {
             VoteResultScreenDestination,
             VoteStorageScreenDestination,
             IndividualVoteScreenDestination,
+            CharacterSettingScreenDestination,
+            IntroductionScreenDestination,
         ).routedIn(this)
             .associateBy { it.route }
     }

app/src/main/kotlin/com/bff/wespot/CommonNavGraphNavigator.kt

@@ -29,14 +29,19 @@ import com.bff.wespot.message.screen.send.MessageWriteNavigator
 import com.bff.wespot.message.screen.send.MessageWriteScreenArgs
 import com.bff.wespot.message.screen.send.ReceiverSelectionNavigator
 import com.bff.wespot.message.screen.send.ReceiverSelectionScreenArgs
+import com.bff.wespot.vote.screen.CharacterSettingNavigator
 import com.bff.wespot.vote.screen.IndividualVoteArgs
 import com.bff.wespot.vote.screen.IndividualVoteNavigator
+import com.bff.wespot.vote.screen.IntroductionArgs
+import com.bff.wespot.vote.screen.IntroductionNavigator
 import com.bff.wespot.vote.screen.VoteNavigator
 import com.bff.wespot.vote.screen.VoteResultNavigator
 import com.bff.wespot.vote.screen.VoteResultScreenArgs
 import com.bff.wespot.vote.screen.VoteStorageNavigator
 import com.bff.wespot.vote.screen.VotingNavigator
+import com.bff.wespot.vote.screen.destinations.CharacterSettingScreenDestination
 import com.bff.wespot.vote.screen.destinations.IndividualVoteScreenDestination
+import com.bff.wespot.vote.screen.destinations.IntroductionScreenDestination
 import com.bff.wespot.vote.screen.destinations.VoteResultScreenDestination
 import com.bff.wespot.vote.screen.destinations.VoteStorageScreenDestination
 import com.bff.wespot.vote.screen.destinations.VotingScreenDestination
@@ -63,7 +68,9 @@ class CommonNavGraphNavigator(
     VoteResultNavigator,
     VoteStorageNavigator,
     ReservedMessageNavigator,
-    IndividualVoteNavigator {
+    IndividualVoteNavigator,
+    CharacterSettingNavigator,
+    IntroductionNavigator {
     override fun navigateUp() {
         navController.navigateUp()
     }
@@ -138,4 +145,12 @@ class CommonNavGraphNavigator(
     override fun navigateToBlockListScreen() {
         navController.navigate(BlockListScreenDestination within navGraph)
     }
+
+    override fun navigateToCharacterScreen() {
+        navController.navigate(CharacterSettingScreenDestination within navGraph)
+    }
+
+    override fun navigateToIntroduction(args: IntroductionArgs) {
+        navController.navigate(IntroductionScreenDestination(args) within navGraph)
+    }
 }

core/model/src/main/kotlin/com/bff/wespot/model/common/BackgroundColor.kt

@@ -0,0 +1,11 @@
+package com.bff.wespot.model.common
+
+data class BackgroundColor(
+    val id: Int,
+    val color: String,
+    val name: String,
+)
+
+data class BackgroundColorList(
+    val backgrounds: List<BackgroundColor>,
+)

core/model/src/main/kotlin/com/bff/wespot/model/common/Character.kt

@@ -0,0 +1,11 @@
+package com.bff.wespot.model.common
+
+data class Character(
+    val id: Int,
+    val name: String,
+    val iconUrl: String,
+)
+
+data class CharacterList(
+    val characters: List<Character>,
+)

core/model/src/main/kotlin/com/bff/wespot/model/ReportType.kt → core/model/src/main/kotlin/com/bff/wespot/model/common/ReportType.kt

@@ -1,4 +1,4 @@
-package com.bff.wespot.model
+package com.bff.wespot.model.common
 
 enum class ReportType {
     MESSAGE,

core/ui/build.gradle.kts

@@ -16,4 +16,5 @@ dependencies {
     implementation(libs.kotlinx.collections.immutable)
     implementation(libs.coil.core)
     implementation(libs.coil.compose)
+    implementation(libs.timber)
 }