Merge pull request #162 from Dan-Bam/feature/refactor_module

모듈 리팩토링

Author: 100Seung-Min

.github/workflows/cd.yml

@@ -43,7 +43,7 @@ jobs:
         id: sign_mobile
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: mobile/build/outputs/apk/release
+          releaseDirectory: app/mobile/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -53,7 +53,7 @@ jobs:
         id: sign_tv
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: tv/build/outputs/apk/release
+          releaseDirectory: app/tv/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -63,13 +63,13 @@ jobs:
         uses: actions/upload-artifact@v3.0.0
         with:
           name: mobile-release.apk
-          path: mobile/build/outputs/apk/release/mobile-release-unsigned-signed.apk
+          path: app/mobile/build/outputs/apk/release/mobile-release-unsigned-signed.apk
 
       - name: Upload TV APK
         uses: actions/upload-artifact@v3.0.0
         with:
           name: tv-release.apk
-          path: tv/build/outputs/apk/release/tv-release-unsigned-signed.apk
+          path: app/tv/build/outputs/apk/release/tv-release-unsigned-signed.apk
 
       - name: Get Version & Tag
         id: tag_version
@@ -92,7 +92,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: mobile/build/outputs/apk/release/mobile-release-unsigned-signed.apk
+          asset_path: app/mobile/build/outputs/apk/release/mobile-release-unsigned-signed.apk
           asset_name: mobile-release.apk
           asset_content_type: application/zip
 
@@ -103,6 +103,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: tv/build/outputs/apk/release/tv-release-unsigned-signed.apk
+          asset_path: app/tv/build/outputs/apk/release/tv-release-unsigned-signed.apk
           asset_name: tv-release.apk
           asset_content_type: application/zip

.github/workflows/ci.yml

@@ -36,8 +36,5 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Run ktlint
-        run: ./gradlew ktlintCheck
-
       - name: Build with Gradle
         run: ./gradlew clean assembleDebug

.idea/.name

@@ -0,0 +1,22 @@
+plugins {
+    id("indistraw-app")
+}
+
+android {
+    namespace = "com.danbam.indistraw.app.mobile"
+    defaultConfig {
+        applicationId = "com.danbam.indi_straw.mobile"
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.versionName.get()
+    }
+}
+
+dependencies {
+    implementation(project(":feature:mobile:auth"))
+    implementation(project(":feature:mobile:funding"))
+    implementation(project(":feature:mobile:main"))
+    implementation(project(":feature:mobile:movie"))
+    implementation(project(":feature:mobile:navigation"))
+    implementation(project(":feature:mobile:profile"))
+    implementation(project(":feature:mobile:search"))
+}

.idea/gradle.xml

@@ -13,7 +13,7 @@
         android:required="false" />
 
     <application
-        android:name="com.danbam.mobile.app.IndiStrawApp"
+        android:name="com.danbam.indistraw.app.mobile.app.IndiStrawApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -24,7 +24,7 @@
         android:theme="@style/Theme.Indi_straw"
         android:usesCleartextTraffic="true">
         <activity
-            android:name="com.danbam.mobile.app.BaseActivity"
+            android:name="com.danbam.indistraw.app.mobile.app.BaseActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:screenOrientation="portrait"

data/.gitignore renamed to app/mobile/.gitignore

@@ -1,4 +1,4 @@
-package com.danbam.mobile.app
+package com.danbam.indistraw.app.mobile.app
 
 import android.app.PictureInPictureParams
 import android.os.Bundle
@@ -11,21 +11,18 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.runtime.Composable
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
-import com.danbam.design_system.IndiStrawTheme
-import com.danbam.mobile.ui.main.navigation.MainNavigationItem
-import com.danbam.mobile.ui.auth.navigation.authGraph
-import com.danbam.mobile.ui.main.navigation.mainGraph
-import com.danbam.mobile.ui.movie.navigation.movieGraph
-import com.danbam.mobile.ui.profile.navigation.profileGraph
-import com.danbam.mobile.ui.auth.navigation.signUpGraph
-import com.danbam.mobile.ui.auth.signup.SignUpViewModel
-import com.danbam.mobile.ui.funding.navigation.fundingGraph
-import com.danbam.mobile.ui.movie.make.MakeMovieViewModel
-import com.danbam.mobile.ui.movie.navigation.MovieDeepLinkKey
-import com.danbam.mobile.ui.movie.navigation.MovieNavigationItem
-import com.danbam.mobile.ui.search.navigation.searchGraph
+import com.danbam.indistraw.core.design_system.IndiStrawTheme
+import com.danbam.indistraw.feature.mobile.auth.navigation.authGraph
+import com.danbam.indistraw.feature.mobile.auth.navigation.signUpGraph
+import com.danbam.indistraw.feature.mobile.funding.navigation.fundingGraph
+import com.danbam.indistraw.feature.mobile.main.navigation.mainGraph
+import com.danbam.indistraw.feature.mobile.movie.navigation.movieGraph
+import com.danbam.indistraw.feature.mobile.navigation.main.MainNavigationItem
+import com.danbam.indistraw.feature.mobile.navigation.movie.MovieDeepLinkKey
+import com.danbam.indistraw.feature.mobile.navigation.movie.MovieNavigationItem
+import com.danbam.indistraw.feature.mobile.profile.navigation.profileGraph
+import com.danbam.indistraw.feature.mobile.search.navigation.searchGraph
 import com.google.accompanist.navigation.animation.AnimatedNavHost
 import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import dagger.hilt.android.AndroidEntryPoint

