JetPack Compose

README.md

@@ -10,7 +10,7 @@ It's using:
 * [ML Kit](https://developers.google.com/ml-kit/vision/face-detection) for face feature detection.
 * [Firebase Crashlytics](https://firebase.google.com/docs/crashlytics/) for crash reporting.
 * [Firebase Analytics](https://firebase.google.com/docs/analytics).
-* [Fresco](https://developers.google.com/ml-kit/) for android Bitmap management.
+* [Coil](https://coil-kt.github.io/coil/) for android Bitmap management.
 * [Circle CI](https://circleci.com/gh/jg210/merging) for automated build, test and continuous delivery [![CircleCI](https://circleci.com/gh/jg210/merging/tree/develop.svg?style=svg)](https://circleci.com/gh/jg210/merging)
 * [Fastlane](https://fastlane.tools/) to publish the app as a beta (early access) release for every commit on the release branch. [<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' style='height: 2em'/>](https://play.google.com/store/apps/details?id=uk.me.jeremygreen.merging)
 * [Material Design](https://material.io/design/).

TODO

@@ -1,5 +1,26 @@
-* Try out JetPack compose.
-  - add detekt plugin.
+* Try out Jetpack Compose.
+  - update to material 3 design
+    x onboarding
+    x about
+    X licences
+    - main
+      X replace view binding with composables
+      x top bar
+      X menu
+      X make action button start camera app
+      - save camera image
+      - show images and faces
+    - splash
+  - fresco is quite an old library and doesn't support jetpack compose directly
+    - coil?
+      - https://coil-kt.github.io/coil/migrating/#non-view-targets
+    - glide?
+    - picasso?
+  - Is AppTheme etc. required still?
+    - and AppCompatActivity as parent class
+  - remove old material library.
+  - remove viewBinding = true
+  - replace closeMenu function with Item Composable that also deduplicates DropdownMenuItem boilerplate
 
 * NDK crash reporting
 
@@ -84,6 +105,8 @@
 * Don't show splashscreen if start up is fast enough
   - but if do show it, show it for at least 1.5s.
 
+* Use ActivityResultContract not deprecated startActivityForResult/onActivityResult.
+
 * Enable crashlytics and analytics in SplashActivity if previously enabled via OnboardingActivity.
   - currently, enable in MainActivity, which avoids need to persist state, but means
     early crashes not visible.

app/build.gradle

@@ -1,13 +1,15 @@
 plugins {
     id 'com.android.application'
-    id 'com.google.android.gms.oss-licenses-plugin'
+    id 'com.mikepenz.aboutlibraries.plugin'
     id 'kotlin-android'
     id 'com.google.devtools.ksp'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
     id 'io.gitlab.arturbosch.detekt'
 }
 
+apply from: '../dependencies.gradle'
+
 static String getBranchName() {
     final branchCommand = ["git", "symbolic-ref", "HEAD", "--short"]
     return branchCommand.execute().text.trim()
@@ -57,6 +59,7 @@ android {
     buildFeatures {
         viewBinding = true
         buildConfig = true
+        compose = true
     }
     signingConfigs {
         release {
@@ -75,6 +78,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    composeOptions {
+        kotlinCompilerExtensionVersion = project.ext.kotlinCompilerExtensionVersion
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -100,7 +106,18 @@ detekt {
 dependencies {
     def lifecycle_version = "2.6.2"
     def room_version = "2.6.1"
+    def composeBom = platform('androidx.compose:compose-bom:2024.03.00')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    // JetPack Compose
+    implementation composeBom
+    implementation 'androidx.compose.material3:material3'
+    implementation("androidx.compose.runtime:runtime-livedata:1.6.7")
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.activity:activity-compose'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest'
+
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
     implementation 'androidx.annotation:annotation:1.7.0'
@@ -112,23 +129,27 @@ dependencies {
     implementation "androidx.room:room-ktx:${room_version}"
     implementation "androidx.room:room-runtime:${room_version}"
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
+    implementation("io.coil-kt:coil:2.6.0")
+    implementation("io.coil-kt:coil-compose:2.6.0")
     implementation 'com.facebook.fresco:fresco:3.1.3'
     // https://github.com/facebook/fresco/issues/2598#issuecomment-1110860661
     compileOnly 'com.facebook.infer.annotation:infer-annotation:0.18.0'
     implementation platform('com.google.firebase:firebase-bom:29.0.4')
     implementation 'com.google.firebase:firebase-crashlytics' // versioned with BOM
     implementation 'com.google.firebase:firebase-analytics' // versioned with BOM
     implementation 'com.google.android.gms:play-services-mlkit-face-detection:16.1.4'
-    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation "com.mikepenz:aboutlibraries-compose-m3:${aboutLibsVersion}"
     ksp "androidx.room:room-compiler:${room_version}"
     testImplementation "androidx.arch.core:core-testing:2.1.0"
     testImplementation "androidx.room:room-testing:${room_version}"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation composeBom
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.6")
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-rules-ruleauthors:1.23.6")
+    detektPlugins 'io.nlopez.compose.rules:detekt:0.3.12'
 }
 
 task writeVersionFile {

app/src/main/AndroidManifest.xml

@@ -36,6 +36,11 @@
                 android:theme="@style/AppTheme.NoActionBar"
                 android:exported="false">
         </activity>
+        <activity
+                android:name=".licences.LicencesActivity"
+                android:theme="@style/AppTheme.NoActionBar"
+                android:exported="false">
+        </activity>
         <provider
                 android:name="androidx.core.content.FileProvider"
                 android:authorities="${applicationId}.fileprovider"

app/src/main/java/uk/me/jeremygreen/merging/about/AboutActivity.kt

@@ -1,38 +1,77 @@
 package uk.me.jeremygreen.merging.about
 
 import android.os.Bundle
+import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import uk.me.jeremygreen.merging.BuildConfig
 import uk.me.jeremygreen.merging.R
-import uk.me.jeremygreen.merging.databinding.AboutBinding
 
 internal class AboutActivity: AppCompatActivity() {
 
     private val versionName by lazy { packageManager.getPackageInfo(packageName, 0).versionName }
 
-    private lateinit var binding: AboutBinding
-
     // Activity
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = AboutBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setSupportActionBar(binding.aboutToolbar)
-        binding.appVersion.text = getString(R.string.version, BuildConfig.APPLICATION_ID, versionName)
+        setContent { About() }
     }
 
-    // Activity
-    override fun onResume() {
-        super.onResume()
-        binding.aboutToolbar.setNavigationOnClickListener {
-            finish()
+    @OptIn(ExperimentalMaterial3Api::class)
+    @Composable
+    private fun About() {
+        Scaffold(
+            topBar = {
+                TopAppBar(
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.primaryContainer,
+                        titleContentColor = MaterialTheme.colorScheme.primary,
+                    ),
+                    title = { Text(text = stringResource(R.string.actionAbout)) },
+                    navigationIcon = { BackButton() }
+                )
+            }
+        ) { innerPadding ->
+            Column(
+                modifier = Modifier.padding(innerPadding),
+            ) {
+                AboutText()
+            }
         }
     }
 
-    // Activity
-    override fun onPause() {
-        super.onPause()
-        binding.aboutToolbar.setNavigationOnClickListener(null)
+    @Composable
+    private fun AboutText() {
+        Column(modifier = Modifier.padding(16.dp)) {
+            Text(stringResource(R.string.version, BuildConfig.APPLICATION_ID, versionName))
+        }
+    }
+
+    @Composable
+    private fun BackButton() {
+        IconButton(onClick = { finish() }) {
+            Icon(
+                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                contentDescription = "Back",
+                tint = Color.White
+            )
+        }
     }
 
 }

app/src/main/java/uk/me/jeremygreen/merging/licences/LicencesActivity.kt

@@ -0,0 +1,70 @@
+package uk.me.jeremygreen.merging.licences
+
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
+import uk.me.jeremygreen.merging.R
+
+internal class LicencesActivity: AppCompatActivity() {
+
+    // Activity
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent { Licences() }
+    }
+
+    @OptIn(ExperimentalMaterial3Api::class)
+    @Composable
+    private fun Licences() {
+        Scaffold(
+            topBar = {
+                TopAppBar(
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.primaryContainer,
+                        titleContentColor = MaterialTheme.colorScheme.primary,
+                    ),
+                    title = { Text(text = stringResource(R.string.actionLicences)) },
+                    navigationIcon = { BackButton() }
+                )
+            }
+        ) { innerPadding ->
+            Column(
+                modifier = Modifier.padding(innerPadding),
+            ) {
+                LibrariesContainer(
+                    Modifier.fillMaxSize()
+                )
+            }
+        }
+    }
+
+    @Composable
+    private fun BackButton() {
+        IconButton(onClick = { finish() }) {
+            Icon(
+                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                contentDescription = "Back",
+                tint = Color.White
+            )
+        }
+    }
+
+}