Release 30.0.3

.github/workflows/build_check.yaml

@@ -77,7 +77,6 @@ jobs:
         id: buildMangaApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -88,7 +87,6 @@ jobs:
         id: buildAnimeApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -99,7 +97,6 @@ jobs:
         id: buildAnimeTvApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -110,7 +107,6 @@ jobs:
         id: buildNovelApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true

.github/workflows/build_check_testing.yaml

@@ -70,7 +70,6 @@ jobs:
         id: buildMangaApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           generate-job-summary: true
           arguments: mangaworld:assembleRelease
 
@@ -79,7 +78,6 @@ jobs:
         id: buildAnimeApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           generate-job-summary: true
           arguments: animeworld:assembleRelease
 
@@ -88,7 +86,6 @@ jobs:
         id: buildAnimeTvApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           generate-job-summary: true
           arguments: animeworldtv:assembleRelease
 
@@ -97,7 +94,6 @@ jobs:
         id: buildNovelApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           generate-job-summary: true
           arguments: novelworld:assembleRelease
 

.github/workflows/main_release.yml

@@ -55,7 +55,6 @@ jobs:
         id: buildMangaApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -65,7 +64,6 @@ jobs:
         id: buildAnimeApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -75,7 +73,6 @@ jobs:
         id: buildNovelApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -85,7 +82,6 @@ jobs:
         id: buildAnimeTvApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true

.github/workflows/push_check.yaml

@@ -73,7 +73,6 @@ jobs:
         id: buildMangaApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -84,7 +83,6 @@ jobs:
         id: buildAnimeApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -95,7 +93,6 @@ jobs:
         id: buildAnimeTvApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -106,7 +103,6 @@ jobs:
         id: buildNovelApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true

Models/src/main/java/com/programmersbox/models/Models.kt

@@ -50,6 +50,3 @@ data class Storage(
 ) {
     val headers = mutableMapOf<String, String>()
 }
-
-data class SwatchInfo(val rgb: Int?, val titleColor: Int?, val bodyColor: Int?)
-

UIViews/build.gradle.kts

@@ -133,19 +133,20 @@ dependencies {
     //Custom Libraries
     implementation(Deps.jakepurple13Libs)
 
+    val composeBom = platform(libs.composePlatform)
+    implementation(composeBom)
     implementation(libs.bundles.compose)
     implementation(libs.toolbarCompose)
     implementation(libs.lazyColumnScrollbar)
     implementation(libs.pagingCompose)
     implementation(libs.bundles.pagingLibs)
     implementation(libs.bundles.datastoreLibs)
-    implementation(libs.composePager)
 
     implementation(libs.bundles.protobuf)
 }
 
 protobuf {
-    protoc { artifact = "com.google.protobuf:protoc:3.21.1" }
+    protoc { artifact = "com.google.protobuf:protoc:3.21.12" }
     generateProtoTasks {
         all().forEach { task ->
             task.plugins {

UIViews/src/main/java/com/programmersbox/uiviews/AboutLibrariesScreen.kt

@@ -8,6 +8,7 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.shape.CircleShape
@@ -99,7 +100,7 @@ fun AboutLibrariesScreen(mainLogo: MainLogo) {
 
                     DefaultHeader(
                         logo = { Image(rememberDrawablePainter(drawable = mainLogoDrawable), null) },
-                        version = context.appVersion,
+                        version = appVersion(),
                     )
                 }
             },
@@ -297,8 +298,8 @@ internal fun Library(
                 library.licenses.forEach {
                     Badge(
                         modifier = Modifier.padding(padding.badgePadding),
-                        //contentColor = colors.badgeContentColor,
-                        //containerColor = colors.badgeBackgroundColor
+                        contentColor = MaterialTheme.colorScheme.onPrimary,
+                        containerColor = MaterialTheme.colorScheme.primary
                     ) {
                         Text(
                             modifier = Modifier.padding(padding.badgeContentPadding),
@@ -369,33 +370,35 @@ fun DefaultHeader(
 @Composable
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
 fun DefaultHeaderPreview() {
-    Surface {
-        Scaffold {
-            OutlinedLibrariesContainer(
-                libraries = fakeData,
-                contentPadding = it,
-                modifier = Modifier.fillMaxSize(),
-                header = {
-                    stickyHeader {
-                        DefaultHeader(
-                            logo = { Image(painterResource(R.drawable.ic_launcher_foreground), contentDescription = null) },
-                            version = "1.2.3",
-                            description = "This is a massive description thasd;" +
-                                    "lfjkasd;lkfja;lksdfj;alskdjf;laskdjf;alksjdf;laksdjf;lksjfda",
-                            linkSites = listOf(
-                                Sites(
-                                    name = "Play Store",
-                                    url = "asdf",
-                                ),
-                                Sites(
-                                    name = "GitHub",
-                                    url = "asdf",
+    MaterialTheme(colorScheme = if (isSystemInDarkTheme()) darkColorScheme() else lightColorScheme()) {
+        Surface {
+            Scaffold {
+                OutlinedLibrariesContainer(
+                    libraries = fakeData,
+                    contentPadding = it,
+                    modifier = Modifier.fillMaxSize(),
+                    header = {
+                        stickyHeader {
+                            DefaultHeader(
+                                logo = { Image(painterResource(R.drawable.ic_launcher_foreground), contentDescription = null) },
+                                version = "1.2.3",
+                                description = "This is a massive description thasd;" +
+                                        "lfjkasd;lkfja;lksdfj;alskdjf;laskdjf;alksjdf;laksdjf;lksjfda",
+                                linkSites = listOf(
+                                    Sites(
+                                        name = "Play Store",
+                                        url = "asdf",
+                                    ),
+                                    Sites(
+                                        name = "GitHub",
+                                        url = "asdf",
+                                    )
                                 )
                             )
-                        )
+                        }
                     }
-                }
-            )
+                )
+            }
         }
     }
 }