Task: compose migration import export activity by amlwin · Pull Request #3021 · CatimaLoyalty/Android

amlwin · 2026-02-12T14:35:00Z

Summary

Migrate ImportExportActivity from XML Views to Jetpack Compose
Add Compose UI testing support for unit tests
Remove deprecated XML layout file

Changes

ImportExportActivity.kt

Changed base class from CatimaAppCompatActivity to CatimaComponentActivity
Replaced XML view binding with Compose setContent using CatimaTheme
Added reactive dialog state management using mutableStateOf
Kept ActivityResultLaunchers in Activity (required for lifecycle)

ImportExportScreen.kt (new)

Created full Compose UI with CatimaTopAppBar and Material3 components
Added ImportOption data class and ImportExportDialogState sealed class for state management
Implemented Compose dialogs:
- Export password dialog
- Import type selection dialog
- Import confirmation dialog
- Import password retry dialog
- Import/Export result dialogs
Added @Preview composables for Android Studio previews

ImportExportActivityTest.kt

Updated tests to use Compose testing APIs (createComposeRule, onNodeWithText, etc.)
Added tests for main screen, import type dialog, and export password dialog

Build Configuration

Added androidx-compose-ui-ui-tooling dependency for Compose previews
Added Compose testing dependencies for unit tests
Created robolectric.properties with graphics.mode=NATIVE for Compose rendering

Removed

import_export_activity.xml - no longer needed with Compose

Test plan

Verify export flow works (password dialog → file picker → export → result dialog → share option)
Verify import flow works (type selection → confirmation → file picker → import → result dialog)
Verify password retry works for encrypted imports
Verify back button navigation works
Verify screen renders correctly in light/dark themes
Run unit tests: ./gradlew :app:testFossDebugUnitTest --tests "protect.card_locker.ImportExportActivityTest"

Activity	Activity with Export Dialog	Activity with Import Dialog

This commit refactors the `ImportExportActivity` from an XML-based layout to a modern UI using Jetpack Compose. The core logic is preserved, but the implementation is now more streamlined and uses declarative UI principles. Key changes include: * Replacing the `import_export_activity.xml` layout with a new `ImportExportScreen.kt` Composable. * Updating `ImportExportActivity` to use `setContent` and manage UI state with Compose `MutableState`. * Replacing traditional dialogs (`MaterialAlertDialogBuilder`) with Composable dialogs for a consistent UI. * Adding new Compose testing dependencies and updating `ImportExportActivityTest` to use `createComposeRule` for testing the new Composable UI.

The `onImportComplete` function was simplified by removing the `path: Uri` parameter, which was no longer used. Call sites in `openFileForImport` and `initiateImport` were updated accordingly to reflect this change. The unused `dataFormat` parameter was also removed from the `onImportWithPassword` lambda.

Moved `ImportExportActivityTest.kt` from the `test` source set to the `androidTest` source set. This change also adds the Robolectric dependency to the `androidTest` configuration in `app/build.gradle.kts` to support the test's execution environment.

TheLastProject · 2026-02-12T16:41:37Z

Thanks, I'll try to review this later but I may not have time the coming week or two.

For the failing tests, I guess the compose stuff is bloating the APK a bit (though not sure how much).

Are you sure

    debugImplementation(libs.androidx.compose.ui.ui.tooling)

is really needed?

If yes (or just really helpful), maybe you can try bumping disk-size for the Instrumented Tests steps in .github/workflows/android.yml.

I can't find a default size in the code, but it looks like it may be 800MB, so 1GB might already be sufficient.

amlwin · 2026-02-12T16:48:10Z

debugImplementation(libs.androidx.compose.ui.ui.tooling)

it's required to render preview in preview pane for android studio.

maybe you can try bumping disk-size for the Instrumented Tests steps in .github/workflows/android.yml.

will update in next commit

Adds `disk-size: 1G` to the Android emulator setup for instrumented tests on API levels 23 and 35. This increases the available disk space for the emulators running in the CI workflow.

TheLastProject · 2026-02-12T19:08:41Z

Not sure why the tests still fail, I ran it from the main branch to make sure the tests weren't just broken by something else but they work fine there :/

Moved `ImportExportActivityTest` from the `androidTest` directory to the `test` directory, converting it from an instrumented test to a local unit test. This change allows the test to run on the local JVM using Robolectric instead of requiring an Android emulator or device. To support this move, the Robolectric dependency was removed from `androidTestImplementation` as it is already included for unit tests. Additionally, a `ComponentActivity` declaration was added to `AndroidManifest.xml`, which is required for running Compose UI tests with Robolectric. The GitHub Actions workflow was also updated to remove the unnecessary `disk-size` parameter for the emulator runner.

