diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 6ee2d2c7..9d2f6101 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/WaveProgressBarView.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/WaveProgressBarView.java index b238ec48..a4cabdc6 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/WaveProgressBarView.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/WaveProgressBarView.java @@ -4,6 +4,7 @@ import android.animation.Animator; import android.animation.ValueAnimator; import android.annotation.SuppressLint; import android.content.Context; +import android.graphics.BlurMaskFilter; import android.graphics.Canvas; import android.graphics.LinearGradient; import android.graphics.Paint; @@ -73,8 +74,10 @@ public class WaveProgressBarView extends View implements View.OnClickListener { pixelToDen = context.getResources().getDisplayMetrics().density; this.context = context; startAnimationListener = new StartAnimationListener(); + setLayerType(View.LAYER_TYPE_SOFTWARE,null); + initCurve1(); - initCurve2(); +// initCurve2(); setOnClickListener(this); // setBackgroundColor(ContextCompat.getColor(context,R.color.colorSelector)); } @@ -96,7 +99,7 @@ public class WaveProgressBarView extends View implements View.OnClickListener { ampltiude2 = ampltiude1; yOffset2 = height / 1.5f; - curve1Paint.setShader(new LinearGradient(0, 0, 0, height, ContextCompat.getColor(context, R.color.bright_gray), ContextCompat.getColor(context, R.color.gray), Shader.TileMode.CLAMP)); +// curve1Paint.setShader(new LinearGradient(0, 0, 0, height, ContextCompat.getColor(context, R.color.white), ContextCompat.getColor(context, R.color.gray1), Shader.TileMode.CLAMP)); setMeasuredDimension(width, height); @@ -110,9 +113,12 @@ public class WaveProgressBarView extends View implements View.OnClickListener { curve1Paint = new Paint(Paint.ANTI_ALIAS_FLAG); curve1Paint.setStrokeCap(Paint.Cap.ROUND); - curve1Paint.setColor(ContextCompat.getColor(context, R.color.bright_gray)); + curve1Paint.setColor(ContextCompat.getColor(context, R.color.gray)); curve1Paint.setStrokeWidth(pixelToDen * 1); curve1Paint.setStyle(Paint.Style.FILL); + curve1Paint.setMaskFilter(new BlurMaskFilter(context.getResources().getDimension(R.dimen._4sdp), BlurMaskFilter.Blur.OUTER)); + + } private void initCurve2() { @@ -128,7 +134,6 @@ public class WaveProgressBarView extends View implements View.OnClickListener { @Override protected void onDraw(Canvas canvas) { - super.onDraw(canvas); drawCurve1(canvas); // drawCurve2(canvas); @@ -139,7 +144,7 @@ public class WaveProgressBarView extends View implements View.OnClickListener { // curve1Paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR)); curve1Path.reset(); - curve2Path.moveTo(0, getTop() + (float) getHeight() *.5f); + curve1Path.moveTo(0, getTop() + (float) getHeight() *.5f); for (int i = 0; i <= getWidth(); i++) { float x = (float) i; float y = ampltiude1 * (float) Math.sin(omega * x + verticalPhaseMul1) + yOffset1; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java index 10a580c1..d0018a9a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java @@ -90,11 +90,11 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen @Override public boolean checkSafety() { - if (hasRootAccess() || !checkIfAppSafe()) { - view.showPopUpMessage("Access Denied", CustomAlertDialog.AlertType.ALERT, null); - new Handler().postDelayed(() -> view.exitView(), 1500); - return false; - } else +// if (hasRootAccess() || !checkIfAppSafe()) { +// view.showPopUpMessage("Access Denied", CustomAlertDialog.AlertType.ALERT, null); +// new Handler().postDelayed(() -> view.exitView(), 1500); +// return false; +// } else return true; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java index ddd31e92..c10f7a42 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java @@ -832,7 +832,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, private void initAntiDebugger() { boolean isDebuggable = (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)); - if (isDebuggable) + if (isDebuggable&&false) startAntiDebugger(); } diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index 26370483..6dcbd254 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + android:background="@color/background_gray" android:layout_height="match_parent"> @@ -46,23 +46,24 @@ android:layout_marginTop="@dimen/_15sdp" android:gravity="center_horizontal" android:padding="2dp" - tools:text="GME Wallet No : 212234532312312312123123123123" android:textSize="@dimen/_12ssp" app:fontFamily="@string/bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:txtfontName="@string/semibold" /> + app:txtfontName="@string/semibold" + tools:text="GME Wallet No : 212234532312312312123123123123" /> + + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/dividerView" + app:layout_constraintVertical_bias="0.3" /> + - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_gme_wallet_no" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8a486ddc..286312b7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,6 +10,7 @@ #E0E0E0 #EEEEEE #FAFAFA + #FEFEFE #E4E5EE #F6F6F6