Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

migrate transfer process screen to compose screen #2583 #2585

Merged
merged 6 commits into from
Jun 14, 2024
Merged

migrate transfer process screen to compose screen #2583 #2585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
998c1d9
migrate transfer process screen to compose #2583
Saifuddin53 May 11, 2024
67f2e8d
preview added
Saifuddin53 Jun 3, 2024
d933e6d
conflicts resolved
Saifuddin53 Jun 3, 2024
a8382f8
Resolve conflicts error solved
Saifuddin53 Jun 3, 2024
5739cf3
refactor: transfer Process screen migration to compose
AvneetSingh2001 Jun 14, 2024
d0b3f39
Merge branch 'development' into migration_transfer_process_compose
AvneetSingh2001 Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/org/mifos/mobile/ui/activities/HomeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import org.mifos.mobile.ui.getThemeAttributeColor
import org.mifos.mobile.ui.help.HelpActivity
import org.mifos.mobile.ui.home.HomeOldFragment
import org.mifos.mobile.ui.login.LoginActivity
import org.mifos.mobile.ui.transfer_process.TransferProcessComposeFragment
import org.mifos.mobile.utils.Constants
import org.mifos.mobile.utils.TextDrawable
import org.mifos.mobile.utils.Toaster
Expand Down Expand Up @@ -383,8 +384,7 @@ class HomeActivity :
doubleBackToExitPressedOnce = true
Toaster.show(findViewById(android.R.id.content), getString(R.string.exit_message))
Handler().postDelayed({ doubleBackToExitPressedOnce = false }, 2000)
} else if (fragment is TransferProcessFragment) {
fragment.cancelTransferProcess()
} else if (fragment is TransferProcessComposeFragment) {
}

if (stackCount() != 0) {
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/org/mifos/mobile/ui/fragments/SavingsMakeTransferFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.mifos.mobile.ui.fragments

import android.os.Bundle
import android.os.Parcelable
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
Expand All @@ -22,11 +21,11 @@ import org.mifos.mobile.databinding.FragmentSavingsMakeTransferBinding
import org.mifos.mobile.models.payload.TransferPayload
import org.mifos.mobile.models.templates.account.AccountOption
import org.mifos.mobile.models.templates.account.AccountOptionsTemplate
import org.mifos.mobile.ui.activities.SavingsAccountContainerActivity
import org.mifos.mobile.ui.activities.base.BaseActivity
import org.mifos.mobile.ui.adapters.AccountsSpinnerAdapter
import org.mifos.mobile.ui.enums.TransferType
import org.mifos.mobile.ui.fragments.base.BaseFragment
import org.mifos.mobile.ui.transfer_process.TransferProcessComposeFragment
import org.mifos.mobile.utils.Constants
import org.mifos.mobile.utils.DateHelper
import org.mifos.mobile.utils.Network
Expand Down Expand Up @@ -159,7 +158,7 @@ class SavingsMakeTransferFragment : BaseFragment() {
}

/**
* Checks validation of `etRemark` and then opens [TransferProcessFragment] for
* Checks validation of `etRemark` and then opens [TransferProcessComposeFragment] for
* initiating the transfer
*/
private fun reviewTransfer() {
Expand All @@ -182,7 +181,7 @@ class SavingsMakeTransferFragment : BaseFragment() {
transferPayload?.fromAccountNumber = fromAccountOption?.accountNo
transferPayload?.toAccountNumber = toAccountOption?.accountNo
(activity as BaseActivity?)?.replaceFragment(
TransferProcessFragment.newInstance(
TransferProcessComposeFragment.newInstance(
transferPayload,
TransferType.SELF,
),
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/org/mifos/mobile/ui/fragments/ThirdPartyTransferFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import org.mifos.mobile.ui.adapters.BeneficiarySpinnerAdapter
import org.mifos.mobile.ui.beneficiary.presentation.BeneficiaryAddOptionsFragment
import org.mifos.mobile.ui.enums.TransferType
import org.mifos.mobile.ui.fragments.base.BaseFragment
import org.mifos.mobile.ui.transfer_process.TransferProcessComposeFragment
import org.mifos.mobile.utils.Constants
import org.mifos.mobile.utils.DateHelper
import org.mifos.mobile.utils.Network
Expand Down Expand Up @@ -205,7 +206,7 @@ class ThirdPartyTransferFragment : BaseFragment(), OnItemSelectedListener {
}

/**
* Checks validation of `etRemark` and then opens [TransferProcessFragment] for
* Checks validation of `etRemark` and then opens [TransferProcessComposeFragment] for
* initiating the transfer
*/
private fun reviewTransfer() {
Expand Down Expand Up @@ -242,7 +243,7 @@ class ThirdPartyTransferFragment : BaseFragment(), OnItemSelectedListener {
transferPayload.fromAccountNumber = fromAccountOption?.accountNo
transferPayload.toAccountNumber = beneficiaryAccountOption?.accountNo
(activity as BaseActivity?)?.replaceFragment(
TransferProcessFragment.newInstance(
TransferProcessComposeFragment.newInstance(
transferPayload,
TransferType.TPT,
),
Expand Down
Loading