Merge branch 'openMF:dev' into dev

niyajali · Nov 26, 2024 · 7ef8058 · 7ef8058
2 parents 0294472 + 775fdef
commit 7ef8058
Show file tree

Hide file tree

Showing 27 changed files with 448 additions and 431 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,14 @@ bin/
 gen/
 out/
 build/
+.externalNativeBuild
+.cxx
+iosApp/Podfile.lock
+iosApp/Pods/*
+iosApp/iosApp.xcworkspace/*
+iosApp/iosApp.xcodeproj/*
+!iosApp/iosApp.xcodeproj/project.pbxproj
+mifospay-shared/mifospay-shared.podspec
 
 # Eclipse project files
 .classpath

diff --git a/.run/mifos-ios.run.xml b/.run/mifos-ios.run.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="mifos-ios" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="613CA5C4-9828-4F49-8C12-8983BAF4AE81" XCODE_PROJECT="$PROJECT_DIR$/iosApp/iosApp.xcodeproj">
+    <method v="2">
+      <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/mifospay-android.run.xml b/.run/mifospay-android.run.xml
@@ -1,6 +1,5 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="mifospay-android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="mobile-wallet.mifospay-android.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -12,8 +11,6 @@
     <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
-    <option name="RESTORE_ENABLED" value="false" />
-    <option name="RESTORE_FILE" value="" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
     <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />

diff --git a/README.md b/README.md
diff --git a/Screenshot.md b/Screenshot.md
diff --git a/build-logic/convention/src/main/kotlin/org/mifospay/Detekt.kt b/build-logic/convention/src/main/kotlin/org/mifospay/Detekt.kt
@@ -8,6 +8,7 @@ import org.gradle.kotlin.dsl.named
 
 internal fun Project.configureDetekt(extension: DetektExtension) = extension.apply {
     tasks.named<Detekt>("detekt") {
+        jvmTarget = "17"
         reports {
             xml.required.set(true)
             html.required.set(true)

diff --git a/docs/readmes/Android.md b/docs/readmes/Android.md
@@ -0,0 +1,41 @@
+# Mobile Wallet Android App Images
+
+|                        Splash Screen                         |                        Login Screen                        |                       Create an Account                        |
+|:------------------------------------------------------------:|:----------------------------------------------------------:|:--------------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/acc3b852-55a6-4ee8-b907-9bcc113af2c0" /> | <img src="https://github.com/user-attachments/assets/43dd37bf-93a7-4905-a28b-eb60e1ead2e3"/> | <img src="https://github.com/user-attachments/assets/0d572af2-8e89-45ca-bae4-663d3d6ef21b"/> |
+
+|                     Sign Up Screen                      |                        Create Passcode                        |                     Home Screen                     |
+|:-------------------------------------------------------:|:-------------------------------------------------------------:|:---------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/1e7f984e-6f99-4f76-981b-c52f5f2c52f0" /> | <img src="https://github.com/user-attachments/assets/afeeea8b-142f-47b5-a610-ca020277b3e1"/> | <img src="https://github.com/user-attachments/assets/2753a54c-201d-4570-b363-46c930793d37"/> |
+
+|                        Transaction History                         |                        Send Money                        |                    Payment Success                    |
+|:------------------------------------------------------------------:|:--------------------------------------------------------:|:--------------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/1aeabe16-c69e-4c51-994f-23ebca203c3b" /> | <img src="https://github.com/user-attachments/assets/19f20655-4966-4ff8-ac29-6e7a4cd1769f"/> | <img src="https://github.com/user-attachments/assets/c35c7d4d-7437-4563-8cb2-198bdab3cdb2"/> |
+
+|                         Request Money                         |                        Request Money Scanner                        |                        Payment History                         |
+|:-------------------------------------------------------------:|:-------------------------------------------------------------------:|:--------------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/0a3f9f04-76a0-46da-9744-d589f99f9577" /> | <img src="https://github.com/user-attachments/assets/8d75922e-fd9f-42c1-8c94-2fdfc69658a9"/> | <img src="https://github.com/user-attachments/assets/790f499b-42c2-4452-99db-837e6e69cf24"/> |
+
+|                     Transaction Details Screen                      |                        Finance Accounts                         |                     Payments SI Screen                     |
+|:-------------------------------------------------------------------:|:---------------------------------------------------------------:|:----------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/e9a0f78a-9e57-49fb-8a3d-d65b9cdaeb2a" /> | <img src="https://github.com/user-attachments/assets/2bbb3a99-3aa1-44e5-96c1-e67e2650ff43"/> | <img src="https://github.com/user-attachments/assets/b88877bc-71d0-4c96-8fe1-ebbd53503509"/> |
+
+|                      Instruction Details Screen                      |                     Invoices Screen                      |                    Invoices Details Screen                     |
+|:--------------------------------------------------------------------:|:--------------------------------------------------------:|:--------------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/1f8c4820-eafc-4527-8269-21dd9f5b3ebb" /> | <img src="https://github.com/user-attachments/assets/9f57188c-9c45-4933-8110-788289c9e086"/> | <img src="https://github.com/user-attachments/assets/c3d51561-dcfc-40b8-a2aa-2d1dedee5cbd"/> |
+
+|                     Update basic Details Screen                     |                     Upload Documents Screen                     |                      Card Screen                      |
+|:-------------------------------------------------------------------:|:---------------------------------------------------------------:|:-----------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/f8c1bc01-cc5c-4881-948a-0032c01ce55d" /> | <img src="https://github.com/user-attachments/assets/439c7fd4-0ac9-47bb-bc28-3d16c9f6e3b0"/> | <img src="https://github.com/user-attachments/assets/28c279ed-f588-40f9-a983-39480ef7cbc1"/> |
+
+|                     Add New Card Screen                     |                     Update Card Screen                     |                     Merchants Screen                      |
+|:-----------------------------------------------------------:|:----------------------------------------------------------:|:---------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/dbe8578e-62a9-40d8-ace5-c371f92c7bf5" /> | <img src="https://github.com/user-attachments/assets/2f9dfbb3-034d-4568-b174-0168c05cddbf"/> | <img src="https://github.com/user-attachments/assets/7dabdc0c-d884-4491-8f1d-80d711c13048"/> |
+
+|                      Profile Screen                      |                     Edit Profile Screen                     |                     Settings Screen                      |
+|:--------------------------------------------------------:|:-----------------------------------------------------------:|:--------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/ce6c4523-292a-46d9-b38c-b0a6b9aba052" /> | <img src="https://github.com/user-attachments/assets/dee29ca0-74d7-480c-88f0-513030c5297b"/> | <img src="https://github.com/user-attachments/assets/27771a85-d275-4fcc-8453-b4639a2ee937"/> |
+
+|                      Notifications Screen                      |                      FAQ Screen                      |                     Change Password Screen                     |
+|:--------------------------------------------------------------:|:----------------------------------------------------:|:--------------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/5f84ed87-969b-4af5-8676-bde90f6f90b0" /> | <img src="https://github.com/user-attachments/assets/42ec8984-7224-4aab-84f3-2a8f42022186"/> | <img src="https://github.com/user-attachments/assets/17bd6402-a3a5-442b-ada0-5654c3bb8238"/> |
diff --git a/docs/readmes/Linux.md b/docs/readmes/Linux.md
@@ -0,0 +1,45 @@
+# Mobile Wallet Linux App Images
+
+|                    Login Screen                     |                    Create Passcode Screen                     |                Create an Account Screen                |
+|:---------------------------------------------------:|:-------------------------------------------------------------:|:------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/a464aff3-e6a8-4bd3-be2e-47085e2b375c" /> |  <img src="https://github.com/user-attachments/assets/ff4868e8-a04b-4434-af5b-b851f9cb38ff"/>  |  <img src="https://github.com/user-attachments/assets/8975fbb0-850a-4356-a94d-b31b3f14e0d6"/>  |
+
+|                     Sign Up Screen                      |                       Home Screen                       |                    Transaction History page                     |
+|:-------------------------------------------------------:|:-------------------------------------------------------:|:---------------------------------------------------------------:|
+|  <img src="https://github.com/user-attachments/assets/edeab2dc-c90e-4bf8-8673-6de9db0990fa" />  | <img src="https://github.com/user-attachments/assets/8db5c211-6e4a-477a-8576-6e9e9ea29da0"/> | <img src="https://github.com/user-attachments/assets/b7f716c7-c269-46c1-992a-f90b539e777e"/> |
+
+|                    Send Payment Screen                    |                    Review Transfer Screen                     |                    Payment Success Screen                     |
+|:---------------------------------------------------------:|:-------------------------------------------------------------:|:-------------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/004d4c40-0ddb-440e-ab62-beaffed7c57a" /> |  <img src="https://github.com/user-attachments/assets/ad851b7d-d16d-4b48-82dd-26cd1eeb0ce0"/>  |  <img src="https://github.com/user-attachments/assets/72b373df-b247-4554-94ab-373fc46e7599"/>  |
+
+|                      Request Screen                      |                     Request Money Screen                     |                     History Screen                      |
+|:--------------------------------------------------------:|:------------------------------------------------------------:|:-------------------------------------------------------:|
+|  <img src="https://github.com/user-attachments/assets/bd610ad4-ed33-42c9-934c-a4ee8b8d0021" />  |  <img src="https://github.com/user-attachments/assets/825573cf-8a98-4fc0-88f6-5bee293d1170"/>  |  <img src="https://github.com/user-attachments/assets/ae3ef0ef-f81b-40b8-b218-3fc4b1e76acf"/>  |
+
+|                     Transaction Details Screen                      |                   Payments SI Screen                    |                   Create New Instruction Screen                    |
+|:-------------------------------------------------------------------:|:-------------------------------------------------------:|:------------------------------------------------------------------:|
+|  <img src="https://github.com/user-attachments/assets/e634dc84-5a14-4c92-8783-7de63e427f43" />  | <img src="https://github.com/user-attachments/assets/882d5108-fcf5-4945-b03a-dee3722a3c62"/> | <img src="https://github.com/user-attachments/assets/967ca3f6-c9c7-41d2-8001-083269dcdcc6"/> |
+
+|                     Instruction Details Screen                      |                    Payment Invoices Screen                    |                     Finance Accounts Screen                     |
+|:-------------------------------------------------------------------:|:-------------------------------------------------------------:|:---------------------------------------------------------------:|
+|  <img src="https://github.com/user-attachments/assets/a9378c82-19cd-4dc3-91e8-930ff85372d7" />  | <img src="https://github.com/user-attachments/assets/bc832513-91ba-4d28-ac8c-b49bc7d2532d"/> |  <img src="https://github.com/user-attachments/assets/6dc36078-2970-448c-910f-3c8a231d34e8"/>  |
+
+|                     Add Beneficiary Screen                      |                     Cards Screen                     |                    Add New Card Screen                     |
+|:---------------------------------------------------------------:|:----------------------------------------------------:|:----------------------------------------------------------:|
+|  <img src="https://github.com/user-attachments/assets/ed544bc1-abac-4934-84a0-e66cc93954f0" />  |  <img src="https://github.com/user-attachments/assets/6ec1ff4f-345e-406a-9667-0a227cc94469"/>  |  <img src="https://github.com/user-attachments/assets/8fa3ac98-0a83-41c4-9d82-67100cfa1574"/>  |
+
+|                     Edit Card Screen                      |                     Merchants Screen                      |                     KYC Screen                      |
+|:---------------------------------------------------------:|:---------------------------------------------------------:|:---------------------------------------------------:|
+|  <img src="https://github.com/user-attachments/assets/91011451-00df-4404-b9d8-ba6faad4a7af" />  |  <img src="https://github.com/user-attachments/assets/48759341-25cb-4322-8948-a7f84206b370"/>  |  <img src="https://github.com/user-attachments/assets/46a98a65-b619-40a3-986a-786149fffa7a"/>  |
+
+|                     Update Basic Details Screen                     |                        Upload Screen                         |                    Profile Screen                     |
+|:-------------------------------------------------------------------:|:------------------------------------------------------------:|:-----------------------------------------------------:|
+|  <img src="https://github.com/user-attachments/assets/a894c81b-2942-432c-a3a1-74ea1dcf64e6" />  | <img src="https://github.com/user-attachments/assets/c6f54b61-9edb-422b-84b4-7444c587bc32"/> | <img src="https://github.com/user-attachments/assets/6dddde82-2ebc-47f8-8a70-c1ee58cc6d31"/> |
+
+|                    Edit Profile Screen                     |                     Settings Screen                      |                    Notifications Screen                     |
+|:----------------------------------------------------------:|:--------------------------------------------------------:|:-----------------------------------------------------------:|
+| <img src="https://github.com/user-attachments/assets/a763eaeb-bfbf-4109-b4ff-a096961bbf95" /> |  <img src="https://github.com/user-attachments/assets/ce4fa873-c0ee-46c8-8517-82bbf30f65c4"/>  | <img src="https://github.com/user-attachments/assets/f1d1230e-f3d6-4b89-8e27-bcf70433c0ce"/> |
+
+|                      FAQ Screen                      |                     Change Password Screen                     | 
+|:----------------------------------------------------:|:--------------------------------------------------------------:|
+|  <img src="https://github.com/user-attachments/assets/bf1bbb74-e714-474c-9f47-b6c19dfe48cf" />  |  <img src="https://github.com/user-attachments/assets/40ce8173-2e93-4bfb-b6f0-e3506508c160"/>  |