Merge pull request #215 from smswithoutborders/staging

Staging

Author: sherlockwisdom

app/build.gradle

@@ -4,15 +4,15 @@ plugins {
 //    id 'org.jetbrains.kotlin.jvm' version '1.9.23'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.23'
     id "com.google.protobuf"
+    alias(libs.plugins.compose.compiler)
 }
 
-
 def versionsPropertiesFile = rootProject.file("version.properties")
 def versionProperties = new Properties()
 versionProperties.load(new FileInputStream(versionsPropertiesFile))
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     buildFeatures {
         viewBinding true
@@ -37,7 +37,7 @@ android {
                                       "$projectDir/schemas".toString()]
             }
         }
-        resourceConfigurations += ['en', 'fr', 'fa', 'es', 'tr']
+        resourceConfigurations += ['en', 'fr', 'fa', 'es', 'tr', 'ar', 'de', 'sw']
 
         manifestPlaceholders =
                 ['appAuthRedirectScheme': 'oauth.afkanerd.com']
@@ -60,20 +60,36 @@ android {
         }
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
+    buildscript {
+        ext {
+            compose_compiler = '1.3.1'         //compiler
+            compose_version = '1.3.0-beta02'   //compose dependencies
+            compose_material3 = '1.0.0-beta02' //material3 release
+        }
+        //...
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+//        kotlinCompilerExtensionVersion compose_compiler
     }
-    buildFeatures {
-        viewBinding true
-    }
+
     lint {
         checkReleaseBuilds false
     }
     kotlinOptions {
         jvmTarget = "1.8"
     }
 
+    buildFeatures {
+        compose = true
+    }
+
     namespace 'com.example.sw0b_001'
 }
 
