feat(app-bar): adds top appbar (#2)

Author: kikin81

.github/workflows/ci.yaml

@@ -21,3 +21,17 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: Build
         run: ./gradlew app:assembleDebug
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 17
+      - name: Setup gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build
+        run: ./gradlew app:spotlessCheck app:lintDebug

app/build.gradle.kts

@@ -52,11 +52,10 @@ dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.activity)
     implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.google.fonts)
     implementation(libs.androidx.compose.navigation)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.material3)
-    implementation(libs.paging)
-    implementation(libs.paging.compose)
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
@@ -69,6 +68,8 @@ dependencies {
     implementation(libs.kotlinx.collections.immutable)
     implementation(libs.lifecycle.viewmodel)
     implementation(libs.lifecycle.viewmodel.compose)
+    implementation(libs.paging)
+    implementation(libs.paging.compose)
     implementation(libs.serialization.json)
     implementation(libs.timber)
 

app/src/main/AndroidManifest.xml

@@ -5,15 +5,16 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".PTPApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".PTPApplication"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Ptp"
+        android:windowSoftInputMode="adjustResize"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
@@ -27,4 +28,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/us/kikin/android/ptp/MainActivity.kt

@@ -22,15 +22,15 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import dagger.hilt.android.AndroidEntryPoint
 import us.kikin.android.ptp.navigation.SafePtpNavGraph
-import us.kikin.android.ptp.ui.theme.PtpTheme
+import us.kikin.android.ptp.ui.theme.AppTheme
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+        super.onCreate(savedInstanceState)
         setContent {
-            PtpTheme {
+            AppTheme {
                 SafePtpNavGraph()
             }
         }

app/src/main/java/us/kikin/android/ptp/carddetail/CardDetailScreen.kt

@@ -43,7 +43,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil3.compose.AsyncImage
 import us.kikin.android.ptp.components.Stepper
 import us.kikin.android.ptp.data.Card
-import us.kikin.android.ptp.ui.theme.PtpTheme
+import us.kikin.android.ptp.ui.theme.AppTheme
 
 @Composable
 fun CardDetailScreen(
@@ -52,7 +52,7 @@ fun CardDetailScreen(
     viewModel: CardDetailViewModel = hiltViewModel(),
     snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
 ) {
-    PtpTheme {
+    AppTheme {
         Scaffold(
             modifier = modifier.fillMaxSize(),
             snackbarHost = { SnackbarHost(snackbarHostState) },

app/src/main/java/us/kikin/android/ptp/cards/CardsScreen.kt

@@ -28,20 +28,28 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material3.Card as MaterialCard
+import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.CircularProgressIndicator
+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.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -54,8 +62,13 @@ import coil3.test.FakeImage
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toPersistentList
+import us.kikin.android.ptp.R
 import us.kikin.android.ptp.data.Card
+import us.kikin.android.ptp.icons.PtpIcons
+import us.kikin.android.ptp.icons.rounded.FilterList
+import us.kikin.android.ptp.ui.theme.AppTheme
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CardsScreen(
     onCardClick: (Card) -> Unit,
@@ -64,26 +77,51 @@ fun CardsScreen(
     viewModel: CardsViewModel = hiltViewModel(),
     snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
 ) {
-    Scaffold(
-        modifier = modifier.fillMaxSize(),
-        snackbarHost = { SnackbarHost(snackbarHostState) },
-    ) { paddingValues ->
-        val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val scaffoldBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
+    AppTheme {
+        Scaffold(
+            modifier = modifier
+                .fillMaxSize()
+                .nestedScroll(scaffoldBehavior.nestedScrollConnection),
+            topBar = {
+                CenterAlignedTopAppBar(
+                    title = {
+                        Text(
+                            text = stringResource(id = R.string.app_name),
+                            style = MaterialTheme.typography.titleLarge,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    },
+                    actions = {
+                        IconButton(onClick = { /*TODO*/ }) {
+                            Icon(
+                                imageVector = PtpIcons.Rounded.FilterList,
+                                contentDescription = stringResource(R.string.card_list_filters),
+                            )
+                        }
+                    },
+                )
+            },
+            snackbarHost = { SnackbarHost(snackbarHostState) },
+        ) { paddingValues ->
+            val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-        CardsContent(
-            cards = uiState.cards.toPersistentList(),
-            onCardClick = onCardClick,
-            isLoading = uiState.isLoading,
-            userMessage = userMessage,
-            modifier = Modifier.padding(paddingValues),
-        )
+            CardsContent(
+                cards = uiState.cards.toPersistentList(),
+                onCardClick = onCardClick,
+                isLoading = uiState.isLoading,
+                userMessage = userMessage,
+                modifier = Modifier.padding(paddingValues),
+            )
 
-        // Check for user messages to display on the screen
-        uiState.userMessage?.let { message ->
-            val snackbarText = stringResource(message)
-            LaunchedEffect(snackbarHostState, viewModel, message, snackbarText) {
-                snackbarHostState.showSnackbar(snackbarText)
-                viewModel.snackbarMessageShown()
+            // Check for user messages to display on the screen
+            uiState.userMessage?.let { message ->
+                val snackbarText = stringResource(message)
+                LaunchedEffect(snackbarHostState, viewModel, message, snackbarText) {
+                    snackbarHostState.showSnackbar(snackbarText)
+                    viewModel.snackbarMessageShown()
+                }
             }
         }
     }

app/src/main/java/us/kikin/android/ptp/components/Stepper.kt

@@ -37,7 +37,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import us.kikin.android.ptp.icons.PtpIcons
 import us.kikin.android.ptp.icons.rounded.Remove
-import us.kikin.android.ptp.ui.theme.PtpTheme
+import us.kikin.android.ptp.ui.theme.AppTheme
 
 @Composable
 fun Stepper(
@@ -89,7 +89,7 @@ fun Stepper(
 @Composable
 @Preview
 internal fun StepperPreview() {
-    PtpTheme {
+    AppTheme {
         var value by remember { mutableIntStateOf(0) }
         Stepper(
             value = value,

app/src/main/java/us/kikin/android/ptp/icons/rounded/Filter.kt

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package us.kikin.android.ptp.icons.rounded
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathFillType
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.StrokeJoin
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+import us.kikin.android.ptp.icons.PtpIcons.Rounded
+
+public val Rounded.FilterList: ImageVector
+    get() {
+        if (_Filter_list != null) {
+            return _Filter_list!!
+        }
+        _Filter_list = ImageVector.Builder(
+            name = "Filter_list",
+            defaultWidth = 24.dp,
+            defaultHeight = 24.dp,
+            viewportWidth = 960f,
+            viewportHeight = 960f,
+        ).apply {
+            path(
+                fill = SolidColor(Color.Black),
+                fillAlpha = 1.0f,
+                stroke = null,
+                strokeAlpha = 1.0f,
+                strokeLineWidth = 1.0f,
+                strokeLineCap = StrokeCap.Butt,
+                strokeLineJoin = StrokeJoin.Miter,
+                strokeLineMiter = 1.0f,
+                pathFillType = PathFillType.NonZero,
+            ) {
+                moveTo(440f, 720f)
+                quadToRelative(-17f, 0f, -28.5f, -11.5f)
+                reflectiveQuadTo(400f, 680f)
+                reflectiveQuadToRelative(11.5f, -28.5f)
+                reflectiveQuadTo(440f, 640f)
+                horizontalLineToRelative(80f)
+                quadToRelative(17f, 0f, 28.5f, 11.5f)
+                reflectiveQuadTo(560f, 680f)
+                reflectiveQuadToRelative(-11.5f, 28.5f)
+                reflectiveQuadTo(520f, 720f)
+                close()
+                moveTo(280f, 520f)
+                quadToRelative(-17f, 0f, -28.5f, -11.5f)
+                reflectiveQuadTo(240f, 480f)
+                reflectiveQuadToRelative(11.5f, -28.5f)
+                reflectiveQuadTo(280f, 440f)
+                horizontalLineToRelative(400f)
+                quadToRelative(17f, 0f, 28.5f, 11.5f)
+                reflectiveQuadTo(720f, 480f)
+                reflectiveQuadToRelative(-11.5f, 28.5f)
+                reflectiveQuadTo(680f, 520f)
+                close()
+                moveTo(160f, 320f)
+                quadToRelative(-17f, 0f, -28.5f, -11.5f)
+                reflectiveQuadTo(120f, 280f)
+                reflectiveQuadToRelative(11.5f, -28.5f)
+                reflectiveQuadTo(160f, 240f)
+                horizontalLineToRelative(640f)
+                quadToRelative(17f, 0f, 28.5f, 11.5f)
+                reflectiveQuadTo(840f, 280f)
+                reflectiveQuadToRelative(-11.5f, 28.5f)
+                reflectiveQuadTo(800f, 320f)
+                close()
+            }
+        }.build()
+        return _Filter_list!!
+    }
+
+private var _Filter_list: ImageVector? = null