review: review fixes

Author: EmogurovAnton

README.md

@@ -354,7 +354,7 @@ AboutAppPlugin(
 
 Каждый `AboutAppInfo` содержит:
 - `title` — название поля (например, «Версия»)
-- `content` — значение поля (например, «1.0.0»)
+- `value` — значение поля (например, «1.0.0»)
 
 # Безопасность!
 Для того чтобы тестовые данные не попали в релизные сборки рекомендуется не задавать их явно в Application классе, а использовать реализации DebugDataProvider, которые можно разнести по разным buildType. Для release версии следует сделать пустую реализацию.

panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/aboutapp/AboutAppInfo.kt

@@ -1,6 +1,6 @@
-package com.redmadrobot.debug.noop.plugin.aboutapp
+package com.redmadrobot.debug.plugin.aboutapp
 
 data class AboutAppInfo(
     val title: String,
-    val content: String
+    val value: String
 )

panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/aboutapp/AboutAppPlugin.kt

@@ -1,5 +1,5 @@
-package com.redmadrobot.debug.noop.plugin.aboutapp
+package com.redmadrobot.debug.plugin.aboutapp
 
 class AboutAppPlugin(
-    private val aboutAppInfo: List<AboutAppInfo> = emptyList()
+    private val appInfoList: List<AboutAppInfo> = emptyList()
 )

plugins/plugin-about-app/src/main/kotlin/com/redmadrobot/debug/plugin/aboutapp/AboutAppPlugin.kt

@@ -9,10 +9,10 @@ import com.redmadrobot.debug.plugin.aboutapp.model.AboutAppInfo
 import com.redmadrobot.debug.plugin.aboutapp.ui.AboutAppScreen
 
 public class AboutAppPlugin(
-    private val aboutAppInfo: List<AboutAppInfo>
+    private val appInfoList: List<AboutAppInfo>
 ) : Plugin(), EditablePlugin {
     init {
-        aboutAppInfo.firstOrNull()
+        appInfoList.firstOrNull()
             ?: error("AboutAppPlugin can't be initialized. At least one information block must be set.")
     }
 
@@ -21,7 +21,7 @@ public class AboutAppPlugin(
     }
 
     override fun getPluginContainer(commonContainer: CommonContainer): PluginDependencyContainer {
-        return AboutAppPluginContainer(aboutAppInfo = aboutAppInfo)
+        return AboutAppPluginContainer(appInfoList = appInfoList)
     }
 
     override fun getName(): String = NAME

plugins/plugin-about-app/src/main/kotlin/com/redmadrobot/debug/plugin/aboutapp/AboutAppPluginContainer.kt

@@ -5,9 +5,9 @@ import com.redmadrobot.debug.plugin.aboutapp.model.AboutAppInfo
 import com.redmadrobot.debug.plugin.aboutapp.ui.AboutAppViewModel
 
 internal class AboutAppPluginContainer(
-    private val aboutAppInfo: List<AboutAppInfo>
+    private val appInfoList: List<AboutAppInfo>
 ) : PluginDependencyContainer {
     fun createAboutAppViewModel(): AboutAppViewModel {
-        return AboutAppViewModel(aboutAppInfo = aboutAppInfo)
+        return AboutAppViewModel(appInfoList = appInfoList)
     }
 }

plugins/plugin-about-app/src/main/kotlin/com/redmadrobot/debug/plugin/aboutapp/model/AboutAppInfo.kt

@@ -1,6 +1,10 @@
 package com.redmadrobot.debug.plugin.aboutapp.model
 
+import java.util.UUID
+
 public data class AboutAppInfo(
     val title: String,
-    val content: String
-)
+    val value: String,
+) {
+    val id: String = UUID.randomUUID().toString()
+}

plugins/plugin-about-app/src/main/kotlin/com/redmadrobot/debug/plugin/aboutapp/ui/AboutAppScreen.kt

@@ -44,10 +44,10 @@ internal fun AboutAppScreen(
 private fun AboutAppLayout(state: AboutAppViewState) {
     LazyColumn(
         modifier = Modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-        contentPadding = PaddingValues(horizontal = 16.dp, vertical = 16.dp),
+        verticalArrangement = Arrangement.spacedBy(space = 8.dp),
+        contentPadding = PaddingValues(all = 16.dp),
     ) {
-        items(items = state.aboutAppInfo, key = { it.title }) { item ->
+        items(items = state.appInfoList, key = { it.id }) { item ->
             AboutAppItem(item = item)
         }
     }
@@ -74,7 +74,7 @@ private fun AboutAppItem(item: AboutAppInfo, modifier: Modifier = Modifier) {
                 color = MaterialTheme.colors.primary,
             )
             Text(
-                text = item.content,
+                text = item.value,
                 style = MaterialTheme.typography.body1,
                 color = MaterialTheme.colors.onSurface,
                 maxLines = 2,
@@ -89,19 +89,19 @@ private fun AboutAppItem(item: AboutAppInfo, modifier: Modifier = Modifier) {
 private fun Preview() {
     val state = remember {
         AboutAppViewState(
-            aboutAppInfo = listOf(
-                AboutAppInfo(title = "Версия", content = "3,14"),
+            appInfoList = listOf(
+                AboutAppInfo(title = "Версия", value = "3,14"),
                 AboutAppInfo(
                     title = "Номер билда",
-                    content = "fgkdfjgkdfgjdfkgjdfkjgkdfjgkdfjgkdfjgkdjgskdjgkdgfjdsfgjdsfgdsfgjdsfgdskjfgdsjkfgdjfgdsfg"
+                    value = "fgkdfjgkdfgjdfkgjdfkjgkdfjgkdfjgkdfjgkdjgskdjgkdgfjdsfgjdsfgdsfgjdsfgdskjfgdsjkfgdjfgdsfg"
                 ),
-                AboutAppInfo(title = "Версия1", content = "3,14"),
-                AboutAppInfo(title = "Версия2", content = "3,14"),
-                AboutAppInfo(title = "Версия3", content = "3,14"),
-                AboutAppInfo(title = "Версия4", content = "3,14"),
-                AboutAppInfo(title = "Версия5", content = "3,14"),
-                AboutAppInfo(title = "Версия6", content = "3,14"),
-                AboutAppInfo(title = "Версия7", content = "3,14"),
+                AboutAppInfo(title = "Версия", value = "3,14"),
+                AboutAppInfo(title = "Версия", value = "3,14"),
+                AboutAppInfo(title = "Версия", value = "3,14"),
+                AboutAppInfo(title = "Версия", value = "3,14"),
+                AboutAppInfo(title = "Версия", value = "3,14"),
+                AboutAppInfo(title = "Версия", value = "3,14"),
+                AboutAppInfo(title = "Версия", value = "3,14"),
             )
         )
     }

plugins/plugin-about-app/src/main/kotlin/com/redmadrobot/debug/plugin/aboutapp/ui/AboutAppViewModel.kt

@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
-internal class AboutAppViewModel(aboutAppInfo: List<AboutAppInfo>) : PluginViewModel() {
-    private val _state = MutableStateFlow(value = AboutAppViewState(aboutAppInfo = aboutAppInfo))
+internal class AboutAppViewModel(appInfoList: List<AboutAppInfo>) : PluginViewModel() {
+    private val _state = MutableStateFlow(value = AboutAppViewState(appInfoList = appInfoList))
     val state: StateFlow<AboutAppViewState> = _state.asStateFlow()
 }

plugins/plugin-about-app/src/main/kotlin/com/redmadrobot/debug/plugin/aboutapp/ui/AboutAppViewState.kt

@@ -5,5 +5,5 @@ import com.redmadrobot.debug.plugin.aboutapp.model.AboutAppInfo
 
 @Immutable
 internal data class AboutAppViewState(
-    val aboutAppInfo: List<AboutAppInfo>
+    val appInfoList: List<AboutAppInfo>
 )

sample/src/debug/kotlin/com/redmadrobot/debug_sample/debug_data/DebugAboutAppInfoProvider.kt

@@ -8,19 +8,19 @@ class DebugAboutAppInfoProvider {
             return listOf(
                 AboutAppInfo(
                     title = "Версия",
-                    content = "3.14"
+                    value = "3.14"
                 ),
                 AboutAppInfo(
                     title = "Номер билда",
-                    content = "101"
+                    value = "101"
                 ),
                 AboutAppInfo(
-                    title = "Номер билда1",
-                    content = "fgkdfjgkdfgjdfkgjdfkjgkdfjgkdfjgkdfjgkdjgskdjgkdgfjdsfgjdsfgdsfgjdsfgdskjfgdsjkfgdjfgdsfg"
+                    title = "Номер билда",
+                    value = "fgkdfjgkdfgjdfkgjdfkjgkdfjgkdfjgkdfjgkdjgskdjgkdgfjdsfgjdsfgdsfgjdsfgdskjfgdsjkfgdjfgdsfg"
                 ),
                 AboutAppInfo(
-                    title = "Версия2",
-                    content = "3,14"
+                    title = "Версия",
+                    value = "3,145"
                 ),
             )
         }