refactor: Collection sheet cleanup (#2238)

openMF · Nov 15, 2024 · 15a98c3 · 15a98c3
1 parent 2aa1103
commit 15a98c3
Show file tree

Hide file tree

Showing 69 changed files with 938 additions and 3,235 deletions.
diff --git a/core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosBottomSheet.kt b/core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosBottomSheet.kt
@@ -24,7 +24,8 @@ import kotlinx.coroutines.launch
 @Composable
 fun MifosBottomSheet(
     content: @Composable () -> Unit,
-    onDismiss: () -> Unit
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val coroutineScope = rememberCoroutineScope()
     val modalSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
@@ -44,14 +45,17 @@ fun MifosBottomSheet(
         dismissSheet()
     }
 
-    AnimatedVisibility(visible = showBottomSheet) {
+    AnimatedVisibility(
+        modifier = modifier,
+        visible = showBottomSheet,
+    ) {
         ModalBottomSheet(
             containerColor = Color.White,
             onDismissRequest = {
                 showBottomSheet = false
                 dismissSheet()
             },
-            sheetState = modalSheetState
+            sheetState = modalSheetState,
         ) {
             content()
         }
@@ -61,9 +65,12 @@ fun MifosBottomSheet(
 @Preview
 @Composable
 fun MifosBottomSheetPreview() {
-    MifosBottomSheet({
-        Box {
-            Modifier.height(100.dp)
-        }
-    }, {})
+    MifosBottomSheet(
+        {
+            Box {
+                Modifier.height(100.dp)
+            }
+        },
+        {},
+    )
 }
diff --git a/feature/collection-sheet/src/main/AndroidManifest.xml b/feature/collection-sheet/src/main/AndroidManifest.xml
diff --git a/...tion_sheet/individual_collection_sheet_details/IndividualCollectionSheetDetailsUiState.kt b/...tion_sheet/individual_collection_sheet_details/IndividualCollectionSheetDetailsUiState.kt
diff --git a/...ion_sheet/saved_individual_collection_sheet/ui/SavedIndividualCollectionSheetViewModel.kt b/...ion_sheet/saved_individual_collection_sheet/ui/SavedIndividualCollectionSheetViewModel.kt
diff --git a/feature/collection-sheet/src/test/java/com/mifos/feature/individual/ExampleUnitTest.kt b/feature/collection-sheet/src/test/java/com/mifos/feature/individual/ExampleUnitTest.kt
diff --git a/feature/collection-sheet/.gitignore → feature/collectionSheet/.gitignore b/feature/collection-sheet/.gitignore → feature/collectionSheet/.gitignore
diff --git a/feature/collection-sheet/build.gradle.kts → feature/collectionSheet/build.gradle.kts b/feature/collection-sheet/build.gradle.kts → feature/collectionSheet/build.gradle.kts
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 plugins {
     alias(libs.plugins.mifos.android.feature)
     alias(libs.plugins.mifos.android.library.compose)

diff --git a/feature/collection-sheet/consumer-rules.pro → feature/collectionSheet/consumer-rules.pro b/feature/collection-sheet/consumer-rules.pro → feature/collectionSheet/consumer-rules.pro
diff --git a/feature/collection-sheet/proguard-rules.pro → feature/collectionSheet/proguard-rules.pro b/feature/collection-sheet/proguard-rules.pro → feature/collectionSheet/proguard-rules.pro
diff --git a/...ure/individual/ExampleInstrumentedTest.kt → ...ure/individual/ExampleInstrumentedTest.kt b/...ure/individual/ExampleInstrumentedTest.kt → ...ure/individual/ExampleInstrumentedTest.kt
@@ -1,13 +1,20 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.individual
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import junit.framework.TestCase.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +28,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.mifos.feature.individual.test", appContext.packageName)
     }
-}
+}
diff --git a/feature/collectionSheet/src/main/AndroidManifest.xml b/feature/collectionSheet/src/main/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/android-client/blob/master/LICENSE.md
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>