diff --git a/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java b/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java index 3cb99e0a..024381d5 100644 --- a/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java +++ b/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListRvViewHolder.java @@ -16,7 +16,7 @@ public class CountryListRvViewHolder extends RecyclerView.ViewHolder { TextView countryNameTxtView; @BindView(R.id.countryFlagImageView) - ImageView countryImageView; + ImageView countryFlagImageView; public CountryListRvViewHolder(View itemView) { @@ -27,7 +27,7 @@ public class CountryListRvViewHolder extends RecyclerView.ViewHolder { public void setFlagImage(int resId) { if(resId!=-1) - countryImageView.setBackgroundResource(resId); + countryFlagImageView.setBackgroundResource(resId); } public void setCountryName(String name) diff --git a/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java b/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java index e37fa796..ae2b7c71 100644 --- a/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java +++ b/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryListingRvAdapter.java @@ -41,9 +41,9 @@ public class CountryListingRvAdapter extends RecyclerView.Adapter exchangeRateTxtView.animate().alpha(1f).setDuration(500).withLayer().start() + () -> exchangeRateTxtView.animate().alpha(1f).setDuration(500).withLayer().start() ).start(); gmeExratePC.animate().alpha(1f).setDuration(500).withLayer().start(); @@ -648,7 +649,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, isExrateViewVisible = true; isAnimationOnProgress = false; userNavigatedToLanguageView = false; - new Handler().postDelayed(()-> exRatePresenter.onExRateViewLoadedSuccessfully(),150); + new Handler().postDelayed(() -> exRatePresenter.onExRateViewLoadedSuccessfully(), 150); } }); @@ -791,8 +792,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, btnRegisterLeftAndTopCoordinates[1] + btn_new_user.getMeasuredHeight()); - - return (receiveAmountEdTxt.hasFocus() || sendAmountEdTxt.hasFocus()) && !sendMoneyBoundRect.contains(posX, posY) && !receiveMoneyBoundRect.contains(posX, posY) @@ -807,7 +806,4 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, } - - - } diff --git a/app/src/main/res/drawable/icv_notice.xml b/app/src/main/res/drawable/icv_notice.xml new file mode 100644 index 00000000..fc232807 --- /dev/null +++ b/app/src/main/res/drawable/icv_notice.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/layout/activity_splash_screen_key_0.xml b/app/src/main/res/layout/activity_splash_screen_key_0.xml index 4f2d2d9c..b4a7a116 100644 --- a/app/src/main/res/layout/activity_splash_screen_key_0.xml +++ b/app/src/main/res/layout/activity_splash_screen_key_0.xml @@ -147,7 +147,6 @@ android:layout_marginBottom="@dimen/_4sdp" android:orientation="horizontal" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/linearLayout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/gmeTextView12" /> @@ -389,7 +388,6 @@