@@ -125,78 +141,134 @@ configurations {
 
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.annotation:annotation:1.8.2'
-    implementation group: 'androidx.lifecycle', name: 'lifecycle-extensions', version: '2.2.0'
-//    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.preference:preference:1.2.1'
-    implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation 'androidx.databinding:baseLibrary:3.2.0-alpha11'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.5'
-    implementation 'androidx.activity:activity:1.9.2'
-    implementation 'com.google.android.gms:play-services-auth:21.2.0'
-    implementation 'com.google.android.gms:play-services-auth-api-phone:18.1.0'
-//    implementation 'com.android.support:appcompat-v7:28.0.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.annotation
+    implementation libs.androidx.lifecycle.extensions
+    implementation libs.androidx.lifecycle.viewmodel.ktx
+    implementation libs.androidx.legacy.support.v4
+    implementation libs.androidx.preference
+    implementation libs.androidx.preference.ktx
+    implementation libs.androidx.baselibrary
+    implementation libs.androidx.lifecycle.livedata.ktx
+    implementation libs.androidx.activity
+    implementation libs.play.services.auth
+    implementation libs.play.services.auth.api.phone
+    implementation libs.androidx.ui.text.google.fonts
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
+    implementation(libs.androidx.material.v178)
 
     // Java language implementation
-    implementation "androidx.fragment:fragment:1.8.3"
+    implementation libs.androidx.fragment
 
-//    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.volley:volley:1.2.1'
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
+    implementation libs.volley
+    implementation libs.circleimageview
 
-    implementation "androidx.room:room-runtime:2.6.1"
-    annotationProcessor "androidx.room:room-compiler:2.6.1"
+    implementation libs.androidx.room.runtime
+    annotationProcessor libs.androidx.room.compiler
 
 
     // (Java only)
-    implementation "androidx.work:work-runtime:2.9.1"
+    implementation libs.androidx.work.runtime
 //    implementation 'com.budiyev.android:code-scanner:2.1.0'
 
-//    implementation 'androidx.security:security-crypto:1.1.0-alpha06'
 
-    implementation "androidx.biometric:biometric:1.1.0"
+    implementation libs.androidx.biometric
 
-    implementation 'com.github.tizisdeepan:dots:1.0.1'
+    implementation libs.dots
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1-Beta'//
+    implementation libs.kotlinx.serialization.json
+    testImplementation libs.kotlinx.coroutines.test//
 
-    def fuelVersion = "2.2.1"
-    implementation "com.github.kittinunf.fuel:fuel:$fuelVersion" //for JVM
-    testImplementation "com.github.kittinunf.fuel:fuel:$fuelVersion" //for JVM
+    implementation libs.fuel //for JVM
+    testImplementation libs.fuel //for JVM
 
-     implementation "com.github.kittinunf.fuel:fuel-android:$fuelVersion" //for Android
-    implementation "com.github.kittinunf.fuel:fuel-coroutines:$fuelVersion"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
+     implementation libs.fuel.android //for Android
+    implementation libs.fuel.coroutines
+    implementation libs.androidx.swiperefreshlayout
 
-    implementation "androidx.startup:startup-runtime:1.1.1"
-    implementation 'at.favre.lib:armadillo:1.0.0'
-    implementation 'com.afkanerd.oss1:smswithoutborders_libsignal:0.0.10'
-    implementation "net.openid:appauth:0.11.1"
-    implementation 'com.hbb20:ccp:2.7.0'
+    implementation libs.androidx.startup.runtime
+    implementation libs.armadillo
+    implementation libs.smswithoutborders.libsignal
+    implementation libs.appauth
+    implementation libs.ccp
 
-    implementation 'com.squareup.okhttp:okhttp:2.7.5'
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
-    implementation 'io.grpc:grpc-core:1.64.0'
-    implementation 'io.grpc:grpc-stub:1.64.0'
-    implementation 'io.grpc:grpc-okhttp:1.64.0'
-    implementation('io.grpc:grpc-protobuf-lite:1.64.0') {
+    implementation libs.okhttp
+    implementation libs.javax.annotation.api
+    implementation libs.grpc.core
+    implementation libs.grpc.stub
+    implementation libs.grpc.okhttp
+    implementation(libs.grpc.protobuf.lite) {
         exclude module: "protobuf-lite"
     }
 
 //     Add protobuf-java dependency
-    implementation "com.google.protobuf:protobuf-java:3.25.1"
-
-    implementation "com.macasaet.fernet:fernet-java8:1.4.2"
-
-//    implementation 'com.github.netricecake:x25519:2.0'
+    implementation libs.protobuf.java
+
+    implementation libs.fernet.java8
+
+    implementation(libs.androidx.material)
+
+    def composeBom = libs.androidx.compose.bom
+    implementation composeBom
+    androidTestImplementation composeBom
+
+    // Choose one of the following:
+    // Material Design 3
+    implementation libs.androidx.material3
+    // or Material Design 2
+    implementation libs.androidx.compose.material.material
+    // or skip Material Design and build directly on top of foundational components
+    implementation libs.androidx.foundation
+    // or only import the main APIs for the underlying toolkit systems,
+    // such as input and measurement/layout
+    implementation libs.androidx.ui
+
+    // Android Studio Preview support
+    implementation libs.androidx.ui.tooling.preview
+    debugImplementation libs.androidx.ui.tooling
+
+    // UI Tests
+    androidTestImplementation libs.androidx.ui.test.junit4
+    debugImplementation libs.androidx.ui.test.manifest
+
+    // Optional - Included automatically by material, only add when you need
+    // the icons but not the material library (e.g. when using Material3 or a
+    // custom design system based on Foundation)
+    implementation libs.androidx.material.icons.core
+    // Optional - Add full set of material icons
+    implementation libs.androidx.material.icons.extended
+    // Optional - Add window size utils
+    implementation libs.androidx.adaptive
+
+    // Optional - Integration with activities
+    implementation libs.androidx.activity.compose
+    // Optional - Integration with ViewModels
+    implementation libs.androidx.lifecycle.viewmodel.compose
+    // Optional - Integration with LiveData
+    implementation libs.androidx.runtime.livedata
+    // Optional - Integration with RxJava
+    implementation libs.androidx.runtime.rxjava2
+
+    def nav_version = "2.8.5"
+    implementation libs.androidx.navigation.compose
+
+    implementation libs.material.v180alpha01
+    implementation libs.material3
+
+    implementation libs.androidx.compose.material3.adaptive.adaptive
+    implementation libs.androidx.adaptive.layout
+    implementation libs.androidx.adaptive.navigation
+
+    androidTestImplementation libs.ui.test.junit4
+
+    implementation(libs.country.picker)
+
+    implementation libs.accompanist.permissions
+
+    implementation("androidx.leanback:leanback:1.1.0-rc02")
 }
 

app/release/baselineProfiles/0/app-release.dm

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 67,
-      "versionName": "0.19.0",
+      "versionCode": 66,
+      "versionName": "0.18.0",
       "outputFile": "app-release.apk"
     }
   ],