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

Ready for testing

master
Preyea Regmi 5 years ago
parent
669ee32e43
commit
a5457e5ad7
9 changed files with 103 additions and 74 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. 40
      app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GmeEditText.java
  2. 17
      app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
  3. 4
      app/src/main/res/layout/activity_splash_screen.xml
  4. 45
      app/src/main/res/layout/activity_splash_screen_key_0.xml
  5. 50
      app/src/main/res/layout/activity_splash_screen_key_1.xml
  6. 14
      app/src/main/res/layout/activity_splash_screen_key_2.xml
  7. 5
      app/src/main/res/layout/fragment_kyc_view1_v2.xml
  8. 1
      app/src/main/res/layout/fragment_kyc_view2_v2.xml
  9. 1
      app/src/main/res/values/attrs.xml

40
app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/GmeEditText.java
View File

@ -6,7 +6,6 @@ import android.support.v7.widget.AppCompatEditText;
import android.text.InputFilter;
import android.text.Spanned;
import android.util.AttributeSet;
import android.util.Log;
import android.view.inputmethod.EditorInfo;
import com.gmeremit.online.gmeremittance_native.R;
@ -17,7 +16,8 @@ import com.gmeremit.online.gmeremittance_native.utils.Utils;
*/
public class GmeEditText extends AppCompatEditText {
private boolean shouldApplyAsciiFilter=true;
private boolean shouldApplyAsciiFilter = true;
private int maxLength;
public GmeEditText(Context context, AttributeSet attrs, int defStyleAttr) {
@ -32,41 +32,44 @@ public class GmeEditText extends AppCompatEditText {
public GmeEditText(Context context) {
super(context);
init(context,null);
init(context, null);
}
private void init(Context context, AttributeSet attrs) {
String regEx=null;
String regEx = null;
if (attrs != null) {
TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.GmeEditText);
String fontName = a.getString(R.styleable.GmeEditText_edfontName);
shouldApplyAsciiFilter = a.getBoolean(R.styleable.GmeEditText_applyASCIIFilter,true);
setTypeface(FontCache.getTypeface(fontName,context));
shouldApplyAsciiFilter = a.getBoolean(R.styleable.GmeEditText_applyASCIIFilter, true);
shouldApplyAsciiFilter = a.getBoolean(R.styleable.GmeEditText_applyASCIIFilter, true);
maxLength = a.getInteger(R.styleable.GmeEditText_maxLengthLimiter, 0);
setTypeface(FontCache.getTypeface(fontName, context));
a.recycle();
}
if(shouldApplyAsciiFilter)
{
setFilters(new InputFilter[]{new ASCIIInputFilter()});
if (shouldApplyAsciiFilter) {
if (maxLength > 0)
setFilters(new InputFilter[]{new ASCIIInputFilter(), new InputFilter.LengthFilter(maxLength)});
else
setFilters(new InputFilter[]{new ASCIIInputFilter()});
int imeOption = getImeOptions();
setImeOptions(imeOption| EditorInfo.IME_FLAG_FORCE_ASCII);
setImeOptions(imeOption | EditorInfo.IME_FLAG_FORCE_ASCII);
}
}
public void setRegExInputFilter(String regEx)
{
public void setRegExInputFilter(String regEx) {
setFilters(new InputFilter[]{new RegExInputFilter(regEx)});
}
public static class ASCIIInputFilter implements InputFilter
{
public static class ASCIIInputFilter implements InputFilter {
@Override
public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
StringBuilder builder = new StringBuilder();
for (int i = start; i < end; i++) {
String c = String.valueOf( source.charAt(i));
String c = String.valueOf(source.charAt(i));
if (Utils.isASCII(c)) {
builder.append(c);
}
@ -76,20 +79,19 @@ public class GmeEditText extends AppCompatEditText {
}
}
public static class RegExInputFilter implements InputFilter
{
public static class RegExInputFilter implements InputFilter {
private final String regEx;
RegExInputFilter(String regEx) {
this.regEx=regEx;
this.regEx = regEx;
}
@Override
public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
StringBuilder builder = new StringBuilder();
for (int i = start; i < end; i++) {
String c = String.valueOf( source.charAt(i));
String c = String.valueOf(source.charAt(i));
if (c.matches(regEx)) {
builder.append(c);
}

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

@ -81,11 +81,13 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
@BindView(R.id.iv_back)
ImageView iv_back;
@BindView(R.id.btn_login)
@BindView(R.id.btn_rgstr)
View btn_new_user;
@BindView(R.id.btn_lgn)
View btn_login;
@BindView(R.id.btn_new_user)
View btn_new_user;
@BindView(R.id.selectedLanguageText)
TextView selectedLanguageText;
@ -221,11 +223,12 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
case R.id.countrySelectionSpinner:
showCountryListinDialog();
break;
case R.id.btn_login:
startActivity(new Intent(this, LoginV2Activity.class));
break;
case R.id.btn_new_user:
case R.id.btn_rgstr:
startActivity(new Intent(this, RegisterV2Activity.class));
break;
case R.id.btn_lgn:
startActivity(new Intent(this, LoginV2Activity.class));
break;
case R.id.iv_back:
if (languageViewTransitionManager.isUserOnLanguageSelectionView())

4
app/src/main/res/layout/activity_splash_screen.xml
View File

@ -35,7 +35,7 @@
android:paddingBottom="28dp">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_login"
android:id="@+id/btn_rgstr"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:background="@drawable/ic_blue_button_with_white_border"
@ -44,7 +44,7 @@
android:textColor="@color/white" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_new_user"
android:id="@+id/btn_lgn"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"

45
app/src/main/res/layout/activity_splash_screen_key_0.xml
View File

@ -45,7 +45,7 @@
android:id="@+id/selectedLanguageIcon"
android:layout_width="@dimen/_26sdp"
android:layout_height="@dimen/_26sdp"
android:layout_marginTop="16dp"
android:layout_marginTop="@dimen/_18sdp"
android:src="@drawable/flag_default"
app:layout_constraintEnd_toStartOf="@id/selectedLanguageText"
app:layout_constraintHorizontal_chainStyle="packed"
@ -89,10 +89,13 @@
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/_8sdp"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_8sdp"
android:layout_marginTop="@dimen/_17sdp"
android:background="@drawable/curve_rectangle_bright_grey"
android:padding="@dimen/_10sdp"
app:layout_constraintBottom_toTopOf="@+id/btn_login"
app:layout_constraintBottom_toTopOf="@+id/btn_rgstr"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/selectedLanguageText">
@ -372,39 +375,45 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_login"
android:id="@+id/btn_rgstr"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginTop="@dimen/_10sdp"
android:layout_marginTop="@dimen/_18sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:background="@drawable/ic_blue_button_with_white_border"
android:text="@string/login_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="@dimen/_11ssp"
app:layout_constraintEnd_toStartOf="@+id/btn_new_user"
android:background="@drawable/ic_red_button_with_white_border"
android:text="@string/new_user_text"
app:layout_constraintEnd_toStartOf="@+id/btn_lgn"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/languageRv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_pager" />
app:layout_constraintTop_toBottomOf="@+id/view_pager"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_new_user"
android:id="@+id/btn_lgn"
android:text="@string/login_text"
android:background="@drawable/ic_blue_button_with_white_border"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:background="@drawable/ic_red_button_with_white_border"
android:text="@string/new_user_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="@dimen/_11ssp"
app:layout_constraintBottom_toBottomOf="@+id/btn_login"
app:layout_constraintBottom_toBottomOf="@+id/btn_rgstr"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/btn_login"
app:layout_constraintTop_toTopOf="@+id/btn_login" />
app:layout_constraintStart_toEndOf="@+id/btn_rgstr"
app:layout_constraintTop_toTopOf="@+id/btn_rgstr"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/appVersionTxtView"
android:layout_width="wrap_content"
@ -426,10 +435,10 @@
app:backgroundTint="@android:color/white"
app:elevation="2dp"
app:fabSize="normal"
app:layout_constraintEnd_toEndOf="@+id/btn_new_user"
app:layout_constraintEnd_toEndOf="@+id/btn_lgn"
app:layout_constraintHorizontal_bias="0.76"
app:layout_constraintStart_toStartOf="@+id/btn_new_user"
app:layout_constraintTop_toBottomOf="@+id/btn_new_user"
app:layout_constraintStart_toStartOf="@+id/btn_lgn"
app:layout_constraintTop_toBottomOf="@+id/btn_lgn"
app:maxImageSize="32dp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView

50
app/src/main/res/layout/activity_splash_screen_key_1.xml
View File

@ -29,7 +29,7 @@
android:layout_width="@dimen/_100sdp"
android:layout_height="@dimen/_30sdp"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginTop="24dp"
android:layout_marginTop="@dimen/_18sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:src="@drawable/ic_logo_white_large"
app:layout_constraintEnd_toEndOf="parent"
@ -40,7 +40,7 @@
android:id="@+id/selectedLanguageIcon"
android:layout_width="@dimen/_26sdp"
android:layout_height="@dimen/_26sdp"
android:layout_marginTop="16dp"
android:layout_marginTop="@dimen/_18sdp"
android:src="@drawable/flag_default"
app:layout_constraintEnd_toStartOf="@id/selectedLanguageText"
app:layout_constraintHorizontal_chainStyle="packed"
@ -51,7 +51,7 @@
android:id="@+id/selectedLanguageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:paddingTop="@dimen/_10sdp"
android:paddingBottom="@dimen/_10sdp"
@ -84,10 +84,13 @@
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/_8sdp"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_8sdp"
android:layout_marginTop="@dimen/_17sdp"
android:background="@drawable/curve_rectangle_bright_grey"
android:padding="@dimen/_10sdp"
app:layout_constraintBottom_toTopOf="@+id/btn_login"
app:layout_constraintBottom_toTopOf="@+id/btn_rgstr"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/selectedLanguageText">
@ -370,7 +373,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/btn_login"
app:layout_constraintBottom_toTopOf="@+id/btn_rgstr"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
@ -378,39 +381,44 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_login"
android:id="@+id/btn_rgstr"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginTop="@dimen/_10sdp"
android:layout_marginTop="@dimen/_18sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:background="@drawable/ic_blue_button_with_white_border"
android:text="@string/login_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="@dimen/_11ssp"
app:layout_constraintEnd_toStartOf="@+id/btn_new_user"
android:background="@drawable/ic_red_button_with_white_border"
android:text="@string/new_user_text"
app:layout_constraintEnd_toStartOf="@+id/btn_lgn"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/languageRv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_pager" />
app:layout_constraintTop_toBottomOf="@+id/view_pager"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_new_user"
android:id="@+id/btn_lgn"
android:text="@string/login_text"
android:background="@drawable/ic_blue_button_with_white_border"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:background="@drawable/ic_red_button_with_white_border"
android:text="@string/new_user_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="@dimen/_11ssp"
app:layout_constraintBottom_toBottomOf="@+id/btn_login"
app:layout_constraintBottom_toBottomOf="@+id/btn_rgstr"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/btn_login"
app:layout_constraintTop_toTopOf="@+id/btn_login" />
app:layout_constraintStart_toEndOf="@+id/btn_rgstr"
app:layout_constraintTop_toTopOf="@+id/btn_rgstr"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/appVersionTxtView"
@ -433,10 +441,10 @@
app:backgroundTint="@android:color/white"
app:elevation="2dp"
app:fabSize="normal"
app:layout_constraintEnd_toEndOf="@+id/btn_new_user"
app:layout_constraintEnd_toEndOf="@+id/btn_lgn"
app:layout_constraintHorizontal_bias="0.76"
app:layout_constraintStart_toStartOf="@+id/btn_new_user"
app:layout_constraintTop_toBottomOf="@+id/btn_new_user"
app:layout_constraintStart_toStartOf="@+id/btn_lgn"
app:layout_constraintTop_toBottomOf="@+id/btn_lgn"
app:maxImageSize="32dp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView

14
app/src/main/res/layout/activity_splash_screen_key_2.xml
View File

@ -97,7 +97,7 @@
app:layout_constraintTop_toBottomOf="parent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_login"
android:id="@+id/btn_rgstr"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_8sdp"
@ -108,14 +108,14 @@
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="@dimen/_11ssp"
app:layout_constraintEnd_toStartOf="@+id/btn_new_user"
app:layout_constraintEnd_toStartOf="@+id/btn_lgn"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/languageRv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="parent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_new_user"
android:id="@+id/btn_lgn"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_8sdp"
@ -125,11 +125,11 @@
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="@dimen/_11ssp"
app:layout_constraintBottom_toBottomOf="@+id/btn_login"
app:layout_constraintBottom_toBottomOf="@+id/btn_rgstr"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/btn_login"
app:layout_constraintTop_toTopOf="@+id/btn_login" />
app:layout_constraintStart_toEndOf="@+id/btn_rgstr"
app:layout_constraintTop_toTopOf="@+id/btn_rgstr" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/appVersionTxtView"
@ -140,7 +140,7 @@
android:textSize="@dimen/_10ssp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_new_user"
app:layout_constraintTop_toBottomOf="@+id/btn_lgn"
tools:text=" 2.2.3 " />
<ProgressBar

5
app/src/main/res/layout/fragment_kyc_view1_v2.xml
View File

@ -28,6 +28,7 @@
android:id="@+id/ed_firstname"
style="@style/editetxtsingleline"
android:imeOptions="actionDone"
app:maxLengthLimiter="100"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.gmeremit.online.gmeremittance_native.customwidgets.GMETextInputLayout>
@ -101,6 +102,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionDone"
app:maxLengthLimiter="100"
style="@style/editetxtsingleline"
android:inputType="textEmailAddress"
/>
@ -239,6 +241,8 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_address"
style="@style/editetxtsingleline"
app:maxLengthLimiter="50"
android:imeOptions="actionDone"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -331,6 +335,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
android:id="@+id/ed_referral"
style="@style/editetxtsingleline"
app:maxLengthLimiter="30"
android:imeOptions="actionDone"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

1
app/src/main/res/layout/fragment_kyc_view2_v2.xml
View File

@ -63,6 +63,7 @@
android:id="@+id/ed_primaryAccountNumber"
style="@style/editetxtsingleline"
android:imeOptions="actionDone"
app:maxLengthLimiter="20"
android:inputType="number"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

1
app/src/main/res/values/attrs.xml
View File

@ -6,6 +6,7 @@
<declare-styleable name="GmeEditText">
<attr name="edfontName" format="string"/>
<attr name="applyASCIIFilter" format="boolean"/>
<attr name="maxLengthLimiter" format="integer"/>
</declare-styleable>

Write Preview
Loading…
Cancel
Save