Merge ComponentActivity manifest entries To resolve a manifest merger failed error during UI tests, this change adds `tools:replace="android:exported"` to the `androidx.activity.ComponentActivity` declaration in `AndroidManifest.xml`. This ensures that the `android:exported` attribute from the library's manifest is overridden, allowing the build to succeed.

amlwin · 2026-02-13T04:34:26Z

Fixied

Not sure why the tests still fail, I ran it from the main branch to make sure the tests weren't just broken by something else but they work fine there :/

TheLastProject

Got a few comments from the first review. Didn't look super close yet. But it does seem to work "equally well" under testing (which sadly also means: everything is still cancelled when rotating the screen, but I guess it makes sense to fix that separately anyway).

I'll try to take a very close look after these initial issues are resolved, but it is looking good :)

TheLastProject · 2026-03-02T09:05:47Z

app/src/main/java/protect/card_locker/ImportExportActivity.kt

+        val importTypesArray = resources.getStringArray(R.array.import_types_array)
+        return listOf(
+            ImportOption(
+                title = importTypesArray.getOrElse(0) { getString(R.string.importCatima) },


Can you explain this getOrElse behaviour and why you introduced this? What is this supposed to solve? The old version is way simpler and just uses the intended string directly.

TheLastProject · 2026-03-02T09:06:12Z

app/src/main/java/protect/card_locker/ImportExportActivity.kt

+                dataFormat = DataFormat.Catima
+            ),
+            ImportOption(
+                title = importTypesArray.getOrElse(1) { "Fidme" },


This should keep using the R.string.importFidme value

TheLastProject · 2026-03-02T09:09:00Z

app/src/main/java/protect/card_locker/ImportExportScreen.kt

+                    IconButton(onClick = { passwordVisible = !passwordVisible }) {
+                        Icon(
+                            imageVector = if (passwordVisible) Icons.Filled.VisibilityOff else Icons.Filled.Visibility,
+                            contentDescription = if (passwordVisible) "Hide password" else "Show password"


These need to be translatable so non-English app users can understand it too.

TheLastProject · 2026-03-02T09:10:35Z

app/src/main/java/protect/card_locker/ImportExportScreen.kt

This file lacks a lot of DRY, having basically one-on-one duplicated ImportX and ExportX composables for a lot of situations. I'd rather see a single composable with an extra flag for the small part that is unique.

TheLastProject · 2026-03-02T09:11:28Z

app/src/main/java/protect/card_locker/ImportExportScreen.kt

+            title = "Catima",
+            message = "Import from Catima backup",


Any reasons these use plain strings instead of R.string references? I guess to make the preview simpler?

amlwin added 2 commits February 12, 2026 22:27

amlwin mentioned this pull request Feb 12, 2026

Migration to Jetpack Compose #2483

Open

27 tasks

feat: Increase emulator disk size for tests

b75fc35

Adds `disk-size: 1G` to the Android emulator setup for instrumented tests on API levels 23 and 35. This increases the available disk space for the emulators running in the CI workflow.

amlwin added 2 commits February 13, 2026 11:32

TheLastProject reviewed Mar 2, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Task: compose migration import export activity#3021

Task: compose migration import export activity#3021
amlwin wants to merge 6 commits intoCatimaLoyalty:mainfrom
amlwin:task/compose-migration-ImportExportActivity

amlwin commented Feb 12, 2026

Uh oh!

TheLastProject commented Feb 12, 2026

Uh oh!

amlwin commented Feb 12, 2026

Uh oh!

TheLastProject commented Feb 12, 2026

Uh oh!

amlwin commented Feb 13, 2026

Uh oh!

TheLastProject left a comment

Uh oh!

TheLastProject Mar 2, 2026

Uh oh!

TheLastProject Mar 2, 2026

Uh oh!

TheLastProject Mar 2, 2026

Uh oh!

TheLastProject Mar 2, 2026

Uh oh!

TheLastProject Mar 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

amlwin commented Feb 12, 2026

Summary

Changes

ImportExportActivity.kt

ImportExportScreen.kt (new)

ImportExportActivityTest.kt

Build Configuration

Removed

Test plan

Uh oh!

TheLastProject commented Feb 12, 2026

Uh oh!

amlwin commented Feb 12, 2026

Uh oh!

TheLastProject commented Feb 12, 2026

Uh oh!

amlwin commented Feb 13, 2026

Uh oh!

TheLastProject left a comment

Choose a reason for hiding this comment

Uh oh!

TheLastProject Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

TheLastProject Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

TheLastProject Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

TheLastProject Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

TheLastProject Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants