commonize options design

DatL4g · May 12, 2024 · 6880b0f · 6880b0f
1 parent 39d46f3
commit 6880b0f
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 3 deletions.
diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/common/ExtendMedium.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/common/ExtendMedium.kt
@@ -179,4 +179,9 @@ fun MediaListStatus.stringRes(isManga: Boolean) = when (this) {
     else -> SharedRes.strings.add
 }
 
-fun MediaListStatus.stringRes(type: MediaType) = this.stringRes(type == MediaType.MANGA)
+fun MediaListStatus.stringRes(type: MediaType) = this.stringRes(type == MediaType.MANGA)
+
+fun MediaType.stringRes() = when (this) {
+    MediaType.MANGA -> SharedRes.strings.manga
+    else -> SharedRes.strings.anime
+}
diff --git a/...ev/datlag/aniflow/ui/navigation/screen/home/dialog/settings/component/CharacterSection.kt b/...ev/datlag/aniflow/ui/navigation/screen/home/dialog/settings/component/CharacterSection.kt
@@ -17,6 +17,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.maxkeppeker.sheets.core.models.base.Header
+import com.maxkeppeker.sheets.core.models.base.IconSource
 import com.maxkeppeker.sheets.core.models.base.rememberUseCaseState
 import com.maxkeppeler.sheets.option.OptionDialog
 import com.maxkeppeler.sheets.option.models.DisplayMode
@@ -56,6 +58,10 @@ fun CharacterSection(
         ),
         config = OptionConfig(
             mode = DisplayMode.LIST,
+        ),
+        header = Header.Default(
+            icon = IconSource(imageVector = Icons.Filled.PersonPin),
+            title = stringResource(SharedRes.strings.char_language)
         )
     )
 

diff --git a/...in/dev/datlag/aniflow/ui/navigation/screen/home/dialog/settings/component/ColorSection.kt b/...in/dev/datlag/aniflow/ui/navigation/screen/home/dialog/settings/component/ColorSection.kt
@@ -14,6 +14,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.maxkeppeker.sheets.core.models.base.Header
 import com.maxkeppeker.sheets.core.models.base.IconSource
 import com.maxkeppeker.sheets.core.models.base.rememberUseCaseState
 import com.maxkeppeler.sheets.option.OptionDialog
@@ -79,6 +80,13 @@ fun ColorSection(
         config = OptionConfig(
             mode = DisplayMode.GRID_VERTICAL,
             gridColumns = 4
+        ),
+        header = Header.Default(
+            icon = IconSource(
+                imageVector = Icons.Filled.Circle,
+                tint = MaterialTheme.colorScheme.primary
+            ),
+            title = stringResource(SharedRes.strings.profile_color)
         )
     )
 

diff --git a/...in/dev/datlag/aniflow/ui/navigation/screen/home/dialog/settings/component/TitleSection.kt b/...in/dev/datlag/aniflow/ui/navigation/screen/home/dialog/settings/component/TitleSection.kt
@@ -17,6 +17,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.maxkeppeker.sheets.core.models.base.Header
+import com.maxkeppeker.sheets.core.models.base.IconSource
 import com.maxkeppeker.sheets.core.models.base.rememberUseCaseState
 import com.maxkeppeler.sheets.option.OptionDialog
 import com.maxkeppeler.sheets.option.models.DisplayMode
@@ -56,6 +58,10 @@ fun TitleSection(
         ),
         config = OptionConfig(
             mode = DisplayMode.LIST,
+        ),
+        header = Header.Default(
+            icon = IconSource(imageVector = Icons.Rounded.Title),
+            title = stringResource(SharedRes.strings.title_language),
         )
     )
 

diff --git a/.../commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/component/FABContent.kt b/.../commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/component/FABContent.kt
@@ -85,6 +85,7 @@ fun FABContent(
                 RatingDialog(
                     state = ratingState,
                     initialValue = rating,
+                    type = type,
                     onRating = {
                         component.rate(it)
                     }

diff --git a/...ommonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/component/RatingDialog.kt b/...ommonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/component/RatingDialog.kt
@@ -10,13 +10,18 @@ import com.maxkeppeker.sheets.core.models.base.UseCaseState
 import com.maxkeppeler.sheets.rating.models.RatingBody
 import com.maxkeppeler.sheets.rating.models.RatingConfig
 import com.maxkeppeler.sheets.rating.models.RatingSelection
+import dev.datlag.aniflow.SharedRes
+import dev.datlag.aniflow.anilist.type.MediaType
+import dev.datlag.aniflow.common.stringRes
+import dev.icerock.moko.resources.compose.stringResource
 import io.github.aakira.napier.Napier
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun RatingDialog(
     state: UseCaseState,
     initialValue: Int,
+    type: MediaType,
     onRating: (Int) -> Unit,
 ) {
     com.maxkeppeler.sheets.rating.RatingDialog(
@@ -31,10 +36,12 @@ fun RatingDialog(
                 onRating(rating)
             }
         ),
-        body = RatingBody.Custom(body = { }),
+        body = RatingBody.Default(
+            bodyText = stringResource(SharedRes.strings.rating_text, stringResource(type.stringRes()))
+        ),
         header = Header.Default(
             icon = IconSource(imageVector = Icons.Rounded.Star),
-            title = "Rating"
+            title = stringResource(SharedRes.strings.rating)
         )
     )
 }
diff --git a/composeApp/src/commonMain/moko-resources/base/strings.xml b/composeApp/src/commonMain/moko-resources/base/strings.xml
@@ -84,4 +84,8 @@
     <string name="polar">Polar</string>
     <string name="patreon">Patreon</string>
     <string name="sponsor">Sponsor</string>
+    <string name="rating">Rating</string>
+    <string name="rating_text">Rate this %s between 0-5</string>
+    <string name="anime">Anime</string>
+    <string name="manga">Manga</string>
 </resources>