Merge pull request #35 from Dai1678/feature/some_refactor

Feature/some refactor

Author: Dai1678

.github/workflows/build_and_test.yml

@@ -75,13 +75,10 @@ jobs:
       - name: Run kover coverage report
         run: ./gradlew koverXmlReport --no-daemon --stacktrace
 
-      - name: Setup ruby
-        uses: ruby/setup-ruby@v1
+      - name: Upload Coverage to CodeCov
+        uses: codecov/codecov-action@v4
         with:
-          ruby-version: '3.3'
-          bundler-cache: true
-
-      - name: run danger
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: bundle exec danger
+          fail_ci_if_error: true
+          files: ./build/reports/kover/report.xml
+          token: ${{ secrets.CODECOV_TOKEN }} # TODO Add CODECOV_TOKEN to your repository secrets
+          verbose: true

.github/workflows/codeql.yml

@@ -23,8 +23,6 @@ jobs:
         include:
           - language: java-kotlin
             build-mode: manual
-          - language: ruby
-            build-mode: none
 
     steps:
       - uses: actions/checkout@v4

Dangerfile

@@ -48,6 +48,7 @@ dependencies {
   implementation(libs.androidx.navigation.compose)
   implementation(libs.kotlinx.coroutines.android)
   implementation(libs.coil.kt.compose)
+  implementation(libs.timber)
 
   ksp(libs.hilt.compiler)
 

Gemfile

@@ -2,6 +2,18 @@ package dev.dai.android.architecture.template
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
+import timber.log.Timber
 
 @HiltAndroidApp
-class App : Application()
+class App : Application() {
+  override fun onCreate() {
+    super.onCreate()
+    setupTimber()
+  }
+}
+
+private fun setupTimber() {
+  if (BuildConfig.DEBUG) {
+    Timber.plant(Timber.DebugTree())
+  }
+}

app/build.gradle.kts

@@ -4,28 +4,16 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
 import dagger.hilt.android.AndroidEntryPoint
-import dev.dai.android.architecture.designsystem.theme.AndroidArchitectureTemplateTheme
-import dev.dai.android.architecture.template.ui.AppNavHost
+import dev.dai.android.architecture.template.ui.TemplateApp
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     enableEdgeToEdge()
     setContent {
-      AndroidArchitectureTemplateTheme {
-        Surface(
-          modifier = Modifier.fillMaxSize(),
-          color = MaterialTheme.colorScheme.background
-        ) {
-          AppNavHost()
-        }
-      }
+      TemplateApp()
     }
   }
 }

app/src/main/java/dev/dai/android/architecture/template/App.kt

@@ -0,0 +1,20 @@
+package dev.dai.android.architecture.template.ui
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import dev.dai.android.architecture.designsystem.theme.AndroidArchitectureTemplateTheme
+
+@Composable
+fun TemplateApp() {
+  AndroidArchitectureTemplateTheme {
+    Surface(
+      modifier = Modifier.fillMaxSize(),
+      color = MaterialTheme.colorScheme.background
+    ) {
+      AppNavHost()
+    }
+  }
+}

app/src/main/java/dev/dai/android/architecture/template/MainActivity.kt

@@ -21,6 +21,7 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
       }
 
       dependencies {
+        add("implementation", project(":core:common"))
         add("implementation", project(":core:ui"))
         add("implementation", project(":core:designsystem"))
 

app/src/main/java/dev/dai/android/architecture/template/ui/TemplateApp.kt

@@ -0,0 +1 @@
+/build