Skip to content
This repository has been archived by the owner on Aug 4, 2019. It is now read-only.

Feature/addcodeverification #47

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
707146f
Set version code and verison name in build gradle , closed #1
miladsalimiiii Jul 17, 2019
35b9cd8
Merge pull request #2 from Carrene/feature/appversioning
EhsanMashhadi Jul 17, 2019
70eaba7
Create README.md
miladsalimiiii Jul 17, 2019
0797788
Merge pull request #3 from Carrene/feature/readme
EhsanMashhadi Jul 17, 2019
e589772
Add login
Arrowsome Jul 21, 2019
14bc9b5
Registeration UI,#6
TinaT2 Jul 21, 2019
4a71ef1
Add claim with all MVVM and web service packages,#6
TinaT2 Jul 21, 2019
2febd8a
Claim enhancement,#6
TinaT2 Jul 22, 2019
ec389a3
Claim test,closed #12
TinaT2 Jul 22, 2019
5212971
Flag image view bug fixed,closed #6
TinaT2 Jul 23, 2019
4da65ef
Add toolbar and font,#18
TinaT2 Jul 23, 2019
8e701e4
Fix issues from pull request reviews
Arrowsome Jul 24, 2019
1d38f45
Registration bug fixed for review 1,#18
TinaT2 Jul 24, 2019
861ee7a
Add base (activty and fragment)
Arrowsome Jul 24, 2019
5a4046d
Toolbar title,class exception,dialog bottom sheet fixed,#18
TinaT2 Jul 24, 2019
9c9f3e1
App style changed to Material components,#18
TinaT2 Jul 24, 2019
912621a
Fix a mistake in BaseActivity
Arrowsome Jul 24, 2019
e1f91c2
Fix pattern redraw
Arrowsome Jul 27, 2019
27383f6
Registration fix: phone input format,#18
TinaT2 Jul 27, 2019
9644d45
Name convention and not using from deprecated code fixed,#18
TinaT2 Jul 28, 2019
e4bd3db
Add ViewModel and Koin #5
Arrowsome Jul 28, 2019
1a159c4
Review the code, Add pattern view model test closed #25
EhsanMashhadi Jul 28, 2019
7f3553e
Merge branch 'feature/loginpattern' into develop
EhsanMashhadi Jul 28, 2019
e492a6b
Review the code
EhsanMashhadi Jul 28, 2019
b010162
Fix ViewModel, compelete tests and some name conventions,closed #18"
TinaT2 Jul 29, 2019
5f8fa35
Merge the feature/registration into develop, Review the code, Add TODOs
ehsan-mashhadi Jul 29, 2019
cbd0532
Refactor styles, strings, colors, dimens,closed #30
TinaT2 Jul 29, 2019
5da055e
Refactor gradle files for removing duplicate lines,closed #32
TinaT2 Jul 29, 2019
6b1322b
Set the default country for the country picker,closed #29
TinaT2 Jul 30, 2019
4263c1c
Fix phone validator convention,closed #36
TinaT2 Jul 30, 2019
9d31442
Add test for failed status,closed #33
TinaT2 Jul 30, 2019
4f4dfe0
Fixed selector problem for set in the button,closed #38
TinaT2 Jul 30, 2019
f55f1cb
Merge branch 'refactor/code-convention' into develop
ehsan-mashhadi Jul 30, 2019
2dc12fb
Add code verification , closed #46
Miladsalimiiiii Aug 1, 2019
1b1f30f
Wrok on set timer test in code verification view model test , issue #34
Miladsalimiiiii Aug 1, 2019
3454332
Complete set timer test , closed #34
Miladsalimiiiii Aug 3, 2019
226cb9a
Create resend text color selector and button text color selector , cl…
Miladsalimiiiii Aug 3, 2019
46ae7dc
Add reset Schedulers to code verification view model test , closed #52
Miladsalimiiiii Aug 3, 2019
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
Prev Previous commit
Next Next commit
Refactor styles, strings, colors, dimens,closed #30
TinaT2 committed Jul 29, 2019
commit cbd05328cdaae025fd5ec0dda24cb2b2c3fe5f14
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ class PatternFragment : BaseFragment(), PatternLockViewListener {
private fun updateToolbar() {
val activity = requireActivity()
if (activity is MainHostActivity) {
activity.updateToolbarTitle(getString(R.string.patternLogin_stepNOfFour, "1"))
activity.updateToolbarTitle(getString(R.string.all_stepNOfFour, "1"))
}
}

Original file line number Diff line number Diff line change
@@ -174,6 +174,6 @@ class RegistrationFragment : BaseFragment() {

private fun disableContinueButton() {
mContinueButton.isEnabled = false
mContinueButton.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.buttonDisable))
mContinueButton.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.colorPrimaryDark))
}
}
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/temp.xml
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/temp" />
<solid android:color="@color/colorLightTertiary" />
</shape>
10 changes: 5 additions & 5 deletions app/src/main/res/layout/fragment_registration.xml
Original file line number Diff line number Diff line change
@@ -16,15 +16,15 @@

