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.

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

New UI to change password #1781

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from

Conversation

rodrigosouzalopes94
Copy link

@rodrigosouzalopes94 rodrigosouzalopes94 commented Oct 4, 2024

Issue Fix

Fixes #{Issue Number}
Jira Task: [MW145]https://mifosforge.jira.com/browse/MW-148

Screenshots

New Screen Old Screen
print_MW145 old_screen_password

Description

A new change password screen

  • Apply the AndroidStyle.xml style template to your code in Android Studio.

  • Run the unit tests with ./gradlew check to make sure you didn't break anything

  • If you have multiple commits please combine them into one commit by squashing them.

label = { Text(label) },
label = { Text(
label,
color = NewUi.primaryColor,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you format these lines of code.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already change

) {

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove blank lines

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

focusedBorderColor = Color.Transparent, // Cor da borda quando focado
unfocusedBorderColor = Color.Transparent, // Cor da borda quando não focado
errorBorderColor = Color.Transparent, // Cor da borda quando em erro
disabledBorderColor = Color.Transparent, // Cor da borda quando desabilitado
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And remove these comments too

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

modifier = Modifier.background(color = Color.White),

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove these extra blank lines..

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

)
.fillMaxWidth(0.9f)
.padding(vertical = 8.dp),

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the blank lines

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

)
Spacer(modifier = Modifier.height(8.dp))


Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove here too

@niyajali
Copy link
Collaborator

niyajali commented Oct 5, 2024

Run ci-prepush.sh bash script before commiting or pushing your changes it will format and check for any errors

@niyajali
Copy link
Collaborator

niyajali commented Oct 5, 2024

Can you upload both Old UI and Updated UI Image

@niyajali
Copy link
Collaborator

niyajali commented Oct 5, 2024

Commit your changes, i didn't see any

git Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this file

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@niyajali
Copy link
Collaborator

niyajali commented Oct 7, 2024

@rodrigosouzalopes94 fix this build error

Task :core:designsystem:compileDemoDebugKotlin FAILED
e: file:///home/runner/work/mobile-wallet/mobile-wallet/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TextField.kt:119:25 Unresolved reference 'NewUi'.

Copy link
Contributor

@itsPronay itsPronay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @rodrigosouzalopes94 , thanks for the PR but You modified the old OutlinedTextField and set colors to color.Transparent. We won't be using that anymore.

Take reference from finance/payment/editProfile screen. also after you are done please attach the figma UI as well

@rodrigosouzalopes94
Copy link
Author

Hello @rodrigosouzalopes94 , thanks for the PR but You modified the old OutlinedTextField and set colors to color.Transparent. We won't be using that anymore.

Take reference from finance/payment/editProfile screen. also after you are done please attach the figma UI as well

Can you help to make the clean code about these styles?

@itsPronay
Copy link
Contributor

Can you help to make the clean code about these styles?

it's not about styles, You need to modify MifosTextField that we already have in textfield.kt file.
If you still have any doubts feel free to let me know on Slack.

@rodrigosouzalopes94
Copy link
Author

Done.

@itsPronay
Copy link
Contributor

itsPronay commented Oct 9, 2024

Done.

  1. please update the new UI in your commit message. also, add Figma UI as well
  2. fix conflicts
  3. Please squash your commits as well (squash before pulling the remote changes)
    image

Some fixed blank spaces and remove comments

Delete git file

Fixed the password screen
@rodrigosouzalopes94
Copy link
Author

Figma UI
image
New Screen
newUI

Copy link
Author

@rodrigosouzalopes94 rodrigosouzalopes94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the conflits

@niyajali
Copy link
Collaborator

@rodrigosouzalopes94 As I can see, the trailing icon color doesn't match the color as per Figma UI

@rodrigosouzalopes94
Copy link
Author

I gonna fixed.

@niyajali
Copy link
Collaborator

@rodrigosouzalopes94 take a look into this pr #1787 , might helps

@therajanmaurya
Copy link
Member

@niyajali can you help @rodrigosouzalopes94 so we can merge this PR

@niyajali
Copy link
Collaborator

@rodrigosouzalopes94 Here is the pr #1787 of this module

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants