build(deps): bump org.jsoup:jsoup from 1.16.1 to 1.22.1

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/bindings/build.gradle.kts

@@ -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/src/main/kotlin/com/getcode/util/locale/LocaleModule.kt

@@ -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/build.gradle.kts → libs/locale/impl/build.gradle.kts

@@ -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/locale/impl/src/main/kotlin/com/getcode/util/locale/AndroidLocale.kt

@@ -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/public/.gitignore

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

libs/locale/public/build.gradle.kts

@@ -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)
+}

libs/network/connectivity/bindings/.gitignore

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

libs/network/connectivity/bindings/build.gradle.kts

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

libs/network/connectivity/bindings/src/main/kotlin/com/getcode/utils/network/ConnectivityModule.kt

@@ -0,0 +1,39 @@
+package com.getcode.utils.network
+
+import android.annotation.SuppressLint
+import android.net.ConnectivityManager
+import android.net.wifi.WifiManager
+import android.os.Build
+import android.telephony.TelephonyManager
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ConnectivityModule {
+
+    @Provides
+    @SuppressLint("NewApi")
+    @Singleton
+    fun providesNetworkObserver(
+        connectivityManager: ConnectivityManager,
+        telephonyManager: TelephonyManager,
+        wifiManager: WifiManager
+    ): NetworkConnectivityListener = when (Build.VERSION.SDK_INT) {
+        in Build.VERSION_CODES.N..Build.VERSION_CODES.P -> {
+            Api24NetworkObserver(
+                wifiManager,
+                connectivityManager,
+                telephonyManager
+            )
+        }
+
+        else -> Api29NetworkObserver(
+            connectivityManager,
+            telephonyManager
+        )
+    }
+}

libs/network/connectivity/impl/.gitignore

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

libs/network/connectivity/impl/build.gradle.kts

@@ -0,0 +1,46 @@
+plugins {
+    id(Plugins.android_library)
+    id(Plugins.kotlin_android)
+    id(Plugins.kotlin_kapt)
+    id(Plugins.kotlin_serialization)
+}
+
+android {
+    namespace = "${Android.codeNamespace}.libs.network"
+    compileSdk = Android.compileSdkVersion
+    defaultConfig {
+        minSdk = Android.minSdkVersion
+        targetSdk = Android.targetSdkVersion
+        buildToolsVersion = Android.buildToolsVersion
+        testInstrumentationRunner = Android.testInstrumentationRunner
+    }
+
+    compileOptions {
+        sourceCompatibility(Versions.java)
+        targetCompatibility(Versions.java)
+    }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(Versions.java))
+        }
+    }
+
+    kotlinOptions {
+        jvmTarget = Versions.java
+        freeCompilerArgs += listOf(
+            "-opt-in=kotlin.ExperimentalUnsignedTypes",
+            "-opt-in=kotlin.RequiresOptIn"
+        )
+    }
+}
+
+dependencies {
+    api(project(":libs:network:connectivity:public"))
+
+    implementation(Libs.kotlinx_coroutines_core)
+    implementation(Libs.kotlinx_serialization_json)
+
+    implementation(Libs.inject)
+    implementation(Libs.hilt)
+}

libs/network/connectivity/src/main/kotlin/com/getcode/utils/network/Api24NetworkObserver.kt → libs/network/connectivity/impl/src/main/kotlin/com/getcode/utils/network/Api24NetworkObserver.kt

@@ -123,7 +123,7 @@ class Api24NetworkObserver(
         } ?: ConnectionType.Unknown
         NetworkState(
             connected = connected,
-            signalStrength = maxOf(mobile, wifi),
+            signalStrength = kotlin.comparisons.maxOf(mobile, wifi),
             type = type,
         )
     }

libs/network/connectivity/src/main/kotlin/com/getcode/utils/network/Api29NeworkObserver.kt → libs/network/connectivity/impl/src/main/kotlin/com/getcode/utils/network/Api29NeworkObserver.kt

@@ -120,7 +120,7 @@ class Api29NetworkObserver(
         } ?: ConnectionType.Unknown
         NetworkState(
             connected = connected,
-            signalStrength = maxOf(mobile, wifi),
+            signalStrength = kotlin.comparisons.maxOf(mobile, wifi),
             type = type,
         )
     }

libs/network/connectivity/impl/src/main/kotlin/com/getcode/utils/network/SignalStrength.kt

@@ -0,0 +1,10 @@
+package com.getcode.utils.network
+
+internal fun Int.toSignalStrength() = when (this) {
+    0 -> SignalStrength.Weak
+    1 -> SignalStrength.Poor
+    2 -> SignalStrength.Good
+    3 -> SignalStrength.Great
+    4 -> SignalStrength.Strong
+    else -> SignalStrength.Unknown
+}

libs/network/connectivity/public/.gitignore

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

libs/network/connectivity/src/main/kotlin/com/getcode/utils/network/NetworkConnectionListener.kt → libs/network/connectivity/public/src/main/kotlin/com/getcode/utils/network/NetworkConnectionListener.kt

@@ -50,15 +50,4 @@ class NetworkObserverStub : NetworkConnectivityListener {
     override val isConnected: Boolean = false
     override val type: ConnectionType = ConnectionType.Unknown
     override val state: StateFlow<NetworkState> = MutableStateFlow(NetworkState.Default).asStateFlow()
-}
-
-
-
-internal fun Int.toSignalStrength() = when (this) {
-    0 -> SignalStrength.Weak
-    1 -> SignalStrength.Poor
-    2 -> SignalStrength.Good
-    3 -> SignalStrength.Great
-    4 -> SignalStrength.Strong
-    else -> SignalStrength.Unknown
 }