<TextView
android:text="@string/registration_registration"
style="@style/H2HeadLineDarkText"
style="@style/H2WithDarkTextColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView_registration_header" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="8dp"
android:layout_marginBottom="10dp" app:layout_constraintBottom_toTopOf="@+id/textView_registration_guid"/>
<TextView
style="@style/Body3LightText"
style="@style/Body3WithBaliHaiTextColor"
android:text="@string/registration_guid"
android:layout_width="240dp"
android:layout_height="wrap_content"
@@ -82,9 +82,9 @@
android:layout_marginStart="8dp"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.button.MaterialButton
android:background="@color/buttonDisable"
app:cornerRadius="@dimen/buttonRadius"
style="@style/H1HeadLineLightText"
android:background="@color/colorPrimaryDark"
app:cornerRadius="@dimen/size_all_buttonRadius_25"
style="@style/H1WithWhiteTextColor"
android:enabled="false"
android:text="@string/registration_continue"
android:layout_width="296dp"
16 changes: 7 additions & 9 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -3,17 +3,15 @@
<color name="colorPrimary">#F4F3F5</color>
<color name="colorPrimaryDark">#E6E6E6</color>
<color name="colorAccent">#D81B60</color>
<color name="colorTertiary">#7A6AE9</color>
<color name="colorLightTertiary">#D4D1F1</color>
<color name="black">#000000</color>
<color name="white">#FFFFFF</color>
<color name="tertiary">#7A6AE9</color>
<color name="text">#8B989F</color>
<color name="colorLightPrimary">#FFFFFF</color>
<color name="darkText">#00141E</color>
<color name="background">#F2F1F6</color>
<color name="text">#8B989F</color>
<color name="colorBaliHai">#91999C</color>



<color name="temp">#D4D1F1</color>
<color name="lightText">#91999C</color>
<color name="border">#8B989F</color>
<color name="buttonDisable">#E6E6E6</color>
<color name="circleImage">#D4D1F1</color>
<color name="colorTertiary">#7A6AE9</color>
</resources>
7 changes: 1 addition & 6 deletions app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
@@ -22,11 +22,6 @@

<integer name="count_patternView_dots">3</integer>

<!--TODO-Tina Name Convention-->
<dimen name="imageWidth">28dp</dimen>
<dimen name="imageHeight">20dp</dimen>
<dimen name="smallTextSize">14sp</dimen>
<dimen name="mediumTextSize">16sp</dimen>
<dimen name="buttonRadius">25dp</dimen>
<dimen name="size_all_buttonRadius_25">25dp</dimen>

</resources>
3 changes: 1 addition & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -4,13 +4,12 @@
<string name="patternLogin_messageDraw">Draw a sample pattern for more secure</string>
<string name="patternLogin_messageDrawAgain">Draw your pattern again</string>
<string name="patternLogin_skipToPattern">Switch to Password</string>
<string name="patternLogin_stepNOfFour" tools:ignore="TypographyFractions">Step %1$s/4</string>
<string name="imageView_contentDescription">-</string>
<string name="registration_registration">Registration</string>
<string name="registration_guid">Enter your phone number, we will send you OTP to verify later.</string>
<string name="registration_continue">Continue</string>
<string name="registration_hint">- - - - - - - - - -</string>
<string name="registration_iranCode">(+98)</string>
<string name="registration_countryCode">(%1$s)</string>
<string name="all_stepNOfFour">Step %1$s/4</string>
<string name="all_stepNOfFour" tools:ignore="TypographyFractions">Step %1$s/4</string>
</resources>
57 changes: 8 additions & 49 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,12 @@
</style>

<style name="H1WithTertiaryColor" parent="H1">
<item name="android:textColor">@color/tertiary</item>
<item name="android:textColor">@color/colorTertiary</item>
</style>


<style name="H1WithWhiteTextColor" parent="H1">
<item name="android:textColor">@color/colorLightPrimary</item>
</style>

<!-- H2 -->
@@ -87,55 +92,9 @@
<item name="android:textColor">@color/darkText</item>
</style>


<style name="CaptionWithTextColor" parent="Caption">
<item name="android:textColor">@color/text</item>
</style>

<style name="CaptionWithDarkTextColor" parent="Caption">
<item name="android:textColor">@color/darkText</item>
</style>

<!--//TODO-Tina Refactor styles-->

<style name="RobotoBold" parent="AppTheme">
<item name="android:fontFamily">@font/roboto_bold</item>
</style>

<style name="RobotoMedium" parent="AppTheme">
<item name="android:fontFamily">@font/roboto_medium</item>
</style>

<style name="RobotoRegular" parent="AppTheme">
<item name="android:fontFamily">@font/roboto_regular</item>
</style>

<style name="H1HeadLine" parent="RobotoMedium">
<item name="android:textSize">@dimen/mediumTextSize</item>
</style>
<style name="H2HeadLine" parent="RobotoBold">
<item name="android:textSize">@dimen/mediumTextSize</item>
</style>

<style name="Caption" parent="RobotoMedium">
<item name="android:textSize">@dimen/mediumTextSize</item>
</style>

<!--main styles-->
<style name="H1HeadLineLightText" parent="H1HeadLine">
<item name="android:textColor">@color/white</item>
</style>

<style name="H1HeadLineDarkText" parent="H1HeadLine">
<item name="android:textColor">@color/darkText</item>
</style>

<style name="H2HeadLineDarkText" parent="H2HeadLine">
<item name="android:textColor">@color/darkText</item>
<style name="Body3WithBaliHaiTextColor" parent="Body3">
<item name="android:textColor">@color/colorBaliHai</item>
</style>

<style name="Body3LightText" parent="Body3">
<item name="android:textColor">@color/lightText</item>
</style>

</resources>