diff --git a/app/src/main/java/com/brainwallet/presenter/activities/BreadActivity.java b/app/src/main/java/com/brainwallet/presenter/activities/BreadActivity.java index 349c4efe..6246d24e 100644 --- a/app/src/main/java/com/brainwallet/presenter/activities/BreadActivity.java +++ b/app/src/main/java/com/brainwallet/presenter/activities/BreadActivity.java @@ -123,13 +123,6 @@ protected void onCreate(Bundle savedInstanceState) { finishActivities(SetPinActivity.introSetPitActivity, IntroActivity.introActivity, ReEnterPinActivity.reEnterPinActivity); - if (!BRSharedPrefs.getGreetingsShown(BreadActivity.this)) { - mHandler.postDelayed(() -> { - BRAnimator.showGreetingsMessage(BreadActivity.this); - BRSharedPrefs.putGreetingsShown(BreadActivity.this, true); - }, 1000); - } - onConnectionChanged(InternetManager.getInstance().isConnected(this)); updateUI(); diff --git a/app/src/main/java/com/brainwallet/presenter/activities/InputWordsActivity.kt b/app/src/main/java/com/brainwallet/presenter/activities/InputWordsActivity.kt index 47cc147a..d5284b86 100644 --- a/app/src/main/java/com/brainwallet/presenter/activities/InputWordsActivity.kt +++ b/app/src/main/java/com/brainwallet/presenter/activities/InputWordsActivity.kt @@ -114,8 +114,7 @@ class InputWordsActivity : BRActivity() { PostAuth.getInstance().setPhraseForKeyStore(cleanPhrase) BRSharedPrefs.putAllowSpend(app, false) - //if this screen is shown then we did not upgrade to the new app, we installed it - BRSharedPrefs.putGreetingsShown(app, true) + //Did not upgrade to the new app, we installed it PostAuth.getInstance().onRecoverWalletAuth(app, false) } diff --git a/app/src/main/java/com/brainwallet/presenter/activities/SetPinActivity.java b/app/src/main/java/com/brainwallet/presenter/activities/SetPinActivity.java index badaef46..949ce27b 100644 --- a/app/src/main/java/com/brainwallet/presenter/activities/SetPinActivity.java +++ b/app/src/main/java/com/brainwallet/presenter/activities/SetPinActivity.java @@ -62,7 +62,6 @@ public void onClick(String key) { } }); keyboard.setShowDot(false); - BRSharedPrefs.putGreetingsShown(this, true); } @Override diff --git a/app/src/main/java/com/brainwallet/presenter/fragments/FragmentGreetings.java b/app/src/main/java/com/brainwallet/presenter/fragments/FragmentGreetings.java deleted file mode 100644 index 761cd204..00000000 --- a/app/src/main/java/com/brainwallet/presenter/fragments/FragmentGreetings.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.brainwallet.presenter.fragments; - -import android.app.Fragment; -import android.os.Bundle; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewTreeObserver; -import android.widget.RelativeLayout; - -import com.brainwallet.R; -import com.brainwallet.presenter.customviews.BRButton; -import com.brainwallet.tools.animation.BRAnimator; - -public class FragmentGreetings extends Fragment { - private static final String TAG = FragmentGreetings.class.getName(); - - private BRButton ok; - private ConstraintLayout mainLayout; - private RelativeLayout background; - - @Override - public View onCreateView(LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - // The last two arguments ensure LayoutParams are inflated - // properly. - - View rootView = inflater.inflate(R.layout.fragment_greetings, container, false); - ok = (BRButton) rootView.findViewById(R.id.ok); - mainLayout = (ConstraintLayout) rootView.findViewById(R.id.signal_layout); - background = (RelativeLayout) rootView.findViewById(R.id.layout); - - ok.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - getActivity().onBackPressed(); - } - }); - return rootView; - } - - @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - final ViewTreeObserver observer = mainLayout.getViewTreeObserver(); - observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - if(observer.isAlive()) { - observer.removeOnGlobalLayoutListener(this); - } - BRAnimator.animateBackgroundDim(background, false); - BRAnimator.animateSignalSlide(mainLayout, false, null); - } - }); - } - - @Override - public void onStop() { - super.onStop(); - BRAnimator.animateBackgroundDim(background, true); - BRAnimator.animateSignalSlide(mainLayout, true, new BRAnimator.OnSlideAnimationEnd() { - @Override - public void onAnimationEnd() { - if (getActivity() != null) - getActivity().getFragmentManager().popBackStack(); - } - }); - - } - - @Override - public void onResume() { - super.onResume(); - - } - - @Override - public void onPause() { - super.onPause(); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/brainwallet/tools/animation/BRAnimator.java b/app/src/main/java/com/brainwallet/tools/animation/BRAnimator.java index 3f9b75ca..9f17bbf0 100644 --- a/app/src/main/java/com/brainwallet/tools/animation/BRAnimator.java +++ b/app/src/main/java/com/brainwallet/tools/animation/BRAnimator.java @@ -36,7 +36,6 @@ import com.brainwallet.presenter.entities.TxItem; import com.brainwallet.presenter.fragments.FragmentBalanceSeedReminder; import com.brainwallet.presenter.fragments.FragmentBuy; -import com.brainwallet.presenter.fragments.FragmentGreetings; import com.brainwallet.presenter.fragments.FragmentMenu; import com.brainwallet.presenter.fragments.FragmentReceive; import com.brainwallet.presenter.fragments.FragmentRequestAmount; @@ -286,18 +285,6 @@ public static void showMenuFragment(Activity app) { transaction.commit(); } - public static void showGreetingsMessage(Activity app) { - if (app == null) { - Timber.i("timber: showGreetingsMessage: app is null"); - return; - } - FragmentTransaction transaction = app.getFragmentManager().beginTransaction(); - transaction.setCustomAnimations(0, 0, 0, R.animator.plain_300); - transaction.add(android.R.id.content, new FragmentGreetings(), FragmentGreetings.class.getName()); - transaction.addToBackStack(FragmentGreetings.class.getName()); - transaction.commit(); - } - public static boolean isClickAllowed() { if (clickAllowed) { clickAllowed = false; diff --git a/app/src/main/java/com/brainwallet/tools/manager/BRSharedPrefs.java b/app/src/main/java/com/brainwallet/tools/manager/BRSharedPrefs.java index c9796276..9620bb99 100644 --- a/app/src/main/java/com/brainwallet/tools/manager/BRSharedPrefs.java +++ b/app/src/main/java/com/brainwallet/tools/manager/BRSharedPrefs.java @@ -116,18 +116,6 @@ public static void putPhraseWroteDown(Context context, boolean check) { editor.apply(); } - public static boolean getGreetingsShown(Context context) { - SharedPreferences prefs = context.getSharedPreferences(BRConstants.PREFS_NAME, Context.MODE_PRIVATE); - return prefs.getBoolean("greetingsShown", false); - } - - public static void putGreetingsShown(Context context, boolean shown) { - SharedPreferences prefs = context.getSharedPreferences(BRConstants.PREFS_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = prefs.edit(); - editor.putBoolean("greetingsShown", shown); - editor.apply(); - } - public static int getCurrencyListPosition(Context context) { SharedPreferences settings = context.getSharedPreferences(BRConstants.PREFS_NAME, 0); return settings.getInt(BRConstants.POSITION, 0); diff --git a/app/src/main/res/layout/fragment_greetings.xml b/app/src/main/res/layout/fragment_greetings.xml deleted file mode 100644 index 079f10bd..00000000 --- a/app/src/main/res/layout/fragment_greetings.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file