From 5c17fb86df00a64b05cd29ed62df6efffe75fe1d Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Wed, 29 May 2019 17:56:09 +0545 Subject: [PATCH] Fingerprint prompt anim done --- .idea/assetWizardSettings.xml | 4 +- .idea/caches/build_file_checksums.ser | Bin 662 -> 662 bytes app/src/main/AndroidManifest.xml | 10 +- .../homeV2/view/HomeFragmentV2.java | 5 +- .../view/FingerprintEnablePromptActivity.java | 75 ++++++++++++ .../SplashAnimatedViewPagerFragment.java | 11 +- .../https/GenericApiObserverResponseV2.java | 1 - .../res/drawable/avd_fingerprint_prompt.xml | 49 ++++++++ .../res/drawable/vd_fingerprint_prompt.xml | 38 ++++++ .../activity_fingerprint_enable_prompt.xml | 113 ++++++++++++++++++ .../res/layout/fragment_penny_test_prompt.xml | 8 +- .../layout/fragment_splash_avd_viewpager.xml | 2 +- app/src/main/res/values/strings.xml | 2 + 13 files changed, 298 insertions(+), 20 deletions(-) create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/FingerprintEnablePromptActivity.java create mode 100644 app/src/main/res/drawable/avd_fingerprint_prompt.xml create mode 100644 app/src/main/res/drawable/vd_fingerprint_prompt.xml create mode 100644 app/src/main/res/layout/activity_fingerprint_enable_prompt.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 5d979109..5aaf9f70 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -19,8 +19,8 @@ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 0c6e5b9cbbf0f229110125f5e4605da263e67187..ee54efb00369f22b08294a7d1b7dd5807e899c00 100644 GIT binary patch delta 15 XcmbQnI*oP03>K!lEioJC{9*(EF3ARJ delta 15 XcmbQnI*oP03>L;0=OZ`H`NaqTFu?}A diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d4ad7433..ef97b18a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,10 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:replace="android:allowBackup"> - + + \ No newline at end of file diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java index df85125e..4326fe95 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java @@ -24,6 +24,7 @@ import com.gmeremit.online.gmeremittance_native.homeV2.presenter.HomeV2Presenter import com.gmeremit.online.gmeremittance_native.kycV2.view.KYCFormV2Activity; import com.gmeremit.online.gmeremittance_native.kycV2.view.pennytest.PennyTestActivity; import com.gmeremit.online.gmeremittance_native.rewardV2.view.rewardlisting.RewardListingV2Activity; +import com.gmeremit.online.gmeremittance_native.settings.view.FingerprintEnablePromptActivity; import com.gmeremit.online.gmeremittance_native.utils.Utils; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; @@ -243,7 +244,9 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. } private void showRewardScreen() { - Intent intent=new Intent(getActivity(),RewardListingV2Activity.class); +// Intent intent=new Intent(getActivity(),RewardListingV2Activity.class); + Intent intent=new Intent(getActivity(), FingerprintEnablePromptActivity.class); + startActivity(intent); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/FingerprintEnablePromptActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/FingerprintEnablePromptActivity.java new file mode 100644 index 00000000..04819bfe --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/FingerprintEnablePromptActivity.java @@ -0,0 +1,75 @@ +package com.gmeremit.online.gmeremittance_native.settings.view; + +import android.os.Handler; +import android.support.graphics.drawable.AnimatedVectorDrawableCompat; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.widget.ImageView; + +import com.gmeremit.online.gmeremittance_native.R; + +import butterknife.BindView; +import butterknife.ButterKnife; + +public class FingerprintEnablePromptActivity extends AppCompatActivity { + + private AnimatedVectorDrawableCompat mobileBg; + private AnimatedVectorDrawableCompat fingerBg; + + @BindView(R.id.avdMobileImage) + ImageView avdMobileImageView; + + @BindView(R.id.avdFingerImage) + ImageView avdFingerImageView; + + private boolean isAnimationPlayed = false; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_fingerprint_enable_prompt); + ButterKnife.bind(this); + init(); + performDefaultAction(savedInstanceState); + } + + private void init() + { + mobileBg = AnimatedVectorDrawableCompat.create(this, R.drawable.avd_fingerprint_prompt); + fingerBg = AnimatedVectorDrawableCompat.create(this, R.drawable.avd_fingerprint_off_to_on); + } + + void performDefaultAction(Bundle savedInstance) + { + avdMobileImageView.setImageDrawable(mobileBg); + + } + public void playAnimation(long delay) { + if(delay<0) + delay=0; + new Handler().postDelayed(() -> { + try { + if (!isAnimationPlayed) { + if (mobileBg != null && !mobileBg.isRunning()) + mobileBg.start(); + if (fingerBg != null && !fingerBg.isRunning()) { + avdFingerImageView.setImageDrawable(fingerBg); + fingerBg.start(); + } + isAnimationPlayed = true; + } + } catch (Exception e) { + + throw e; + + } + }, delay); + + } + + @Override + protected void onResume() { + super.onResume(); + playAnimation(300); + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/avdfrags/SplashAnimatedViewPagerFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/avdfrags/SplashAnimatedViewPagerFragment.java index a9a9e4fe..1cbea6d5 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/avdfrags/SplashAnimatedViewPagerFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/avdfrags/SplashAnimatedViewPagerFragment.java @@ -1,19 +1,11 @@ package com.gmeremit.online.gmeremittance_native.splash_screen.view.avdfrags; import android.annotation.SuppressLint; -import android.app.Activity; -import android.content.Context; -import android.graphics.drawable.AnimatedVectorDrawable; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.support.annotation.DrawableRes; import android.support.annotation.Nullable; -import android.support.graphics.drawable.Animatable2Compat; import android.support.graphics.drawable.AnimatedVectorDrawableCompat; -import android.support.graphics.drawable.VectorDrawableCompat; -import android.support.v4.content.ContextCompat; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -38,10 +30,9 @@ public abstract class SplashAnimatedViewPagerFragment extends BaseFragment { @BindView(R.id.gmeTextView2) TextView infoText; - @BindView(R.id.avdImage) + @BindView(R.id.avdMobileImage) ImageView avdImageView; - private AnimatedVectorDrawable fingerPrintAVD; private AnimatedVectorDrawableCompat fingerPrintAVDCompat; private boolean isAnimationPlayed = false; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/GenericApiObserverResponseV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/GenericApiObserverResponseV2.java index 17f833eb..593da4af 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/GenericApiObserverResponseV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/GenericApiObserverResponseV2.java @@ -47,7 +47,6 @@ public abstract class GenericApiObserverResponseV2 extends DisposableObserver @Override public void onError(Throwable e) { - e.printStackTrace(); if (e instanceof HttpException) { if (((HttpException) e).code() == 401) unauthorizedAccess(HTTPConstants.getErrorMessageFromCode(((HttpException) e).code())); diff --git a/app/src/main/res/drawable/avd_fingerprint_prompt.xml b/app/src/main/res/drawable/avd_fingerprint_prompt.xml new file mode 100644 index 00000000..25340b16 --- /dev/null +++ b/app/src/main/res/drawable/avd_fingerprint_prompt.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/vd_fingerprint_prompt.xml b/app/src/main/res/drawable/vd_fingerprint_prompt.xml new file mode 100644 index 00000000..d795343e --- /dev/null +++ b/app/src/main/res/drawable/vd_fingerprint_prompt.xml @@ -0,0 +1,38 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_fingerprint_enable_prompt.xml b/app/src/main/res/layout/activity_fingerprint_enable_prompt.xml new file mode 100644 index 00000000..d1005e15 --- /dev/null +++ b/app/src/main/res/layout/activity_fingerprint_enable_prompt.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_penny_test_prompt.xml b/app/src/main/res/layout/fragment_penny_test_prompt.xml index d7c23295..bc167606 100644 --- a/app/src/main/res/layout/fragment_penny_test_prompt.xml +++ b/app/src/main/res/layout/fragment_penny_test_prompt.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ded62583..25ac189b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -477,6 +477,8 @@ Order Receive Date Order No Order Type + Use Fingerprint + Continue only using password