Merge pull request #27 from harutiro/features/8

UI をブラッシュアップ

Author: harutiro

.editorconfig

@@ -1,2 +1,4 @@
 [*.{kt,kts}]
 ktlint_standard_package-name = disabled
+ktlint_function_naming_ignore_when_annotated_with = Composable
+

app/build.gradle

@@ -7,6 +7,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint") version "12.1.2"
     id 'com.google.dagger.hilt.android'
     id 'jacoco'
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.0"
 }
 
 android {
@@ -39,6 +40,10 @@ android {
     buildFeatures {
         viewBinding true
         buildConfig true
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion '1.5.0' 
     }
 }
 
@@ -69,13 +74,29 @@ dependencies {
     kapt "com.google.dagger:hilt-compiler:2.55"
     testImplementation "org.mockito:mockito-core:5.2.0"
     testImplementation 'org.mockito:mockito-inline:5.2.0'
+    implementation 'androidx.hilt:hilt-navigation-compose:1.2.0'
 
 
     // Retrofit
     implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
     implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.squareup.moshi:moshi-kotlin:1.14.0")
+
+    // jetpack compose
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.00')
+    implementation composeBom
+    androidTestImplementation composeBom
+    implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.compose.foundation:foundation'
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
+    implementation 'androidx.activity:activity-compose:1.10.0'
+    implementation 'androidx.navigation:navigation-compose:2.8.5'
+    implementation "io.coil-kt:coil-compose:2.4.0"
+    implementation "androidx.compose.material:material-icons-extended:1.7.6"
+
 }
 
 kapt {
@@ -86,11 +107,6 @@ jacoco {
     toolVersion = "0.8.8"
 }
 
-//tasks.withType(Test) {
-//    useJUnitPlatform()
-//    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
-//}
-
 tasks.register("jacocoTestReport", JacocoReport) {
     dependsOn(tasks.test)
 
@@ -111,4 +127,4 @@ tasks.register("jacocoTestReport", JacocoReport) {
             "jacoco/testDebugUnitTest.exec",
             "outputs/code-coverage/connected/*coverage.ec"
     ]))
-}
+}

app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
         android:fullBackupContent="@xml/backup_descriptor"
         android:name=".CodeCheckApplication">
         <activity
-            android:name="jp.co.yumemi.android.code_check.TopActivity"
+            android:name="jp.co.yumemi.android.code_check.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/kotlin/jp/co/yumemi/android/code_check/MainActivity.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2021 YUMEMI Inc. All rights reserved.
+ */
+package jp.co.yumemi.android.code_check
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import dagger.hilt.android.AndroidEntryPoint
+import jp.co.yumemi.android.code_check.core.presenter.MainScreen
+import jp.co.yumemi.android.code_check.core.presenter.theme.CodeCheckAppTheme
+
+@AndroidEntryPoint
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            CodeCheckAppTheme {
+                MainScreen()
+            }
+        }
+    }
+}

app/src/main/kotlin/jp/co/yumemi/android/code_check/TopActivity.kt

@@ -4,7 +4,8 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class RepositoryItem(
+data class RepositoryEntity(
+    val id: Int,
     val name: String,
     val ownerIconUrl: String,
     val language: String,

app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryItem.kt renamed to app/src/main/kotlin/jp/co/yumemi/android/code_check/core/entity/RepositoryEntity.kt

@@ -0,0 +1,126 @@
+package jp.co.yumemi.android.code_check.core.presenter
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.outlined.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import jp.co.yumemi.android.code_check.R
+import jp.co.yumemi.android.code_check.core.presenter.router.BottomNavigationBarRoute
+import jp.co.yumemi.android.code_check.core.presenter.router.MainRouter
+import jp.co.yumemi.android.code_check.core.presenter.widget.EmptyCompose
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MainScreen() {
+    val context = LocalContext.current
+    val appName = context.getString(R.string.app_name)
+
+    val navController = rememberNavController()
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    var topBarTitle by remember {
+        mutableStateOf(appName)
+    }
+
+    val hostState = remember { SnackbarHostState() }
+    var isErrorMessage by remember { mutableStateOf(false) }
+    val scope = rememberCoroutineScope()
+
+    val navigationIcon: @Composable () -> Unit =
+        if (navBackStackEntry?.destination?.route != BottomNavigationBarRoute.SEARCH.route) {
+            {
+                IconButton(onClick = {
+                    navController.popBackStack()
+                }) {
+                    Icon(
+                        imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
+                        contentDescription = "Back",
+                    )
+                }
+            }
+        } else {
+            {
+                EmptyCompose()
+            }
+        }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        text = topBarTitle,
+                        fontWeight = FontWeight.Bold,
+                    )
+                },
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.primaryContainer,
+                        titleContentColor = MaterialTheme.colorScheme.primary,
+                    ),
+                navigationIcon = navigationIcon,
+            )
+        },
+        snackbarHost = { CustomSnackbarHost(hostState = hostState, isErrorMessage = isErrorMessage) },
+    ) { innerPadding ->
+        MainRouter(
+            toDetailScreen = { id ->
+                navController.navigate("${BottomNavigationBarRoute.DETAIL.route}/$id")
+            },
+            toBackScreen = {
+                navController.popBackStack()
+            },
+            changeTopBarTitle = {
+                topBarTitle = it
+            },
+            showSnackbar = { message, isError ->
+                scope.launch {
+                    isErrorMessage = isError
+                    hostState.showSnackbar(message)
+                }
+            },
+            navController = navController,
+            modifier =
+                Modifier
+                    .padding(innerPadding),
+        )
+    }
+}
+
+@Composable
+fun CustomSnackbarHost(
+    hostState: SnackbarHostState,
+    isErrorMessage: Boolean,
+) {
+    SnackbarHost(
+        hostState = hostState,
+    ) { snackbarData ->
+        Snackbar(
+            snackbarData = snackbarData,
+            containerColor = if (isErrorMessage) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primaryContainer,
+            contentColor = if (isErrorMessage) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer,
+        )
+    }
+}