feat: setup package visibility restrictions for certain libs

Only expose the public interface to accessor, leaving the implementation details to be handled via DI

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

apps/codeApp/build.gradle.kts

@@ -112,10 +112,10 @@ android {
 
 dependencies {
     // libs (not included with services)
-    implementation(project(":libs:locale"))
-    implementation(project(":libs:vibrator"))
+    implementation(project(":libs:locale:public"))
+    implementation(project(":libs:vibrator:public"))
     implementation(project(":libs:messaging"))
-    implementation(project(":libs:permissions"))
+    implementation(project(":libs:permissions:public"))
     implementation(project(":libs:quickresponse"))
     implementation(project(":libs:requests"))
 

apps/flipchatApp/build.gradle.kts

@@ -118,8 +118,8 @@ dependencies {
     implementation(project(":services:flipchat:sdk"))
 
     implementation(project(":libs:datetime"))
-    implementation(project(":libs:locale"))
-    implementation(project(":libs:vibrator"))
+    implementation(project(":libs:locale:public"))
+    implementation(project(":libs:vibrator:public"))
     implementation(project(":libs:encryption:ed25519"))
     implementation(project(":libs:encryption:keys"))
     implementation(project(":libs:encryption:mnemonic"))
@@ -129,9 +129,9 @@ dependencies {
     implementation(project(":libs:logging"))
     implementation(project(":libs:messaging"))
     implementation(project(":libs:network:exchange"))
-    implementation(project(":libs:network:connectivity"))
+    implementation(project(":libs:network:connectivity:public"))
     implementation(project(":libs:opengraph"))
-    implementation(project(":libs:permissions"))
+    implementation(project(":libs:permissions:public"))
     implementation(project(":libs:quickresponse"))
     implementation(project(":libs:requests"))
     implementation(project(":ui:components"))

libs/locale/.gitignore renamed to libs/locale/bindings/.gitignore

@@ -0,0 +1,41 @@
+plugins {
+    id(Plugins.android_library)
+    id(Plugins.kotlin_android)
+    id(Plugins.kotlin_serialization)
+    id(Plugins.kotlin_kapt)
+    id(Plugins.hilt)
+}
+
+android {
+    namespace = "${Android.codeNamespace}.util.locale"
+    compileSdk = Android.compileSdkVersion
+    defaultConfig {
+        minSdk = Android.minSdkVersion
+        targetSdk = Android.targetSdkVersion
+        buildToolsVersion = Android.buildToolsVersion
+        testInstrumentationRunner = Android.testInstrumentationRunner
+    }
+
+    kotlinOptions {
+        jvmTarget = Versions.java
+        freeCompilerArgs += listOf(
+            "-opt-in=kotlin.ExperimentalUnsignedTypes",
+            "-opt-in=kotlin.RequiresOptIn"
+        )
+    }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(Versions.java))
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":libs:locale:impl"))
+    api(project(":libs:locale:public"))
+
+    implementation(Libs.hilt)
+    kapt(Libs.hilt_android_compiler)
+    kapt(Libs.hilt_compiler)
+}

libs/locale/bindings/build.gradle.kts

@@ -0,0 +1,16 @@
+package com.getcode.util.locale
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class LocaleModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindLocaleHelper(impl: AndroidLocale): LocaleHelper
+}

libs/locale/bindings/src/main/kotlin/com/getcode/util/locale/LocaleModule.kt

@@ -2,6 +2,7 @@ plugins {
     id(Plugins.android_library)
     id(Plugins.kotlin_android)
     id(Plugins.kotlin_serialization)
+    id(Plugins.kotlin_kapt)
 }
 
 android {
@@ -14,13 +15,6 @@ android {
         testInstrumentationRunner = Android.testInstrumentationRunner
     }
 
-    buildFeatures {
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = Versions.compose_compiler
-    }
 
     kotlinOptions {
         jvmTarget = Versions.java
@@ -38,14 +32,15 @@ android {
 }
 
 dependencies {
+    api(project(":libs:locale:public"))
     implementation(project(":libs:datetime"))
     implementation(project(":libs:currency"))
     api(Libs.androidx_annotation)
     api(Libs.kotlin_stdlib)
     api(Libs.kotlinx_coroutines_core)
     api(Libs.kotlinx_coroutines_rx3)
 
-    implementation(platform(Libs.compose_bom))
-    implementation(Libs.compose_ui)
-    implementation(Libs.compose_foundation)
+    implementation(Libs.hilt)
+    kapt(Libs.hilt_android_compiler)
+    kapt(Libs.hilt_compiler)
 }

libs/network/connectivity/.gitignore renamed to libs/locale/impl/.gitignore

@@ -0,0 +1,23 @@
+package com.getcode.util.locale
+
+import android.content.Context
+import com.getcode.model.Currency
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class AndroidLocale @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val currencyUtils: com.getcode.utils.CurrencyUtils,
+): LocaleHelper {
+    override fun getDefaultCurrencyName(): String {
+        return LocaleUtils.getDefaultCurrency(context)
+    }
+
+    override fun getDefaultCurrency(): Currency? {
+        return currencyUtils.getCurrency(getDefaultCurrencyName())
+    }
+
+    override fun getDefaultCountry(): String {
+        return LocaleUtils.getDefaultCountry(context)
+    }
+}

libs/locale/build.gradle.kts renamed to libs/locale/impl/build.gradle.kts

@@ -0,0 +1,2 @@
+build/
+.gradle/

libs/locale/impl/src/main/kotlin/com/getcode/util/locale/AndroidLocale.kt

@@ -0,0 +1,39 @@
+plugins {
+    id(Plugins.android_library)
+    id(Plugins.kotlin_android)
+    id(Plugins.kotlin_serialization)
+}
+
+android {
+    namespace = "${Android.codeNamespace}.util.locale"
+    compileSdk = Android.compileSdkVersion
+    defaultConfig {
+        minSdk = Android.minSdkVersion
+        targetSdk = Android.targetSdkVersion
+        buildToolsVersion = Android.buildToolsVersion
+        testInstrumentationRunner = Android.testInstrumentationRunner
+    }
+
+    kotlinOptions {
+        jvmTarget = Versions.java
+        freeCompilerArgs += listOf(
+            "-opt-in=kotlin.ExperimentalUnsignedTypes",
+            "-opt-in=kotlin.RequiresOptIn"
+        )
+    }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(Versions.java))
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":libs:datetime"))
+    implementation(project(":libs:currency"))
+    api(Libs.androidx_annotation)
+    api(Libs.kotlin_stdlib)
+    api(Libs.kotlinx_coroutines_core)
+    api(Libs.kotlinx_coroutines_rx3)
+}