diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java index ce298ff9..33d7c8f2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java @@ -73,9 +73,6 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen Button btn_submit; - @BindView(R.id.tv_login) - TextView tv_login; - @BindView(R.id.scrollView) ScrollView scrollView; @@ -219,6 +216,7 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen presenter.registerUser(); } + @OnClick(R.id.tv_login) @Override public void redirectToLogin() { Intent redirectIntent = new Intent(this, LoginV2Activity.class); diff --git a/app/src/main/res/drawable/mform_with_corner_radius_bg.xml b/app/src/main/res/drawable/mform_with_corner_radius_bg.xml new file mode 100644 index 00000000..f402be9e --- /dev/null +++ b/app/src/main/res/drawable/mform_with_corner_radius_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_change_password_v2.xml b/app/src/main/res/layout/activity_change_password_v2.xml index 4c9a2673..b0773d7b 100644 --- a/app/src/main/res/layout/activity_change_password_v2.xml +++ b/app/src/main/res/layout/activity_change_password_v2.xml @@ -15,9 +15,7 @@ android:layout_height="wrap_content" android:scrollbars="none"> diff --git a/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml b/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml index 92bbf466..cadda7a1 100644 --- a/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml +++ b/app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml @@ -11,25 +11,14 @@ + > @@ -161,10 +150,7 @@ @@ -421,11 +407,7 @@ android:layout_gravity="center" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" - android:background="@drawable/ic_rounded_background_red_coloured" android:text="@string/calculate_text" - android:textAllCaps="false" - android:textColor="@color/white" - android:textSize="@dimen/_14ssp" /> diff --git a/app/src/main/res/layout/fragment_verification_send_money_v2.xml b/app/src/main/res/layout/fragment_verification_send_money_v2.xml index ef4c201b..04236869 100644 --- a/app/src/main/res/layout/fragment_verification_send_money_v2.xml +++ b/app/src/main/res/layout/fragment_verification_send_money_v2.xml @@ -1,25 +1,17 @@ + android:focusable="true" + android:scrollbars="none"> + style="@style/MFormBoundWithCornerRadius" + android:orientation="vertical"> + - - + android:orientation="horizontal" + android:paddingTop="@dimen/_8sdp"> + + - + - + - + - + - + + - + - + - + - + - + + android:paddingTop="@dimen/_8sdp"> - + + android:orientation="horizontal" + android:visibility="gone"> + - + android:text="@string/agree_and_send_text" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 58b3cf58..3b696b2c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -44,4 +44,7 @@ @color/darkgray2 + @color/white + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 70f39754..21520258 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -30,6 +30,8 @@ @dimen/_200sdp @dimen/_6sdp + @dimen/_8sdp + @dimen/_3sdp @dimen/_8sdp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4156b85e..866143a5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -209,6 +209,10 @@ wrap_content match_parent +