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

Settings V2 Branch into Master #342

Merged
merged 9 commits into from Sep 25, 2018
Merged

Settings V2 Branch into Master #342

merged 9 commits into from Sep 25, 2018

Conversation

Rcureton
Copy link
Contributor

What

  • Merging our temporary feature branch into Master

Rashad Cureton and others added 9 commits September 11, 2018 12:16
* completed screen for change email

* added proper dimens from dimens.xml

* fixed pr feedback
* added change password screen, toolbar and added style for textinputlayout

* refactored styles
* added cells for edit profile and change password

* made rows for account in settings and added account activity layout with rows

* added toolbar layout, account layout, AccountActivity, Updated SettingsNewViewModel

* added edit text and line restrictions

* re-added tests that were deleted accidentally

* fixed lines and spacing issues

* fixed imports

* fixed more imports

* moved the tests into the right package

* setup edit profile cell and added the activity

* added toolbar and imageview to edit profile

* still fixing layout

* updated strings, completed edit profile ui

* removed duplicate activity in manifest and sample layout

* fixed circle issues

* added icon for different screen mods

* fixed error

* fixed more errors

* fixed the last error
@Rcureton Rcureton requested a review from eoji September 25, 2018 17:23
@Rcureton Rcureton merged commit 2b98ddf into master Sep 25, 2018
@eoji eoji deleted the settings-v2 branch November 13, 2018 22:47
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.

None yet

2 participants