Merge branch 'main' into bw/initialMetrics

android · Jun 27, 2022 · 9b66621 · 9b66621
2 parents 0271a9d + 6ac0c13
commit 9b66621
Show file tree

Hide file tree

Showing 92 changed files with 3,213 additions and 2,532 deletions.
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
@@ -32,7 +32,7 @@ jobs:
       - name: Generate cache key
         run: ./scripts/checksum.sh checksum.txt
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches/modules-*
@@ -53,27 +53,27 @@ jobs:
         run: ./gradlew testDemoDebug testProdDebug --stacktrace
 
       - name: Upload Demo build outputs (APKs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build-outputs-demo
           path: app/demo/build/outputs
 
       - name: Upload Prod build outputs (APKs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build-outputs-prod
           path: app/prod/build/outputs
 
       - name: Upload Demo build reports
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build-reports-demo
           path: app/demo/build/reports
 
       - name: Upload Prod build reports
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: build-reports-prod
           path: app/prod/build/reports
@@ -101,7 +101,7 @@ jobs:
       - name: Generate cache key
         run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches/modules-*
@@ -121,7 +121,7 @@ jobs:
 
       - name: Upload test reports
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: test-reports
           path: '*/build/reports/androidTests'
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/README.md b/README.md
@@ -50,6 +50,12 @@ The Now in Android app follows the
 and is described in detail in the
 [architecture learning journey](docs/ArchitectureLearningJourney.md).
 
+# Modularization
+
+The Now in Android app has been fully modularized and you can find the detailed guidance and
+description of the modularization strategy used in
+[modularization learning journey](docs/ModularizationLearningJourney.md).
+
 # Build
 
 The app contains the usual `debug` and `release` build variants. 

diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.kts
@@ -37,6 +37,7 @@ android {
 
 dependencies {
     implementation(project(":core-ui"))
+    implementation(project(":core-designsystem"))
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.accompanist.flowlayout)

diff --git a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
@@ -37,20 +37,20 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.flowlayout.FlowRow
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaDropdownMenuButton
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilledButton
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilterChip
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaNavigationBar
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaNavigationBarItem
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaOutlinedButton
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaTab
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaTabRow
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaTextButton
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaToggleButton
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaTopicTag
-import com.google.samples.apps.nowinandroid.core.ui.component.NiaViewToggleButton
-import com.google.samples.apps.nowinandroid.core.ui.icon.NiaIcons
-import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTheme
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaDropdownMenuButton
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilledButton
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilterChip
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBarItem
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaOutlinedButton
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTab
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTabRow
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTextButton
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaToggleButton
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopicTag
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaViewToggleButton
+import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
+import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 
 /**
  * Now in Android component catalog.
@@ -416,22 +416,22 @@ fun NiaCatalog() {
                     FlowRow(mainAxisSpacing = 16.dp) {
                         var firstChecked by remember { mutableStateOf(false) }
                         NiaFilterChip(
-                            checked = firstChecked,
-                            onCheckedChange = { checked -> firstChecked = checked },
-                            text = { Text(text = "Enabled".uppercase()) }
+                            selected = firstChecked,
+                            onSelectedChange = { checked -> firstChecked = checked },
+                            label = { Text(text = "Enabled".uppercase()) }
                         )
                         var secondChecked by remember { mutableStateOf(true) }
                         NiaFilterChip(
-                            checked = secondChecked,
-                            onCheckedChange = { checked -> secondChecked = checked },
-                            text = { Text(text = "Enabled".uppercase()) }
+                            selected = secondChecked,
+                            onSelectedChange = { checked -> secondChecked = checked },
+                            label = { Text(text = "Enabled".uppercase()) }
                         )
                         var thirdChecked by remember { mutableStateOf(true) }
                         NiaFilterChip(
-                            checked = thirdChecked,
-                            onCheckedChange = { checked -> thirdChecked = checked },
+                            selected = thirdChecked,
+                            onSelectedChange = { checked -> thirdChecked = checked },
                             enabled = false,
-                            text = { Text(text = "Disabled".uppercase()) }
+                            label = { Text(text = "Disabled".uppercase()) }
                         )
                     }
                 }

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -100,6 +100,7 @@ dependencies {
     implementation(project(":feature-topic"))
 
     implementation(project(":core-ui"))
+    implementation(project(":core-designsystem"))
     implementation(project(":core-navigation"))
 
     implementation(project(":sync"))
@@ -129,7 +130,7 @@ dependencies {
         resolutionStrategy {
             force(libs.junit4)
             // Temporary workaround for https://issuetracker.google.com/174733673
-            force("org.objenesis:objenesis:3.2")
+            force("org.objenesis:objenesis:2.6")
         }
     }
 }
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaTopLevelNavigation.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaTopLevelNavigation.kt
@@ -16,15 +16,13 @@
 
 package com.google.samples.apps.nowinandroid.navigation
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Grid3x3
-import androidx.compose.material.icons.filled.Upcoming
-import androidx.compose.material.icons.outlined.Grid3x3
-import androidx.compose.material.icons.outlined.Upcoming
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.tracing.trace
+import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon
+import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon
+import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon
+import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
 import com.google.samples.apps.nowinandroid.feature.foryou.R.string.for_you
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouDestination
 import com.google.samples.apps.nowinandroid.feature.interests.R.string.interests
@@ -62,22 +60,22 @@ class NiaTopLevelNavigation(private val navController: NavHostController) {
 
 data class TopLevelDestination(
     val route: String,
-    val selectedIcon: ImageVector,
-    val unselectedIcon: ImageVector,
+    val selectedIcon: Icon,
+    val unselectedIcon: Icon,
     val iconTextId: Int
 )
 
 val TOP_LEVEL_DESTINATIONS = listOf(
     TopLevelDestination(
         route = ForYouDestination.route,
-        selectedIcon = Icons.Filled.Upcoming,
-        unselectedIcon = Icons.Outlined.Upcoming,
+        selectedIcon = DrawableResourceIcon(NiaIcons.Upcoming),
+        unselectedIcon = DrawableResourceIcon(NiaIcons.UpcomingBorder),
         iconTextId = for_you
     ),
     TopLevelDestination(
         route = InterestsDestination.route,
-        selectedIcon = Icons.Filled.Grid3x3,
-        unselectedIcon = Icons.Outlined.Grid3x3,
+        selectedIcon = ImageVectorIcon(NiaIcons.Grid3x3),
+        unselectedIcon = ImageVectorIcon(NiaIcons.Grid3x3),
         iconTextId = interests
     )
 )
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
@@ -30,27 +30,32 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.NavigationBar
-import androidx.compose.material3.NavigationBarItem
-import androidx.compose.material3.NavigationRail
-import androidx.compose.material3.NavigationRailItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
 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.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBarItem
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRail
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRailItem
+import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon
+import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon
+import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 import com.google.samples.apps.nowinandroid.core.ui.JankMetricDisposableEffect
 import com.google.samples.apps.nowinandroid.core.ui.component.NiaBackground
 import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTheme
@@ -78,7 +83,9 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {
                 containerColor = Color.Transparent,
                 contentColor = MaterialTheme.colorScheme.onBackground,
                 bottomBar = {
-                    if (windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact) {
+                    if (windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact ||
+                        windowSizeClass.heightSizeClass == WindowHeightSizeClass.Compact
+                    ) {
                         NiaBottomBar(
                             onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,
                             currentDestination = currentDestination
@@ -95,7 +102,9 @@ fun NiaApp(windowSizeClass: WindowSizeClass) {
                             )
                         )
                 ) {
-                    if (windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact) {
+                    if (windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact &&
+                        windowSizeClass.heightSizeClass != WindowHeightSizeClass.Compact
+                    ) {
                         NiaNavRail(
                             onNavigateToTopLevelDestination = niaTopLevelNavigation::navigateTo,
                             currentDestination = currentDestination,
@@ -133,18 +142,29 @@ private fun NiaNavRail(
     currentDestination: NavDestination?,
     modifier: Modifier = Modifier,
 ) {
-    NavigationRail(modifier = modifier) {
+    NiaNavigationRail(modifier = modifier) {
         TOP_LEVEL_DESTINATIONS.forEach { destination ->
             val selected =
                 currentDestination?.hierarchy?.any { it.route == destination.route } == true
-            NavigationRailItem(
+            NiaNavigationRailItem(
                 selected = selected,
                 onClick = { onNavigateToTopLevelDestination(destination) },
                 icon = {
-                    Icon(
-                        if (selected) destination.selectedIcon else destination.unselectedIcon,
-                        contentDescription = null
-                    )
+                    val icon = if (selected) {
+                        destination.selectedIcon
+                    } else {
+                        destination.unselectedIcon
+                    }
+                    when (icon) {
+                        is ImageVectorIcon -> Icon(
+                            imageVector = icon.imageVector,
+                            contentDescription = null
+                        )
+                        is DrawableResourceIcon -> Icon(
+                            painter = painterResource(id = icon.id),
+                            contentDescription = null
+                        )
+                    }
                 },
                 label = { Text(stringResource(destination.iconTextId)) }
             )
@@ -160,30 +180,36 @@ private fun NiaBottomBar(
     // Wrap the navigation bar in a surface so the color behind the system
     // navigation is equal to the container color of the navigation bar.
     Surface(color = MaterialTheme.colorScheme.surface) {
-        NavigationBar(
+        NiaNavigationBar(
             modifier = Modifier.windowInsetsPadding(
                 WindowInsets.safeDrawing.only(
                     WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom
                 )
-            ),
-            tonalElevation = 0.dp
+            )
         ) {
 
             TOP_LEVEL_DESTINATIONS.forEach { destination ->
                 val selected =
                     currentDestination?.hierarchy?.any { it.route == destination.route } == true
-                NavigationBarItem(
+                NiaNavigationBarItem(
                     selected = selected,
                     onClick = { onNavigateToTopLevelDestination(destination) },
                     icon = {
-                        Icon(
-                            if (selected) {
-                                destination.selectedIcon
-                            } else {
-                                destination.unselectedIcon
-                            },
-                            contentDescription = null
-                        )
+                        val icon = if (selected) {
+                            destination.selectedIcon
+                        } else {
+                            destination.unselectedIcon
+                        }
+                        when (icon) {
+                            is ImageVectorIcon -> Icon(
+                                imageVector = icon.imageVector,
+                                contentDescription = null
+                            )
+                            is DrawableResourceIcon -> Icon(
+                                painter = painterResource(id = icon.id),
+                                contentDescription = null
+                            )
+                        }
                     },
                     label = { Text(stringResource(destination.iconTextId)) }
                 )