Merge branch '5352-Conversation_part_disappear_on_conversation_list_issue' into 'main'

5352-Conversation_part_disappear_on_conversation_list_issue

See merge request !60

.gitlab-ci.yml

-image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"
+image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:legacy"
 
 stages:
   - update-from-upstream

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext.androidx_appcompat_version = '1.1.0'
     ext.androidx_constraintlayout_version = '1.1.3'
-    ext.androidx_core_version = '1.2.0'
+    ext.androidx_core_version = '1.1.0'
     ext.androidx_emoji_version = '1.0.0'
     ext.androidx_exifinterface_version = '1.0.0'
     ext.androidx_testrunner_version = '1.1.0-alpha3'
@@ -17,13 +17,13 @@ buildscript {
     ext.exoplayer_version = "2.8.1"
     ext.glide_version = "4.8.0"
     ext.junit_version = '4.12'
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.3.60'
     ext.lifecycle_version = '2.1.0'
     ext.material_version = '1.0.0'
     ext.mockito_version = '2.18.3'
     ext.moshi_version = '1.8.0'
     ext.okhttp3_version = '4.1.0'
-    ext.realm_version = '6.0.2'//'5.8.0'
+    ext.realm_version = '5.8.0'
     ext.realm_adapters_version = '3.1.0'
     ext.rxandroid_version = '2.0.1'
     ext.rxdogtag_version = '0.2.0'
@@ -42,12 +42,11 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.realm:realm-gradle-plugin:$realm_version"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
-
     }
 }
 

data/build.gradle

@@ -42,10 +42,6 @@ android {
         withAnalytics { dimension "analytics" }
         noAnalytics { dimension "analytics" }
     }
-
-    kotlinOptions {
-        jvmTarget = "11"
-    }
 }
 
 dependencies {

domain/build.gradle

@@ -23,7 +23,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 29
 
     compileOptions {
         sourceCompatibility 1.8
@@ -34,16 +34,6 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
-
 }
 
 dependencies {

gradle/wrapper/gradle-wrapper.properties

 #Thu Mar 17 12:40:57 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

presentation/build.gradle

@@ -23,13 +23,14 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
     flavorDimensions "analytics"
 
     defaultConfig {
         applicationId "foundation.e.message"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 29
         versionCode 2218
         versionName "3.9.4"
         setProperty("archivesBaseName", "QKSMS-v${versionName}")
@@ -63,12 +64,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
     }
     // For Kotlin projects
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "1.8"
     }
 
     lintOptions {
@@ -170,7 +171,6 @@ dependencies {
     kapt "io.realm:realm-annotations:$realm_version"
     kapt "io.realm:realm-annotations-processor:$realm_version"
 
-
     // rxjava
     implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
     implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"

presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt

@@ -37,7 +37,7 @@ class TightTextView @JvmOverloads constructor(
 
         val maxLineWidth = (0 until layout.lineCount)
                 .map(layout::getLineWidth)
-                .maxOrNull() ?: 0f
+                .max() ?: 0f
 
         val width = Math.ceil(maxLineWidth.toDouble()).toInt() + compoundPaddingLeft + compoundPaddingRight
         if (width < measuredWidth) {

presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt

@@ -64,7 +64,7 @@ class BackupPresenter @Inject constructor(
                 .distinctUntilChanged()
                 .switchMap { backupRepo.getBackups() }
                 .doOnNext { backups -> newState { copy(backups = backups) } }
-                .map { backups -> backups.map { it.date }.maxOrNull() ?: 0L }
+                .map { backups -> backups.map { it.date }.max() ?: 0L }
                 .map { lastBackup ->
                     when (lastBackup) {
                         0L -> context.getString(R.string.backup_never)

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt

@@ -392,6 +392,11 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
         super.onSaveInstanceState(outState)
     }
 
+    override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+        cameraDestination = savedInstanceState?.getParcelable(CameraDestinationKey)
+        super.onRestoreInstanceState(savedInstanceState)
+    }
+
     override fun onBackPressed() = backPressedIntent.onNext(Unit)
 
 }
\ No newline at end of file