FDroid: Add rootProject.name in gradle.properties & move icon.png (#95)

lolo-io · Oct 6, 2024 · 2958edd · 2958edd
1 parent 83eddaf
commit 2958edd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@
 /captures
 .externalNativeBuild
 keystore.jks
+./**/keykeystore.jks
diff --git a/app/keystore.jks b/app/keystore.jks
diff --git a/core/designsystem/src/main/kotlin/com/lolo/io/onelist/core/designsystem/Theme.kt b/core/designsystem/src/main/kotlin/com/lolo/io/onelist/core/designsystem/Theme.kt
@@ -29,7 +29,7 @@ fun OneListTheme(
     MaterialTheme(
         colorScheme = colorScheme,
         content = content,
-        typography = typography(colorScheme),
+        typography = typography(),
         shapes = Shapes
     )
 }
diff --git a/core/designsystem/src/main/kotlin/com/lolo/io/onelist/core/designsystem/Typography.kt b/core/designsystem/src/main/kotlin/com/lolo/io/onelist/core/designsystem/Typography.kt
@@ -1,6 +1,5 @@
 package com.lolo.io.onelist.core.designsystem
 
-import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Typography
 import androidx.compose.runtime.Composable
@@ -12,7 +11,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.sp
 
 @Composable
-fun typography(colorScheme: ColorScheme) = Typography(
+fun typography() = Typography(
     bodyLarge = TextStyle(
         fontFamily = FontFamily.Default,
         fontWeight = FontWeight.Normal,

diff --git a/fastlane/metadata/icon.png → ...ne/metadata/android/en-US/images/icon.png b/fastlane/metadata/icon.png → ...ne/metadata/android/en-US/images/icon.png
diff --git a/gradle.properties b/gradle.properties
@@ -15,6 +15,10 @@ android.nonTransitiveRClass=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
+# FDroid uses applicationId (com.lolo.io.onelist) as repo dire name & gradle doesn't like it
+# this fixes buid on FDroid
+rootProject.name="onelist"
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects