Skip to content

Commit

Permalink
Merge branch 'openMF:dev' into Fix#1198
Browse files Browse the repository at this point in the history
  • Loading branch information
@Prashant830
Prashant830 committed Aug 9, 2022
2 parents 526a7db + 0891622 commit 1795f36
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 35 deletions.
5 changes: 1 addition & 4 deletions ...main/java/org/mifos/mobilewallet/mifospay/registration/ui/MobileVerificationActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ public class MobileVerificationActivity extends BaseActivity implements
ProgressBar mProgressBar;
@BindView(R.id.tv_verifying_otp)
TextView mTvVerifyingOtp;
@BindView(R.id.ccp_country)
CountryCodePicker mCcpCountry;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -63,7 +61,6 @@ protected void onCreate(Bundle savedInstanceState) {
showColoredBackButton(Constants.WHITE_BACK_BUTTON);

mCcpCode.registerCarrierNumberEditText(mEtMobileNumber);
mCcpCountry.setCustomMasterCountries(null);
}

@Override
Expand Down Expand Up @@ -148,7 +145,7 @@ public void onOtpVerificationSuccess() {
intent.putExtra(Constants.GOOGLE_GIVEN_NAME,
getIntent().getStringExtra(Constants.GOOGLE_GIVEN_NAME));

intent.putExtra(Constants.COUNTRY, mCcpCountry.getSelectedCountryName());
intent.putExtra(Constants.COUNTRY, mCcpCode.getSelectedCountryName());
intent.putExtra(Constants.MOBILE_NUMBER, mCcpCode.getFullNumber());

startActivity(intent);
Expand Down
50 changes: 19 additions & 31 deletions mifospay/src/main/res/layout/activity_mobile_verification.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,7 @@
android:layout_height="wrap_content"
android:background="@color/primaryDarkBlue"
android:theme="@style/Theme.AppCompat"
app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">

<com.hbb20.CountryCodePicker
android:id="@+id/ccp_country"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:ccpDialog_backgroundColor="@color/white"
app:ccp_autoDetectCountry="true"
app:ccp_autoFormatNumber="false"
app:ccp_contentColor="@color/white"
app:ccp_showFullName="true"
app:ccp_showNameCode="false"
app:ccp_showPhoneCode="false"
app:ccp_textGravity="CENTER"/>

</android.support.v7.widget.Toolbar>
app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"/>

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -62,8 +46,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/value_10dp"
android:layout_marginTop="@dimen/value_5dp"
android:layout_marginBottom="@dimen/value_10dp"
android:text="@string/enter_mobile_number_description"
android:textColor="@color/white"
android:textSize="@dimen/value_14sp"/>
Expand All @@ -76,40 +60,44 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/value_20dp"
android:layout_marginRight="@dimen/value_20dp"
android:layout_marginTop="@dimen/value_20dp"
android:orientation="horizontal">
android:layout_marginRight="@dimen/value_20dp"
android:orientation="horizontal"
android:weightSum="7">

<com.hbb20.CountryCodePicker
android:id="@+id/ccp_code"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center_vertical"
android:layout_weight="2.9"
android:gravity="center_vertical"
app:ccp_autoDetectCountry="true"
app:ccp_autoFormatNumber="false"/>

<android.support.design.widget.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="@dimen/value_160dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="@string/mobile" >
android:layout_weight="3.2"
android:hint="@string/mobile">

<android.support.design.widget.TextInputEditText
android:id="@+id/et_mobile_number"
android:layout_width="@dimen/value_160dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLength="@integer/telephone_numbers_max_length_standard"
android:inputType="number" />
android:inputType="number"
android:maxLength="@integer/telephone_numbers_max_length_standard"/>

</android.support.design.widget.TextInputLayout>

<TextView
android:id="@+id/btn_get_otp"
android:layout_width="40dp"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_gravity="right|center_vertical|center_horizontal"
android:layout_marginLeft="@dimen/value_10dp"
android:layout_weight=".9"
android:background="@drawable/ic_right_arrow"/>

</LinearLayout>
Expand All @@ -118,24 +106,24 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/value_20dp"
android:layout_marginRight="@dimen/value_20dp"
android:layout_marginTop="@dimen/value_10dp"
android:layout_marginRight="@dimen/value_20dp"
android:orientation="horizontal">


<android.support.design.widget.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="wrap_content"
android:layout_height="@dimen/value_48dp"
android:hint="@string/otp" >
android:hint="@string/otp">

<android.support.design.widget.TextInputEditText
android:id="@+id/et_otp"
android:layout_width="@dimen/value_120dp"
android:visibility="gone"
android:layout_height="wrap_content"
android:inputType="number"
android:maxLength="@integer/telephone_numbers_max_length_standard"
android:inputType="number" />
android:visibility="gone"/>

</android.support.design.widget.TextInputLayout>

Expand Down

0 comments on commit 1795f36

Please sign in to comment.