chore: fix string resources, remove unused fonts and update Gradle co…

…nfiguration to further reduce the app size (#343)

androidApp/build.gradle.kts

@@ -10,6 +10,7 @@ android {
     namespace = "fr.paug.androidmakers"
     versionCode = libs.versions.version.code.get().toInt()
     versionName = libs.versions.version.code.get()
+    androidResources.localeFilters += listOf("en", "fr")
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 
@@ -31,7 +32,9 @@ android {
             "LICENSE-junit.txt",
             "/*.proto",
             "google/**",
-            "META-INF/*.version"
+            "META-INF/*.version",
+            "META-INF/versions/**",
+            "META-INF/androidx/**"
           )
         }
         jniLibs {

shared/build.gradle.kts

@@ -34,7 +34,7 @@ kotlin {
 }
 
 configurations.configureEach {
-  // Remove unnecessary dependency of Moko
+  // Remove unnecessary transitive dependency
   exclude(group = "androidx.appcompat", module = "appcompat")
 }
 

shared/di/build.gradle.kts

@@ -31,11 +31,6 @@ kotlin {
   }
 }
 
-configurations.configureEach {
-  // Remove unnecessary dependency of Precompose and Koin Android
-  exclude(group = "androidx.appcompat", module = "appcompat")
-}
-
 android {
   namespace = "fr.paug.androidmakers.di"
   buildFeatures.buildConfig = true

shared/ui/build.gradle.kts

@@ -26,7 +26,6 @@ kotlin {
       implementation(compose.foundation)
       implementation(compose.material3)
       implementation(compose.ui)
-      implementation(compose.components.resources)
       implementation(compose.materialIconsExtended)
       implementation(compose.components.uiToolingPreview)
       implementation(libs.coil.compose)
@@ -53,7 +52,7 @@ kotlin {
 }
 
 configurations.configureEach {
-  // Remove unnecessary dependency of Moko
+  // Remove unnecessary transitive dependency
   exclude(group = "androidx.appcompat", module = "appcompat")
   // Disable Android Drawable support in Coil
   exclude(group = "com.google.accompanist", module = "accompanist-drawablepainter")

shared/ui/src/commonMain/kotlin/com/androidmakers/ui/MainLayout.kt

@@ -10,7 +10,6 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import coil3.ImageLoader
-import coil3.annotation.ExperimentalCoilApi
 import coil3.compose.setSingletonImageLoaderFactory
 import coil3.request.crossfade
 import com.androidmakers.ui.agenda.SessionDetailScreen
@@ -26,7 +25,6 @@ import org.koin.core.parameter.parametersOf
 /**
  * The main layout: entry point of the application
  */
-@OptIn(ExperimentalCoilApi::class)
 @Composable
 fun MainLayout(
     versionCode: String,

shared/ui/src/commonMain/kotlin/com/androidmakers/ui/theme/MontserratFont.kt

@@ -7,37 +7,6 @@ import androidx.compose.ui.text.font.FontWeight
 import dev.icerock.moko.resources.compose.asFont
 import fr.paug.androidmakers.ui.MR
 
-
-@Composable
-fun montserratExtraLight() = MR.fonts.montserrat_extralight.asFont(
-  FontWeight.ExtraLight
-)!!
-
-@Composable
-fun montserratExtraLightItalic() = MR.fonts.montserrat_extralightitalic.asFont(
-  FontWeight.ExtraLight, FontStyle.Italic
-)!!
-
-@Composable
-fun montserratLight() = MR.fonts.montserrat_light.asFont(
-  FontWeight.Light
-)!!
-
-@Composable
-fun montserratLightItalic() = MR.fonts.montserrat_lightitalic.asFont(
-  FontWeight.Light, FontStyle.Italic
-)!!
-
-@Composable
-fun montserratThin() = MR.fonts.montserrat_thin.asFont(
-  FontWeight.Thin
-)!!
-
-@Composable
-fun montserratThinItalic() = MR.fonts.montserrat_thinitalic.asFont(
-  FontWeight.Thin, FontStyle.Italic
-)!!
-
 @Composable
 fun montserratRegular() = MR.fonts.montserrat_regular.asFont()!!
 
@@ -47,16 +16,6 @@ fun montserratItalic() = MR.fonts.montserrat_italic.asFont(
   FontStyle.Italic
 )!!
 
-@Composable
-fun montserratMedium() = MR.fonts.montserrat_medium.asFont(
-  FontWeight.Medium
-)!!
-
-@Composable
-fun montserratMediumItalic() = MR.fonts.montserrat_mediumitalic.asFont(
-  FontWeight.Medium, FontStyle.Italic
-)!!
-
 @Composable
 fun montserratSemiBold() = MR.fonts.montserrat_semibold.asFont(
   FontWeight.SemiBold
@@ -79,46 +38,12 @@ fun montserratBoldItalic() = MR.fonts.montserrat_bolditalic.asFont(
   FontStyle.Italic
 )!!
 
-@Composable
-fun montserratExtraBold() = MR.fonts.montserrat_extrabold.asFont(
-  FontWeight.ExtraBold
-)!!
-
-@Composable
-fun montserratExtraBoldItalic() = MR.fonts.montserrat_extrabolditalic.asFont(
-  FontWeight.ExtraBold,
-  FontStyle.Italic
-)!!
-
-@Composable
-fun montserratBlack() = MR.fonts.montserrat_black.asFont(
-  FontWeight.Black
-)!!
-
-@Composable
-fun montserratBlackItalic() = MR.fonts.montserrat_blackitalic.asFont(
-  FontWeight.Black,
-  FontStyle.Italic
-)!!
-
 @Composable
 fun montserratFamily() = FontFamily(
-  montserratBlack(),
-  montserratBlackItalic(),
   montserratBold(),
   montserratBoldItalic(),
-  montserratExtraBold(),
-  montserratExtraBoldItalic(),
-  montserratExtraLight(),
-  montserratExtraLightItalic(),
   montserratItalic(),
-  montserratLight(),
-  montserratLightItalic(),
-  montserratMedium(),
-  montserratMediumItalic(),
   montserratRegular(),
   montserratSemiBold(),
-  montserratSemiBoldItalic(),
-  montserratThin(),
-  montserratThinItalic()
+  montserratSemiBoldItalic()
 )

shared/ui/src/commonMain/kotlin/com/androidmakers/ui/venue/VenuePager.kt

@@ -1,6 +1,5 @@
 package com.androidmakers.ui.venue
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.pager.HorizontalPager
@@ -26,7 +25,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import org.koin.compose.viewmodel.koinViewModel
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun VenuePager() {
   val viewModel = koinViewModel<VenueViewModel>()

shared/ui/src/commonMain/moko-resources/base/strings.xml

@@ -3,7 +3,7 @@
 
     <string name="app_name">Android Makers by droidcon</string>
 
-    <string name="version">Version %s (%s)</string>
+    <string name="version">Version %1$s (%2$s)</string>
 
     <string name="agenda">Agenda</string>
     <string name="venue">Venue</string>
@@ -17,7 +17,6 @@
 
     <string name="filter">Filter</string>
     <string name="bookmarked">Favorite</string>
-    <string name="language">Language</string>
     <string name="room">Room</string>
     <string name="rooms">Rooms</string>
     <string name="empty_events">Sorry, there is no session available for the currently selected filters.</string>
@@ -65,7 +64,7 @@
     <string name="ask_speaker">Ask a question to the speaker on Slido</string>
 
     <!-- Info about the session. It is `date` at `start time` - `end time`-->
-    <string name="session_detail">%s at %s - %s</string>
+    <string name="session_detail">%1$s at %2$s - %3$s</string>
 
     <string name="x_hashtag" translatable="false">#AMxDC24</string>
     <string name="x_hashtag_for_query" translatable="false">AMxDC24</string>

shared/ui/src/commonMain/moko-resources/fr/strings.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="app_name">Android Makers by droidcon</string>
 
-    <string name="version">Version %s (%s)</string>
+    <string name="version">Version %1$s (%2$s)</string>
 
     <string name="agenda">Agenda</string>
     <string name="venue">Lieu</string>
@@ -15,7 +15,6 @@
 
     <string name="filter">Filtres</string>
     <string name="bookmarked">Favoris</string>
-    <string name="language">Langues</string>
     <string name="room">Salle</string>
     <string name="rooms">Salles</string>
     <string name="empty_events">Désolé, aucune conférence n‘est disponible pour les filtres actuellement sélectionnés.</string>
@@ -62,7 +61,7 @@
     <string name="ask_speaker">Posez une question au speaker sur Slido</string>
 
     <!-- Info about the session. It is `date` at `start time` - `end time`-->
-    <string name="session_detail">%s à %s - %s</string>
+    <string name="session_detail">%1$s à %2$s - %3$s</string>
 
     <string name="speaker_search_placeholder">Recherche</string>
 

wearApp/build.gradle.kts

@@ -16,6 +16,7 @@ android {
     minSdk = 30
     targetSdk = 33
     versionCode = libs.versions.version.code.get().toInt()
+    androidResources.localeFilters += listOf("en", "fr")
     versionName = "1.0"
   }
 
@@ -42,6 +43,7 @@ android {
             "google/**",
             "src/google/**",
             "META-INF/*.version",
+            "META-INF/androidx/**",
             "core/**",
             "java/**"
           )

wearApp/src/main/java/fr/paug/androidmakers/wear/ui/main/MainActivity.kt

@@ -3,7 +3,6 @@ package fr.paug.androidmakers.wear.ui.main
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
@@ -123,7 +122,6 @@ fun WearApp(
   }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun MainScreen(
   viewModel: MainViewModel,