IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Keypad is explicitly in english for reciever add/edit

master
Preyea Regmi 5 years ago
parent
407ab5750d
commit
26ba670bee
4 changed files with 253 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
  3. 12
      app/src/main/res/layout/activity_recipient_v2.xml
  4. 241
      app/src/main/res/layout/activity_reward_redeem_v2.xml

BIN
.idea/caches/build_file_checksums.ser
View File

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
View File

@ -199,6 +199,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
onBackPressed();
break;
case R.id.selectedLanguageText:
case R.id.selectedLanguageIcon:
if (!languageViewTransitionManager.isUserOnLanguageSelectionView())
languageViewTransitionManager.showLanguageView(null);
break;
@ -213,6 +214,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
btn_new_user.setOnClickListener(this);
iv_back.setOnClickListener(this);
selectedLanguageText.setOnClickListener(this);
selectedLanguageIcon.setOnClickListener(this);
}
@Override
@ -222,6 +224,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
btn_new_user.setOnClickListener(null);
iv_back.setOnClickListener(null);
selectedLanguageText.setOnClickListener(null);
selectedLanguageIcon.setOnClickListener(null);
}

12
app/src/main/res/layout/activity_recipient_v2.xml
View File

@ -53,7 +53,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_firstname"
style="@style/editetxtsingleline"
android:imeOptions="actionDone"
android:imeOptions="flagForceAscii|actionDone"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
@ -70,7 +70,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_middlename"
style="@style/editetxtsingleline"
android:imeOptions="actionDone"
android:imeOptions="flagForceAscii|actionDone"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
@ -87,7 +87,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_lastname"
style="@style/editetxtsingleline"
android:imeOptions="actionDone"
android:imeOptions="flagForceAscii|actionDone"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
@ -231,7 +231,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_address"
android:imeOptions="actionDone"
android:imeOptions="flagForceAscii|actionDone"
style="@style/editetxtsingleline"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -290,7 +290,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_mobile_no"
style="@style/editetxtsingleline"
android:imeOptions="actionDone"
android:imeOptions="flagForceAscii|actionDone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="phone" />
@ -306,7 +306,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_email"
android:imeOptions="actionDone"
android:imeOptions="flagForceAscii|actionDone"
style="@style/editetxtsinglelineDone"
android:layout_width="match_parent"
android:layout_height="wrap_content"

241
app/src/main/res/layout/activity_reward_redeem_v2.xml
View File

@ -1,9 +1,246 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:context="com.gmeremit.online.gmeremittance_native.rewardV2.view.rewardredeem.RewardRedeemV2Activity">
<android.support.constraint.ConstraintLayout
android:id="@+id/relativeLayout3"
android:layout_width="match_parent"
android:layout_height="132dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="8dp"
android:background="@drawable/ic_wallet_status_background"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/imageView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_reward_point"
app:layout_constraintBottom_toTopOf="@+id/gmeTextView4"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintTop_toTopOf="parent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/gmeTextView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Reward Points"
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/txt_reward_points"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.39"
app:layout_constraintStart_toStartOf="@+id/guideline2"
app:layout_constraintTop_toTopOf="@+id/imageView6"
app:layout_constraintVertical_chainStyle="packed" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_reward_points"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:singleLine="false"
android:text="9999999999"
android:textColor="@color/white"
android:textSize="24sp"
app:layout_constraintBottom_toBottomOf="@+id/imageView6"
app:layout_constraintEnd_toEndOf="@+id/gmeTextView3"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="@+id/gmeTextView3"
app:layout_constraintTop_toBottomOf="@+id/gmeTextView3" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/gmeTextView4"
android:layout_width="364dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="Note: The reward points is valid for a year only."
android:textColor="@color/white"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<android.support.constraint.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.39" />
</android.support.constraint.ConstraintLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/nameWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="8dp"
android:hint="@string/receiver_text"
android:textColorHint="@color/darkgray"
app:errorEnabled="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/relativeLayout3">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_name"
style="@style/editetxtsingleline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionDone" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/mobileWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:hint="@string/mobile_number_text"
android:textColorHint="@color/darkgray"
app:errorEnabled="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nameWrapper">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_mobilename"
style="@style/editetxtsingleline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionDone" />
</android.support.design.widget.TextInputLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/redeemTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="12dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="12dp"
android:gravity="center"
android:singleLine="false"
android:text="Select branch to redeem your reward"
android:textColor="@color/darkgray"
android:textSize="17sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mobileWrapper" />
<FrameLayout
android:layout_marginTop="15dp"
android:id="@+id/branchSelectView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/redeemTitle"
>
<android.support.design.widget.TextInputLayout
android:id="@+id/genderListWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/select_branch_text"
android:textColorHint="@color/darkgray"
app:errorEnabled="true">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_gender"
style="@style/editetxtsingleline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:cursorVisible="false"
android:enabled="true"
android:focusable="false"
android:imeOptions="actionDone"
android:singleLine="false" />
</android.support.design.widget.TextInputLayout>
<ImageView
android:layout_marginEnd="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginBottom="8dp"
android:background="@drawable/ic_arrow_down" />
</FrameLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/rewardClaimTxt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="25dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="25dp"
android:gravity="center"
android:singleLine="false"
android:text="You visit nearest GME branch to redeem you reward directly."
android:textColor="@color/colorPrimary"
android:textSize="17sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/branchSelectView" />
<ImageView
android:id="@+id/locationImageView"
android:layout_width="52dp"
android:layout_height="52dp"
android:layout_marginStart="8dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_gme_location_circlebackground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rewardClaimTxt" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_submit"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:layout_marginStart="8dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="8dp"
android:background="@drawable/ic_rounded_background_coloured"
android:text="@string/submit_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/locationImageView" />
</android.support.constraint.ConstraintLayout>
</ScrollView>
Write Preview
Loading…
Cancel
Save