Skip to content

Commit

Permalink
A
Browse files Browse the repository at this point in the history
migrate transfer process screen to compose screen openMF#2583 (openMF#2585)

refactor: qr code display migration (openMF#2609)

Migrate Beneficiary List from XML to compose (openMF#2607)

"Added MIfos Logo to RegistrationScreen" (openMF#2613)

* Added Image to RegistrationScreen

* "Added Image to RegistrationScreen"

Bug: Resolved Swipe Refresh Not Working in RecentTransaction Screen Compose (openMF#2617)

* "Resolved Swipe Refresh Not Working"

* Resolved Swipe Refresh Not Working

* Centered the Swipe Refresh And Added Padding

migrate saving accounts transaction screen to compose openMF#2588 (openMF#2596)

* migrate saving accounts transaction screen to compose openMF#2588

* Update SavingAccountsTransactionTopBar.kt

* init

* init

* refactor: savings accounts screen migration

* refactor: savings accounts screen migration

---------

Co-authored-by: Avneet Singh <avneetmaankiya@gmail.com>

fix#2615 Missing TopAppBar navigation back implementation in AddBeneficiaryScreen (openMF#2616)

fix#2610: Scrolling Disabled in TransferProcessFragment (openMF#2611)

fix#2610: Scrolling Disabled in TransferProcessFragment

fix#2610: Scrolling Disabled in TransferProcessFragment

Beneficiary application (openMF#2618)

Settings screen migration (openMF#2619)

refactor: Registration Module
  • Loading branch information
Saifuddin53 authored and akashmeruva9 committed Jul 1, 2024
1 parent 9f44824 commit cbc8d5a
Show file tree
Hide file tree
Showing 578 changed files with 10,486 additions and 4,266 deletions.
23 changes: 23 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,19 @@ android {
}

dependencies {

implementation(projects.core.logs)
implementation(projects.core.common)
implementation(projects.core.model)
implementation(projects.core.data)
implementation(projects.core.datastore)
implementation(projects.ui)
implementation(projects.feature.loan)

implementation(projects.feature.registration)
implementation(projects.feature.beneficiary)
implementation(projects.feature.guarantor)


implementation("androidx.legacy:legacy-support-v4:1.0.0")
implementation(libs.androidx.lifecycle.ktx)
Expand Down Expand Up @@ -164,6 +176,7 @@ dependencies {
api(libs.androidx.activity.compose)
api(platform(libs.androidx.compose.bom))
api(libs.androidx.compose.material3)
api(libs.androidx.compose.material)
api(libs.androidx.compose.foundation)
api(libs.androidx.compose.foundation.layout)
api(libs.androidx.compose.material.iconsExtended)
Expand All @@ -177,7 +190,17 @@ dependencies {
// google maps
implementation ("com.google.maps.android:maps-compose:4.4.1")

//image cropper
implementation("com.github.CanHub:Android-Image-Cropper:4.0.0")

// Google Bar code scanner
implementation(libs.google.app.code.scanner)

//cameraX
implementation(libs.androidx.camera.camera2)
implementation(libs.androidx.camera.lifecycle)
implementation(libs.androidx.camera.view)
implementation(libs.androidx.camera.core)
}


16 changes: 0 additions & 16 deletions app/src/debug/java/org/mifos/mobile/api/ObserveUiState.kt

This file was deleted.

21 changes: 17 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.mifos.mobile">

<uses-feature
android:name="android.hardware.camera"
android:required="false" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera.any" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Expand All @@ -18,11 +24,12 @@
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".ui.guarantor.GuarantorActivity"
android:exported="false"
android:label="@string/title_activity_guarantor"
android:name=".feature.guarantor.screens.GuarantorActivity"
android:theme="@style/AppTheme" />

<meta-data
android:name="com.google.mlkit.vision.DEPENDENCIES"
android:value="barcode_ui"/>
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
Expand All @@ -35,6 +42,12 @@
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="adjustResize" />

<activity android:name="com.canhub.cropper.CropImageActivity"
android:theme="@style/Base.Theme.AppCompat"
android:launchMode="singleTask"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activities.SplashActivity"
android:exported="true"
Expand Down Expand Up @@ -150,7 +163,7 @@
android:name=".utils.fcm.RegistrationIntentService"
android:exported="false" />

<activity android:name=".ui.activities.SettingsActivity" />
<activity android:name="org.mifos.mobile.ui.settings.SettingsActivity" />
</application>

</manifest>
8 changes: 3 additions & 5 deletions app/src/main/java/org/mifos/mobile/MifosSelfServiceApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ import com.mifos.mobile.passcode.utils.ForegroundChecker
import com.raizlabs.android.dbflow.config.FlowConfig
import com.raizlabs.android.dbflow.config.FlowManager
import dagger.hilt.android.HiltAndroidApp
import org.mifos.mobile.api.local.PreferencesHelper
import org.mifos.mobile.ui.fragments.applySavedTheme
import org.mifos.mobile.utils.LanguageHelper
import org.mifos.mobile.utils.LanguageHelper.onAttach
import java.util.Locale
import org.mifos.mobile.core.datastore.PreferencesHelper
import org.mifos.mobile.ui.settings.applySavedTheme
import org.mifos.mobile.core.common.utils.LanguageHelper.onAttach

/**
* @author ishan
Expand Down
32 changes: 16 additions & 16 deletions app/src/main/java/org/mifos/mobile/di/ApplicationModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import org.mifos.mobile.api.BaseApiManager
import org.mifos.mobile.api.DataManager
import org.mifos.mobile.api.local.DatabaseHelper
import org.mifos.mobile.api.local.PreferencesHelper
import org.mifos.mobile.api.services.AuthenticationService
import org.mifos.mobile.api.services.BeneficiaryService
import org.mifos.mobile.api.services.ClientChargeService
import org.mifos.mobile.api.services.ClientService
import org.mifos.mobile.api.services.GuarantorService
import org.mifos.mobile.api.services.LoanAccountsListService
import org.mifos.mobile.api.services.NotificationService
import org.mifos.mobile.api.services.RecentTransactionsService
import org.mifos.mobile.api.services.RegistrationService
import org.mifos.mobile.api.services.SavingAccountsListService
import org.mifos.mobile.api.services.ThirdPartyTransferService
import org.mifos.mobile.api.services.UserDetailsService
import org.mifos.mobile.core.datastore.DatabaseHelper
import org.mifos.mobile.core.datastore.PreferencesHelper
import org.mifos.mobile.core.network.BaseApiManager
import org.mifos.mobile.core.network.DataManager
import org.mifos.mobile.core.network.services.AuthenticationService
import org.mifos.mobile.core.network.services.BeneficiaryService
import org.mifos.mobile.core.network.services.ClientChargeService
import org.mifos.mobile.core.network.services.ClientService
import org.mifos.mobile.core.network.services.GuarantorService
import org.mifos.mobile.core.network.services.LoanAccountsListService
import org.mifos.mobile.core.network.services.NotificationService
import org.mifos.mobile.core.network.services.RecentTransactionsService
import org.mifos.mobile.core.network.services.RegistrationService
import org.mifos.mobile.core.network.services.SavingAccountsListService
import org.mifos.mobile.core.network.services.ThirdPartyTransferService
import org.mifos.mobile.core.network.services.UserDetailsService
import javax.inject.Singleton

/**
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.os.Bundle
import org.mifos.mobile.R
import org.mifos.mobile.databinding.ActivityContainerBinding
import org.mifos.mobile.ui.activities.base.BaseActivity
import org.mifos.mobile.ui.about.AboutUsFragment

/**
* @author Rajan Maurya
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.compose.material3.Scaffold
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.fragment.app.viewModels
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
import dagger.hilt.android.AndroidEntryPoint
import org.mifos.mobile.core.ui.theme.MifosMobileTheme
import org.mifos.mobile.ui.activities.PrivacyPolicyActivity
import org.mifos.mobile.ui.enums.AboutUsListItemId
import org.mifos.mobile.core.model.enums.AboutUsListItemId
import org.mifos.mobile.ui.fragments.base.BaseFragment
import org.mifos.mobile.utils.Constants.LICENSE_LINK
import org.mifos.mobile.utils.Constants.SOURCE_CODE_LINK
import org.mifos.mobile.utils.Constants.WEBSITE_LINK
import org.mifos.mobile.core.common.Constants.LICENSE_LINK
import org.mifos.mobile.core.common.Constants.SOURCE_CODE_LINK
import org.mifos.mobile.core.common.Constants.WEBSITE_LINK

/*
~This project is licensed under the open source MPL V2.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.mifos.mobile.core.model.enums.AboutUsListItemId
import org.mifos.mobile.core.ui.component.AboutUsItemCard
import org.mifos.mobile.core.ui.component.MifosItemCard
import org.mifos.mobile.ui.enums.AboutUsListItemId

@Composable
fun AboutUsScreen(viewModel: AboutUsViewModel) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import org.mifos.mobile.MifosSelfServiceApp.Companion.context
import org.mifos.mobile.R
import org.mifos.mobile.models.AboutUsItem
import org.mifos.mobile.ui.enums.AboutUsListItemId
import org.mifos.mobile.core.model.entity.AboutUsItem
import org.mifos.mobile.core.model.enums.AboutUsListItemId
import java.util.*
import javax.inject.Inject

Expand All @@ -22,7 +22,7 @@ class AboutUsViewModel @Inject constructor() : ViewModel() {
context?.getString(R.string.copy_right_mifos)
?.replace("%1\$s", currentYear.toString())

val aboutUsItems: List<AboutUsItem> = listOf(
val aboutUsItems = listOf(
AboutUsItem(
title = context?.getString(R.string.app_version_text),
itemId = AboutUsListItemId.APP_VERSION_TEXT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.mifos.mobile.ui.fragments
package org.mifos.mobile.ui.account

/*
import android.content.Intent
import android.os.Bundle
import android.os.Parcelable
Expand Down Expand Up @@ -28,8 +29,7 @@ import org.mifos.mobile.ui.adapters.SavingAccountsListAdapter
import org.mifos.mobile.ui.adapters.ShareAccountsListAdapter
import org.mifos.mobile.ui.fragments.base.BaseFragment
import org.mifos.mobile.utils.*
import org.mifos.mobile.utils.ParcelableAndSerializableUtils.getCheckedArrayListFromParcelable
import org.mifos.mobile.viewModels.AccountsViewModel
import org.mifos.mobile.core.common.utils.ParcelableAndSerializableUtils.getCheckedArrayListFromParcelable
import java.util.*
/**
Expand Down Expand Up @@ -548,3 +548,4 @@ class AccountsFragment : BaseFragment(), OnRefreshListener {
}
}
}
*/
Loading

0 comments on commit cbc8d5a

Please sign in to comment.