Merge branch 'github/main'

docs/ModularizationLearningJourney.md

@@ -183,7 +183,7 @@ Using the above modularization strategy, the Now in Android app has the followin
    </td>
    <td>Making network requests and handling responses from a remote data source.
    </td>
-   <td><code>RetrofitNiANetworkApi</code>
+   <td><code>RetrofitNiaNetworkApi</code>
    </td>
   </tr>
   <tr>
@@ -209,7 +209,7 @@ Using the above modularization strategy, the Now in Android app has the followin
    </td>
    <td>Local database storage using Room.
    </td>
-   <td><code>NiADatabase</code><br>
+   <td><code>NiaDatabase</code><br>
    <code>DatabaseMigrations</code><br>
    <code>Dao</code> classes
    </td>

feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt

@@ -389,8 +389,8 @@ private fun SingleTopicButton(
 
 @Composable
 fun TopicIcon(
-    modifier: Modifier = Modifier,
+    imageUrl: String,
-    imageUrl: String
+    modifier: Modifier = Modifier
 ) {
     AsyncImage(
         // TODO b/228077205, show loading image visual instead of static placeholder

feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt

@@ -49,9 +49,9 @@ import com.google.samples.apps.nowinandroid.core.ui.JankMetricDisposableEffect
 @OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun InterestsRoute(
-    modifier: Modifier = Modifier,
     navigateToAuthor: (String) -> Unit,
     navigateToTopic: (String) -> Unit,
+    modifier: Modifier = Modifier,
     viewModel: InterestsViewModel = hiltViewModel()
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()