SES-2524 - Rewrite media gallery in Compose

app/build.gradle

@@ -1,18 +1,3 @@
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:$gradlePluginVersion"
-        classpath files('libs/gradle-witness.jar')
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
-        classpath "com.google.gms:google-services:$googleServicesVersion"
-    }
-}
-
 plugins {
     id 'com.google.devtools.ksp'
     id 'com.google.dagger.hilt.android'
@@ -24,8 +9,8 @@ apply plugin: 'witness'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlinx-serialization'
 
-configurations.all {
-    exclude module: "commons-logging"
+configurations.forEach {
+    it.exclude module: "commons-logging"
 }
 
 def canonicalVersionCode = 379
@@ -64,13 +49,9 @@ android {
     }
 
     packagingOptions {
-        exclude 'LICENSE.txt'
-        exclude 'LICENSE'
-        exclude 'NOTICE'
-        exclude 'asm-license.txt'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/NOTICE', 'META-INF/proguard/androidx-annotations.pro']
+        }
     }
 
     splits {
@@ -85,6 +66,7 @@ android {
     buildFeatures {
         compose true
     }
+
     composeOptions {
         kotlinCompilerExtensionVersion '1.5.14'
     }
@@ -108,8 +90,8 @@ android {
         buildConfigField "String", "USER_AGENT", "\"OWA\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
+        resourceConfigurations += []
 
-        resConfigs autoResConfig()
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // The following argument makes the Android Test Orchestrator run its
         // "pm clear" command after each test invocation. This command ensures
@@ -169,7 +151,7 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.forEach { variant ->
         variant.outputs.each { output ->
             def abiName = output.getFilter("ABI") ?: 'universal'
             def postFix = abiPostFix.get(abiName, 0)
@@ -180,10 +162,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError true
-        baseline file("lint-baseline.xml")
-    }
 
     testOptions {
         unitTests {
@@ -192,7 +170,6 @@ android {
     }
 
     buildFeatures {
-        dataBinding true
         viewBinding true
     }
 
@@ -212,9 +189,11 @@ android {
         }
     }
 
-    task testPlayDebugUnitTestCoverageReport(type: JacocoReport, dependsOn: "testPlayDebugUnitTest") {
+    tasks.register('testPlayDebugUnitTestCoverageReport', JacocoReport) {
+        dependsOn 'testPlayDebugUnitTest'
+
         reports {
-            xml.enabled = true
+            xml.required = true
         }
 
         // Add files that should not be listed in the report (e.g. generated Files from dagger)
@@ -232,6 +211,13 @@ android {
         // This is enabled with 'enableUnitTestCoverage' in the 'debug' build type.
         executionData.from = "${project.buildDir}/outputs/unit_test_code_coverage/playDebugUnitTest/testPlayDebugUnitTest.exec"
     }
+
+
+    testNamespace 'network.loki.messenger.test'
+    lint {
+        abortOnError true
+        baseline file('lint-baseline.xml')
+    }
 }
 
 dependencies {
@@ -258,6 +244,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"
     implementation 'androidx.activity:activity-ktx:1.5.1'
+    implementation 'androidx.activity:activity-compose:1.5.1'
     implementation 'androidx.fragment:fragment-ktx:1.5.3'
     implementation "androidx.core:core-ktx:$coreVersion"
     implementation "androidx.work:work-runtime-ktx:2.7.1"
@@ -279,6 +266,7 @@ dependencies {
     implementation 'commons-net:commons-net:3.7.2'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
     implementation "com.github.bumptech.glide:glide:$glideVersion"
+    implementation "com.github.bumptech.glide:compose:1.0.0-beta01"
     ksp "com.github.bumptech.glide:ksp:$glideVersion"
     implementation 'com.makeramen:roundedimageview:2.1.0'
     implementation 'com.pnikosis:materialish-progress:1.5'
@@ -299,7 +287,6 @@ dependencies {
         exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
     }
     implementation 'com.annimon:stream:1.1.8'
-    implementation project(':stickyheader')
     implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
     implementation 'androidx.sqlite:sqlite-ktx:2.3.1'
     implementation 'net.zetetic:sqlcipher-android:4.5.4@aar'

app/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="network.loki.messenger.test">
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <uses-library android:name="android.test.runner"
             android:required="false" />

app/src/main/AndroidManifest.xml

@@ -306,6 +306,8 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.thoughtcrime.securesms.home.HomeActivity" />
         </activity>
+        <activity android:name="org.thoughtcrime.securesms.media.MediaOverviewActivity" />
+
         <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"
             android:foregroundServiceType="microphone"
             android:exported="false" />