Pluralise MyModel for Screen and ViewModel

app/src/androidTest/java/android/template/ui/mymodel/MyModelScreenTest.kt → app/src/androidTest/java/android/template/ui/mymodels/MyModelsScreenTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.template.ui.mymodel
+package android.template.ui.mymodels
 
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
@@ -27,18 +27,18 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 /**
- * UI tests for [MyModelScreen].
+ * UI tests for [MyModelsScreen].
  */
 @RunWith(AndroidJUnit4::class)
-class MyModelScreenTest {
+class MyModelsScreenTest {
 
     @get:Rule
     val composeTestRule = createAndroidComposeRule<ComponentActivity>()
 
     @Before
     fun setup() {
         composeTestRule.setContent {
-            MyModelScreen(FAKE_DATA, onSave = {})
+            MyModelsScreen(FAKE_DATA, onSave = {})
         }
     }
 

app/src/main/java/android/template/ui/Navigation.kt

@@ -23,14 +23,14 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import android.template.ui.mymodel.MyModelScreen
+import android.template.ui.mymodels.MyModelsScreen
 
 @Composable
 fun MainNavigation() {
     val navController = rememberNavController()
 
     NavHost(navController = navController, startDestination = "main") {
-        composable("main") { MyModelScreen(modifier = Modifier.padding(16.dp)) }
+        composable("main") { MyModelsScreen(modifier = Modifier.padding(16.dp)) }
         // TODO: Add more destinations
     }
 }

app/src/main/java/android/template/ui/mymodel/MyModelScreen.kt → app/src/main/java/android/template/ui/mymodels/MyModelsScreen.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.template.ui.mymodel
+package android.template.ui.mymodels
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -42,7 +42,7 @@ import android.template.ui.theme.MyApplicationTheme
 import androidx.compose.material3.ExperimentalMaterial3Api
 
 @Composable
-fun MyModelScreen(modifier: Modifier = Modifier, viewModel: MyModelViewModel = hiltViewModel()) {
+fun MyModelsScreen(modifier: Modifier = Modifier, viewModel: MyModelsViewModel = hiltViewModel()) {
     val lifecycle = LocalLifecycleOwner.current.lifecycle
     val items by produceState<MyModelUiState>(
         initialValue = MyModelUiState.Loading,
@@ -54,7 +54,7 @@ fun MyModelScreen(modifier: Modifier = Modifier, viewModel: MyModelViewModel = h
         }
     }
     if (items is MyModelUiState.Success) {
-        MyModelScreen(
+        MyModelsScreen(
             items = (items as MyModelUiState.Success).data,
             onSave = viewModel::addMyModel,
             modifier = modifier
@@ -64,7 +64,7 @@ fun MyModelScreen(modifier: Modifier = Modifier, viewModel: MyModelViewModel = h
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-internal fun MyModelScreen(
+internal fun MyModelsScreen(
     items: List<String>,
     onSave: (name: String) -> Unit,
     modifier: Modifier = Modifier
@@ -96,14 +96,14 @@ internal fun MyModelScreen(
 @Composable
 private fun DefaultPreview() {
     MyApplicationTheme {
-        MyModelScreen(listOf("Compose", "Room", "Kotlin"), onSave = {})
+        MyModelsScreen(listOf("Compose", "Room", "Kotlin"), onSave = {})
     }
 }
 
 @Preview(showBackground = true, widthDp = 480)
 @Composable
 private fun PortraitPreview() {
     MyApplicationTheme {
-        MyModelScreen(listOf("Compose", "Room", "Kotlin"), onSave = {})
+        MyModelsScreen(listOf("Compose", "Room", "Kotlin"), onSave = {})
     }
 }

app/src/main/java/android/template/ui/mymodel/MyModelViewModel.kt → app/src/main/java/android/template/ui/mymodels/MyModelsViewModel.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.template.ui.mymodel
+package android.template.ui.mymodels
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -26,13 +26,13 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import android.template.data.MyModelRepository
-import android.template.ui.mymodel.MyModelUiState.Error
-import android.template.ui.mymodel.MyModelUiState.Loading
-import android.template.ui.mymodel.MyModelUiState.Success
+import android.template.ui.mymodels.MyModelUiState.Error
+import android.template.ui.mymodels.MyModelUiState.Loading
+import android.template.ui.mymodels.MyModelUiState.Success
 import javax.inject.Inject
 
 @HiltViewModel
-class MyModelViewModel @Inject constructor(
+class MyModelsViewModel @Inject constructor(
     private val myModelRepository: MyModelRepository
 ) : ViewModel() {
 

app/src/test/java/android/template/ui/mymodel/MyModelViewModelTest.kt → app/src/test/java/android/template/ui/mymodels/MyModelsViewModelTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.template.ui.mymodel
+package android.template.ui.mymodels
 
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -32,16 +32,16 @@ import android.template.data.MyModelRepository
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 @OptIn(ExperimentalCoroutinesApi::class) // TODO: Remove when stable
-class MyModelViewModelTest {
+class MyModelsViewModelTest {
     @Test
     fun uiState_initiallyLoading() = runTest {
-        val viewModel = MyModelViewModel(FakeMyModelRepository())
+        val viewModel = MyModelsViewModel(FakeMyModelRepository())
         assertEquals(viewModel.uiState.first(), MyModelUiState.Loading)
     }
 
     @Test
     fun uiState_onItemSaved_isDisplayed() = runTest {
-        val viewModel = MyModelViewModel(FakeMyModelRepository())
+        val viewModel = MyModelsViewModel(FakeMyModelRepository())
         assertEquals(viewModel.uiState.first(), MyModelUiState.Loading)
     }
 }

customizer.sh

@@ -73,7 +73,7 @@ then
 fi
 # directories
 echo "Renaming directories to $DATAMODEL"
-find ./ -name "mymodel" -type d  | sed "p;s/mymodel/${DATAMODEL,,}/" |  tr '\n' '\0' | xargs -0 -n 2 mv
+find ./ -name "mymodels" -type d  | sed "p;s/mymodels/${DATAMODEL,,}s/" |  tr '\n' '\0' | xargs -0 -n 2 mv
 
 # Rename app
 if [[ $APPNAME ]]