From 2958edd4d88da5e460e35e4e175246772f380504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Teyssier?=
 <1267636+lolo-io@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:05:15 +0200
Subject: [PATCH] FDroid: Add rootProject.name in gradle.properties & move
 icon.png (#95)

---
 .gitignore                                       |   1 +
 app/keystore.jks                                 | Bin 2241 -> 0 bytes
 .../lolo/io/onelist/core/designsystem/Theme.kt   |   2 +-
 .../io/onelist/core/designsystem/Typography.kt   |   3 +--
 .../metadata/{ => android/en-US/images}/icon.png | Bin
 gradle.properties                                |   4 ++++
 6 files changed, 7 insertions(+), 3 deletions(-)
 delete mode 100644 app/keystore.jks
 rename fastlane/metadata/{ => android/en-US/images}/icon.png (100%)

diff --git a/.gitignore b/.gitignore
index 933df934..cbdcc7a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /captures
 .externalNativeBuild
 keystore.jks
+./**/keykeystore.jks
diff --git a/app/keystore.jks b/app/keystore.jks
deleted file mode 100644
index d7a89596b1620007cda4d53c453ca2551765cc70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2241
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

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
index 2396c6f1..034da0bd 100644
--- 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
     )
 }
\ No newline at end of file
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
index 1c9c2346..e0f903b2 100644
--- 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 b/fastlane/metadata/android/en-US/images/icon.png
similarity index 100%
rename from fastlane/metadata/icon.png
rename to fastlane/metadata/android/en-US/images/icon.png
diff --git a/gradle.properties b/gradle.properties
index 5d964a3d..8d673f23 100644
--- 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