app/mobile/build.gradle.kts

@@ -1,4 +1,4 @@
-package com.danbam.mobile.app
+package com.danbam.indistraw.app.mobile.app
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp

mobile/proguard-rules.pro renamed to app/mobile/proguard-rules.pro

@@ -0,0 +1,19 @@
+plugins {
+    id("indistraw-app")
+}
+
+android {
+    namespace = "com.danbam.indistraw.app.tv"
+    defaultConfig {
+        applicationId = "com.danbam.indi_straw.tv"
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.versionName.get()
+    }
+}
+
+dependencies {
+    implementation(project(":feature:tv:main"))
+    implementation(project(":feature:tv:navigation"))
+    implementation(libs.bundles.tv)
+    implementation(libs.androix.leanback)
+}

mobile/src/main/AndroidManifest.xml renamed to app/mobile/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:required="true" />
 
     <application
-        android:name=".app.IndiStrawApp"
+        android:name="com.danbam.indistraw.app.tv.IndiStrawApp"
         android:allowBackup="true"
         android:banner="@drawable/ic_app"
         android:icon="@mipmap/ic_launcher"
@@ -20,7 +20,7 @@
         android:theme="@style/Theme.Indi_straw">
 
         <activity
-            android:name=".app.BaseActivity"
+            android:name="com.danbam.indistraw.app.tv.BaseActivity"
             android:exported="true"
             android:icon="@drawable/ic_app"
             android:logo="@drawable/ic_app"

mobile/src/main/ic_launcher-playstore.png renamed to app/mobile/src/main/ic_launcher-playstore.png

@@ -1,4 +1,4 @@
-package com.danbam.tv.app
+package com.danbam.indistraw.app.tv
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -10,9 +10,9 @@ import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
-import com.danbam.design_system.IndiStrawTheme
-import com.danbam.tv.ui.main.navigation.MainNavigationItem
-import com.danbam.tv.ui.main.navigation.mainGraph
+import com.danbam.indistraw.core.design_system.IndiStrawTheme
+import com.danbam.indistraw.feature.tv.main.navigation.mainGraph
+import com.danbam.indistraw.feature.tv.navigation.main.MainNavigationItem
 import com.google.accompanist.navigation.animation.AnimatedNavHost
 import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import dagger.hilt.android.AndroidEntryPoint

mobile/src/main/java/com/danbam/mobile/app/BaseActivity.kt renamed to app/mobile/src/main/kotlin/com/danbam/indistraw/app/mobile/app/BaseActivity.kt

@@ -1,4 +1,4 @@
-package com.danbam.tv.app
+package com.danbam.indistraw.app.tv
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp

mobile/src/main/java/com/danbam/mobile/app/IndiStrawApp.kt renamed to app/mobile/src/main/kotlin/com/danbam/indistraw/app/mobile/app/IndiStrawApp.kt

@@ -5,16 +5,12 @@ buildscript {
     }
 
     dependencies {
-        classpath(Dependency.GradlePlugin.GRADLE_ANDROID)
-        classpath(Dependency.GradlePlugin.GRADLE_KOTLIN)
-        classpath(Dependency.GradlePlugin.GRADLE_HILT)
+        classpath(libs.plugin.android)
+        classpath(libs.plugin.kotlin)
+        classpath(libs.plugin.hilt)
     }
 }
 
-plugins {
-    id(Dependency.GradlePlugin.GRADLE_KTLINT) version Version.GRADLE_KTLINT
-}
-
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }

mobile/src/main/res/drawable-v24/ic_launcher_foreground.xml renamed to app/mobile/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,9 +1,16 @@
 plugins {
     `kotlin-dsl`
+    `kotlin-dsl-precompiled-script-plugins`
 }
 
-repositories {
-    google()
-    mavenCentral()
-    gradlePluginPortal()
+val compileKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8.toString()
+    languageVersion = libs.versions.gradleKotlin.get()
+}
+
+dependencies {
+    implementation(libs.plugin.android)
+    implementation(libs.plugin.hilt)
+    implementation(libs.plugin.kotlin)
 }

mobile/src/main/res/drawable/ic_launcher_background.xml renamed to app/mobile/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,23 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+
+@Suppress("UnstableApiUsage")
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+
+    repositories {
+        google()
+        mavenCentral()
+    }
+}