Merge pull request #64 from Toongether/release-0.2

[Release] 툰게더 0.2.0 배포하기
toongether · Sep 16, 2023 · e8590cf · e8590cf
2 parents fc3b3df + 0e6b2ef
commit e8590cf
Show file tree

Hide file tree

Showing 208 changed files with 7,562 additions and 1,048 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,17 @@
-# toongether-android
+# 툰게더 Android
+![Toongether](https://hosting.toongether.kr/github-thumbnail.png)
+
+작가에게는 연재의 기회를, 독자에게는 다양한 재미를 제공하는 `툰게더`는 팀 프로그래스에서 개발하는 `웹툰 자유 연재 서비스`입니다.
+
+## 🪶 :: 주요 서비스 기능
+- 웹툰 작품 열람
+- 웹툰 요일별 연재 및 관리
+- 단편 웹툰 게시
+- 작가 중심의 커뮤니티
+
+현재 `프리 릴리즈` 상태로, 사용자들의 피드백을 기반으로 기능을 개선 및 추가해나갈 계획입니다.
+
+## 📝 :: 상세 기술 스택
+- Environment: `Android Studio`, `Kotlin`
+- App: `Jetpack Compose`, `Hilt`, `DataStore`, `Retrofit`, `Coroutine`, `OrbitMVI`, `Kotlin Serialization` 
+- Architecture: `MVI`
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,16 +2,15 @@ plugins {
     id("toongether.android.application")
     id("toongether.android.application.compose")
     id("toongether.android.hilt")
-    id("toongether.kotlin.code")
 }
 
 android {
     namespace = "kr.toongether.android"
 
     defaultConfig {
         applicationId = "kr.toongether.android"
-        versionCode = 1
-        versionName = "0.1"
+        versionCode = 2
+        versionName = "0.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -37,27 +36,13 @@ android {
 
 dependencies {
 
-    implementation(libs.core.ktx)
-    implementation(libs.lifecycle.runtime.ktx)
-    implementation(libs.activity.compose)
-    implementation(libs.ui)
-    implementation(libs.ui.graphics)
-    implementation(libs.ui.tooling.preview)
-    implementation(libs.material3)
-    implementation(libs.androidx.navigation.compose)
-    implementation(libs.navigation.animation)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.espresso.core)
-    androidTestImplementation(libs.ui.test.junit4)
-    debugImplementation(libs.ui.tooling)
-    debugImplementation(libs.ui.test.manifest)
-
     implementation(project(":core:designsystem"))
     implementation(project(":feature:home"))
     implementation(project(":feature:series"))
     implementation(project(":feature:shorts"))
-    implementation(project(":feature:community"))
     implementation(project(":feature:my"))
     implementation(project(":feature:comic"))
+    implementation(project(":feature:auth:login"))
+    implementation(project(":feature:auth:signup"))
+    implementation(project(":feature:episode"))
 }
diff --git a/app/src/main/java/kr/toongether/android/navigation/NavigationDestination.kt b/app/src/main/java/kr/toongether/android/navigation/NavigationDestination.kt
@@ -4,7 +4,6 @@ import androidx.annotation.StringRes
 import androidx.compose.ui.graphics.vector.ImageVector
 import kr.toongether.android.R
 import kr.toongether.designsystem.icon.ToongetherIcons
-import kr.toongether.designsystem.icon.icons.Community
 import kr.toongether.designsystem.icon.icons.Home
 import kr.toongether.designsystem.icon.icons.My
 import kr.toongether.designsystem.icon.icons.Series
@@ -26,10 +25,6 @@ enum class NavigationDestination(
         icon = ToongetherIcons.Shorts,
         iconTextId = R.string.shorts
     ),
-    COMMUNITY(
-        icon = ToongetherIcons.Community,
-        iconTextId = R.string.community
-    ),
     MY(
         icon = ToongetherIcons.My,
         iconTextId = R.string.my

diff --git a/app/src/main/java/kr/toongether/android/navigation/ToongetherNavHost.kt b/app/src/main/java/kr/toongether/android/navigation/ToongetherNavHost.kt
@@ -3,23 +3,25 @@ package kr.toongether.android.navigation
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.navigation.compose.navigation
 import com.google.accompanist.navigation.animation.AnimatedNavHost
 import kr.toongether.android.ui.ToongetherAppState
 import kr.toongether.comic.navigation.comicScreen
-import kr.toongether.community.navigation.communityScreen
+import kr.toongether.episode.navigatoin.episodeScreen
+import kr.toongether.home.navigation.HomeRoute
 import kr.toongether.home.navigation.homeScreen
+import kr.toongether.login.navigation.loginScreen
 import kr.toongether.my.navigation.myScreen
+import kr.toongether.my.navigation.settingScreen
 import kr.toongether.series.navigation.seriesScreen
-import kr.toongether.shorts.navigation.ShortsRoute
 import kr.toongether.shorts.navigation.shortsScreen
+import kr.toongether.signup.navigation.signupScreen
 
 @OptIn(ExperimentalAnimationApi::class)
 @Composable
 fun ToongetherNavHost(
     appState: ToongetherAppState,
     modifier: Modifier = Modifier,
-    startDestination: String = ShortsRoute
+    startDestination: String = HomeRoute
 ) {
     val navController = appState.navController
 
@@ -29,10 +31,13 @@ fun ToongetherNavHost(
         modifier = modifier
     ) {
         homeScreen()
-        seriesScreen()
+        seriesScreen(navController)
         shortsScreen(navController)
-        communityScreen()
-        myScreen()
+        myScreen(navController)
         comicScreen(navController)
+        loginScreen(navController)
+        signupScreen(navController)
+        episodeScreen(navController)
+        settingScreen(navController)
     }
 }
diff --git a/app/src/main/java/kr/toongether/android/ui/ToongetherApp.kt b/app/src/main/java/kr/toongether/android/ui/ToongetherApp.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
@@ -26,7 +25,6 @@ import kr.toongether.designsystem.component.ToongetherNavigationBarItem
 import kr.toongether.designsystem.theme.Gray
 import kr.toongether.designsystem.theme.pretendard
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ToongetherApp(
     appState: ToongetherAppState = rememberToongetherAppState()
@@ -49,7 +47,7 @@ fun ToongetherApp(
                 Modifier
                     .fillMaxSize()
                     .background(Color.Black)
-                    .padding(paddingValues)
+                    .padding(bottom = paddingValues.calculateBottomPadding())
             } else {
                 Modifier
                     .fillMaxSize()

diff --git a/app/src/main/java/kr/toongether/android/ui/ToongetherAppState.kt b/app/src/main/java/kr/toongether/android/ui/ToongetherAppState.kt
@@ -11,11 +11,13 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.navOptions
 import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import kr.toongether.android.navigation.NavigationDestination
-import kr.toongether.comic.navigation.ComicRoute
-import kr.toongether.community.navigation.navigateToCommunity
+import kr.toongether.home.navigation.HomeRoute
 import kr.toongether.home.navigation.navigateToHome
+import kr.toongether.my.navigation.MyRoute
 import kr.toongether.my.navigation.navigateToMy
+import kr.toongether.series.navigation.SeriesRoute
 import kr.toongether.series.navigation.navigateToSeries
+import kr.toongether.shorts.navigation.ShortsRoute
 import kr.toongether.shorts.navigation.navigateToShorts
 
 @OptIn(ExperimentalAnimationApi::class)
@@ -40,8 +42,8 @@ class ToongetherAppState(
 
     val isShowBottomBar: Boolean
         @Composable get() = when (currentDestination?.route) {
-            ComicRoute -> false
-            else -> true
+            HomeRoute, SeriesRoute, ShortsRoute, MyRoute -> true
+            else -> false
         }
 
     fun navigateToNavigationDestination(navigationDestination: NavigationDestination) {
@@ -57,7 +59,6 @@ class ToongetherAppState(
             NavigationDestination.HOME -> navController.navigateToHome(navOptions)
             NavigationDestination.SERIES -> navController.navigateToSeries(navOptions)
             NavigationDestination.SHORTS -> navController.navigateToShorts(navOptions)
-            NavigationDestination.COMMUNITY -> navController.navigateToCommunity(navOptions)
             NavigationDestination.MY -> navController.navigateToMy(navOptions)
         }
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="series">연재</string>
     <string name="shorts">단편</string>
     <string name="community">커뮤니티</string>
-    <string name="my">마이</string>
+    <string name="my">MY</string>
     <string name="title_series">연재 웹툰</string>
     <string name="title_shorts">단편 웹툰</string>
     <string name="title_my">마이 페이지</string>

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -53,5 +53,13 @@ gradlePlugin {
             id = "toongether.kotlin.code"
             implementationClass = "KotlinCodeConventionPlugin"
         }
+        register("") {
+            id = "toongether.kotlin.code"
+            implementationClass = "KotlinCodeConventionPlugin"
+        }
+        register("androidFeature") {
+            id = "toongether.android.feature"
+            implementationClass = "AndroidFeatureConventionPlugin"
+        }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
@@ -7,7 +7,10 @@ import org.gradle.kotlin.dsl.getByType
 class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            pluginManager.apply("com.android.application")
+            with(pluginManager) {
+                apply("com.android.application")
+                apply("toongether.kotlin.code")
+            }
             val extension = extensions.getByType<ApplicationExtension>()
 
             configureAndroidCompose(extension)

diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -10,6 +10,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
+                apply("toongether.kotlin.code")
             }
 
             extensions.configure<ApplicationExtension> {

diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -0,0 +1,50 @@
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.kotlin
+
+class AndroidFeatureConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply {
+                apply("toongether.android.library")
+                apply("toongether.android.hilt")
+                apply("toongether.kotlin.code")
+            }
+            extensions.configure<LibraryExtension> {
+                defaultConfig {
+                    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                }
+            }
+
+            val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+            dependencies {
+                add("implementation", project(":core:model"))
+                add("implementation", project(":core:ui"))
+                add("implementation", project(":core:designsystem"))
+                add("implementation", project(":core:data"))
+                add("implementation", project(":core:domain"))
+
+                add("testImplementation", kotlin("test"))
+                add("androidTestImplementation", kotlin("test"))
+
+                add("implementation", libs.findLibrary("androidx.hilt.navigation.compose").get())
+                add("implementation", libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
+                add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
+                add("implementation", libs.findLibrary("orbit.mvi.viewmodel").get())
+                add("implementation", libs.findLibrary("orbit.mvi.compose").get())
+
+                add("implementation", libs.findLibrary("kotlinx.coroutines.android").get())
+
+                add("testImplementation", libs.findLibrary("junit4").get())
+                add("androidTestImplementation", libs.findLibrary("androidx.test.runner").get())
+                add("androidTestImplementation", libs.findLibrary("androidx.test.espresso.core").get())
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
@@ -2,14 +2,21 @@ import com.android.build.gradle.LibraryExtension
 import kr.toongether.android.configureAndroidCompose
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.kotlin
 
 class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            pluginManager.apply("com.android.library")
+            with(pluginManager) {
+                apply("com.android.library")
+                apply("toongether.kotlin.code")
+            }
             val extension = extensions.getByType<LibraryExtension>()
             configureAndroidCompose(extension)
+
         }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -15,12 +15,24 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("com.android.library")
                 apply("org.jetbrains.kotlin.android")
+                apply("toongether.kotlin.code")
             }
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 33
             }
+
+            val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+            configurations.configureEach {
+                resolutionStrategy {
+                    force(libs.findLibrary("junit4").get())
+                }
+            }
+            dependencies {
+                add("androidTestImplementation", kotlin("test"))
+                add("testImplementation", kotlin("test"))
+            }
         }
     }
 

diff --git a/build-logic/convention/src/main/kotlin/kr/toongether/android/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/kr/toongether/android/AndroidCompose.kt
@@ -24,9 +24,18 @@ internal fun Project.configureAndroidCompose(
         }
 
         dependencies {
-            val bom = libs.findLibrary("compose-bom").get()
+            val bom = libs.findLibrary("androidx-compose-bom").get()
             add("implementation", platform(bom))
             add("androidTestImplementation", platform(bom))
+
+            add("implementation", libs.findLibrary("androidx.compose.material3").get())
+            add("implementation", libs.findLibrary("androidx.compose.material").get())
+            add("implementation", libs.findLibrary("androidx.navigation.compose").get())
+            add("implementation", libs.findLibrary("navigation.animation").get())
+
+            add("androidTestImplementation", libs.findLibrary("androidx.test.espresso.core").get())
+            add("androidTestImplementation", libs.findLibrary("androidx.test.runner").get())
+            add("androidTestImplementation", libs.findLibrary("androidx.test.ext").get())
         }
     }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,4 +7,5 @@ plugins {
     alias(libs.plugins.detekt) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
 }
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -5,5 +5,9 @@ plugins {
 
 android {
     namespace = "kr.toongether.common"
+}
 
-}
+dependencies {
+    implementation(libs.retrofit.core)
+    implementation(libs.kotlinx.datetime)
+}