[2656] - refactor: Registration verification from XML to compose #2605

akashmeruva9 · 2024-06-12T15:54:59Z

VID-20240613-WA0004.mp4

[ x] Apply the AndroidStyle.xml style template to your code in Android Studio.
[x ] Run the unit tests with ./gradlew check to make sure you didn't break anything
[x ] If you have multiple commits please combine them into one commit by squashing them.

PratyushSingh07

i see that you have attached some screemshots and I was wondering if they are the same as the earlier XML designs. Also in the error state I think you should remove the Mifos Icon , it looks a bit odd . What do you have to say about this @AvneetSingh2001 ?

PratyushSingh07 · 2024-06-12T17:03:39Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationFragment.kt

+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        return mifosComposeView(requireContext()) {


set a view composition strategy below this line

view Composition strategy is implemented in mifosComposeView already, so no need

PratyushSingh07 · 2024-06-12T17:04:03Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationFragment_Old.kt


 /**
 * Created by dilpreet on 31/7/17.
 */
 @AndroidEntryPoint
-class RegistrationVerificationFragment : BaseFragment() {
+class RegistrationVerificationFragment_Old : BaseFragment() {
    private var _binding: FragmentRegistrationVerificationBinding? = null


remove this fragment if not needed

Rajan sir asked to add the old fragments in the meeting, that's why i am keeping them

AvneetSingh2001 · 2024-06-12T17:07:08Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationFragment.kt

+    ): View {
+        return mifosComposeView(requireContext()) {
+            RegistrationVerificationScreen(
+                registrationViewModel,


no need of passing viewModel. we can omit this parameter as we already assigned hiltViewModel

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

AvneetSingh2001 · 2024-06-12T17:10:46Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+
+
+@Composable
+    fun RegistrationVerificationContent(


Use MFScaffold, and pass this content in the scaffoldContent of the scaffold

AvneetSingh2001 · 2024-06-12T17:14:46Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+                            containerColor = if (isSystemInDarkTheme()) Color(
+                                0xFF9bb1e3
+                            ) else Color(0xFF325ca8)


single line if

AvneetSingh2001 · 2024-06-12T17:15:46Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+            }
+
+             RegistrationUiState.Success -> {
+                context.startActivity(Intent(context, LoginActivity::class.java))


dont start activity from here, do this in fragment, the callback should call this LoginActivity from fragment

AvneetSingh2001 · 2024-06-12T17:16:32Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+                    MifosOutlinedTextField(
+                        value = requestID,
+                        onValueChange = { requestID = it },
+                        label = R.string.request_id,
+                        supportingText = "",
+                        keyboardType = KeyboardType.Number
+                    )
+
+                    MifosOutlinedTextField(
+                        value = authenticationToken,
+                        onValueChange = { authenticationToken = it },
+                        label = R.string.authentication_token,
+                        supportingText = "",
+                        keyboardType = KeyboardType.Number
+                    )


do error handling as well for these textfields

AvneetSingh2001 · 2024-06-13T10:34:56Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+                    MifosProgressIndicator(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(10.dp)
+                            .background(MaterialTheme.colorScheme.background.copy(alpha = 0.7f))
+                    )


User MifosProgressOverlayIndicator

AvneetSingh2001 · 2024-06-13T10:35:45Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+            Image(
+                painterResource(R.drawable.mifos_logo),
+                contentDescription = "",
+                contentScale = ContentScale.Fit,
+                alignment = Alignment.Center,
+                modifier = Modifier
+                    .padding(dimensionResource(id = R.dimen.Mifos_DesignSystem_Spacing_screenHorizontalMargin))
+                    .height(dimensionResource(id = R.dimen.Mifos_DesignSystem_Size_LogoImageSize))
+                    .fillMaxWidth()
+            )


move this in content screen, show image only in the case of Initial state

AvneetSingh2001 · 2024-06-13T10:36:22Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+            },
+            Modifier
+                .fillMaxWidth()
+                .padding(start = 16.dp, end = 16.dp, top = 4.dp),


give top padding 12

AvneetSingh2001 · 2024-06-13T10:36:54Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+            confirmButton = {
+                TextButton(onClick = { showConfirmationDialog = false
+                    navigateBack.invoke() }) {
+                    Text(text = "Yes")


use stringResource

AvneetSingh2001 · 2024-06-13T10:37:02Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+            },
+            dismissButton = {
+                TextButton(onClick = { showConfirmationDialog = false }) {
+                    Text(text = "No")


use stringResource

AvneetSingh2001 · 2024-06-13T10:37:26Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+
+            Image(
+                painterResource(R.drawable.mifos_logo),
+                contentDescription = "",


pass null as contentDesc

AvneetSingh2001 · 2024-06-13T10:37:42Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+            .fillMaxSize()) {
+
+            Image(
+                painterResource(R.drawable.mifos_logo),


painter = painterResource(R.drawable.mifos_logo),

AvneetSingh2001 · 2024-06-13T12:00:43Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationActivity.kt

    override fun onBackPressed() {
-        MaterialDialog.Builder().init(this)
-            .setTitle(getString(R.string.dialog_cancel_registration_title))
-            .setMessage(getString(R.string.dialog_cancel_registration_message))
-            .setPositiveButton(getString(R.string.yes)) { _, _ -> super.onBackPressed() }
-            .setNegativeButton(R.string.no) { dialog, _ -> dialog.dismiss() }
-            .createMaterialDialog()
-            .show()
+       super.onBackPressed()
    }


remove this function

AvneetSingh2001 · 2024-06-13T12:02:56Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+    var showConfirmationDialog by remember { mutableStateOf(false) }
+
+    BackHandler(enabled = true)
+    {


BackHandler(endabled = true) {

do proper indentation

AvneetSingh2001 · 2024-06-13T12:03:37Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+
+        var temp = true
+        if (requestID.text.isEmpty()) {
+            requestIDError = true;


remove semicolon

AvneetSingh2001 · 2024-06-13T12:03:55Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+                requestIDError = false
+            },
+            label = R.string.request_id,
+            supportingText = "Request ID cannot be empty",


use stringResource

AvneetSingh2001 · 2024-06-13T12:04:09Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+                authenticationTokenError = false
+            },
+            label = R.string.authentication_token,
+            supportingText = "Authentication Token cannot be empty",


use stringResource

AvneetSingh2001 · 2024-06-13T12:39:09Z

app/src/main/java/org/mifos/mobile/ui/registration/RegistrationVerificationScreen.kt

+            },
+            Modifier
+                .fillMaxWidth()
+                .padding(start = 12.dp, end = 16.dp, top = 4.dp),


not start padding, top padding should be 12, keep start 16

* "Refactored registration verification screen to compose" * "Refactored registration verification screen to compose" * "Refactored registration verification screen to compose" * "Added AlertDialog, Component and resolved changes" * "Implemented Box for Content and Overlayed other states" * "Added String Resource and Indendtaions" * "Added String Resource and Indendtaions"

akashmeruva9 and others added 4 commits June 12, 2024 17:36

"Refactored registration verification screen to compose"

052db65

"Refactored registration verification screen to compose"

6760793

"Refactored registration verification screen to compose"

94122fb

Merge branch 'openMF:development' into registration_verification_compose

330a2ef

akashmeruva9 changed the title ~~Registration verification compose~~ refactor: Registration verification compose Jun 12, 2024

akashmeruva9 changed the title ~~refactor: Registration verification compose~~ refactor: Registration verification from XML to compose Jun 12, 2024

PratyushSingh07 requested changes Jun 12, 2024

View reviewed changes

AvneetSingh2001 requested changes Jun 12, 2024

View reviewed changes

"Added AlertDialog, Component and resolved changes"

38be3d3

AvneetSingh2001 requested changes Jun 13, 2024

View reviewed changes

"Implemented Box for Content and Overlayed other states"

f2fe8d9

AvneetSingh2001 requested changes Jun 13, 2024

View reviewed changes

"Added String Resource and Indendtaions"

26a27c6

AvneetSingh2001 requested changes Jun 13, 2024

View reviewed changes

"Added String Resource and Indendtaions"

c3afe12

therajanmaurya merged commit a522937 into openMF:development Jun 13, 2024
0 of 3 checks passed

akashmeruva9 mentioned this pull request Jun 20, 2024

[DMP 2024]: Mobile Wallet for G2P Payments openMF/mobile-wallet#1613

Open

akashmeruva9 mentioned this pull request Jul 11, 2024

[DMP 2024]: Mifos Mobile 6.0 - Mobile Banking App #2656

Open

akashmeruva9 changed the title ~~refactor: Registration verification from XML to compose~~ [2656] - refactor: Registration verification from XML to compose Jul 11, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[2656] - refactor: Registration verification from XML to compose #2605

[2656] - refactor: Registration verification from XML to compose #2605

akashmeruva9 commented Jun 12, 2024 •

edited

Loading

PratyushSingh07 left a comment

PratyushSingh07 Jun 12, 2024

AvneetSingh2001 Jun 12, 2024

PratyushSingh07 Jun 12, 2024

akashmeruva9 Jun 12, 2024

AvneetSingh2001 Jun 12, 2024

AvneetSingh2001 Jun 12, 2024

AvneetSingh2001 Jun 12, 2024

AvneetSingh2001 Jun 12, 2024

AvneetSingh2001 Jun 12, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

AvneetSingh2001 Jun 13, 2024

[2656] - refactor: Registration verification from XML to compose #2605

[2656] - refactor: Registration verification from XML to compose #2605

Conversation

akashmeruva9 commented Jun 12, 2024 • edited Loading

PratyushSingh07 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akashmeruva9 commented Jun 12, 2024 •

edited

Loading