Skip to content

Commit

Permalink
πŸš€[ Release v.2.8.1] Merge into Main (#133)
Browse files Browse the repository at this point in the history
* πŸ’£πŸž[Hotbug fix] sharedprefs fb fix (#19)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

* subproject commit

* version bump

* Disabled FB send, Added Get Tasks

* Patch to hard code fees

- Static fees
- Removed the dep
- Turn crashlytics back on/off/on

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* πŸš€[ Release v.2.6.0] Merge into Develop  (#13)

* version bump

* Hotfix/crashes v2.6.0 (#17)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* πŸš€[Release] v2.6.1 (#21)

* version code bump

* πŸš€[ Release v.2.6.0] Merge into Main  (#12)

* Added ΡƒΠΊΡ€Π°Ρ—Π½ΡΡŒΠΊΠΈΠΉ language

- add uk xml file
-  removed the nl, sv, da files
- Escaped apostrphes in UK strings file
- Updated language choices

* πŸ₯³[Feature] Unstoppable ext update (#11)

* WIP: DNC

Dropped in the UD code prior to testing

* Added study link

* Fix unstoppable domains dependency

* Updated the UD ext text

WIP::::Need to refactor once UK and deletion on SV, NL, DA

* added UK lang

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* version bump

* Hotfix/crashes v2.6.0 (#17)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature/add bitrefill (#28)

* added bitrefill

- added kotlin fix

* Added localizations

- added logo

* Added Bitrefill Link

* hides fiat scollview from Bitrefill

* Adjusted the padding at the buy tab item view

* fixe test in Bitrefill detail

* fied logo and layout

* bump version and version code

* Feature/update branding (#29)

* added new logo

- reset the layout

* version code

* Create ISSUE_TEMPLATE

* Delete ISSUE_TEMPLATE

* Create test.md

* Delete test.md

* πŸš€[ Release v.2.7.0] Merge into Develop (#32)

* replaced coin logo

* bump versioncode

* fixed dep version

* added Bitrefill web listener

* [Techdebt/] pdate match firebase events 33 (#48)

* Added the equivalenmt events

- updated web link

* WIP : Should compile

* Fixed constants

* Udpaded all Analytics constants

* Added basic tests

- This is WIP
- Need to debug the Tests

* version bump

* fiexd compile bug

* Fix - revert FragmentBuy webview test (#72)

* πŸš€[ Release v.2.7.1] Merge into Develop (#104)

* πŸš€[ Release v.2.7.0] Merge into Main (#30)

* Added ΡƒΠΊΡ€Π°Ρ—Π½ΡΡŒΠΊΠΈΠΉ language

- add uk xml file
-  removed the nl, sv, da files
- Escaped apostrphes in UK strings file
- Updated language choices

* πŸ’£πŸž[Hotbug fix] sharedprefs fb fix (#19)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

* subproject commit

* version bump

* Disabled FB send, Added Get Tasks

* Patch to hard code fees

- Static fees
- Removed the dep
- Turn crashlytics back on/off/on

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* πŸš€[ Release v.2.6.0] Merge into Develop  (#13)

* version bump

* Hotfix/crashes v2.6.0 (#17)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* πŸš€[Release] v2.6.1 (#21)

* version code bump

* πŸš€[ Release v.2.6.0] Merge into Main  (#12)

* Added ΡƒΠΊΡ€Π°Ρ—Π½ΡΡŒΠΊΠΈΠΉ language

- add uk xml file
-  removed the nl, sv, da files
- Escaped apostrphes in UK strings file
- Updated language choices

* πŸ₯³[Feature] Unstoppable ext update (#11)

* WIP: DNC

Dropped in the UD code prior to testing

* Added study link

* Fix unstoppable domains dependency

* Updated the UD ext text

WIP::::Need to refactor once UK and deletion on SV, NL, DA

* added UK lang

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* version bump

* Hotfix/crashes v2.6.0 (#17)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature/add bitrefill (#28)

* added bitrefill

- added kotlin fix

* Added localizations

- added logo

* Added Bitrefill Link

* hides fiat scollview from Bitrefill

* Adjusted the padding at the buy tab item view

* fixe test in Bitrefill detail

* fied logo and layout

* bump version and version code

* Feature/update branding (#29)

* added new logo

- reset the layout

* version code

* replaced coin logo

* bump versioncode

* fixed dep version

* added Bitrefill web listener

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Create FUNDING.yml

For GH Sponsor

* πŸ’£πŸž[Hotbug fix] sharedprefs fb fix (#19)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

* subproject commit

* version bump

* Disabled FB send, Added Get Tasks

* Patch to hard code fees

- Static fees
- Removed the dep
- Turn crashlytics back on/off/on

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature/add bitrefill (#28)

* added bitrefill

- added kotlin fix

* Added localizations

- added logo

* Added Bitrefill Link

* hides fiat scollview from Bitrefill

* Adjusted the padding at the buy tab item view

* fixe test in Bitrefill detail

* fied logo and layout

* bump version and version code

* Feature/update branding (#29)

* added new logo

- reset the layout

* version code

* πŸš€[ Release v.2.7.0] Merge into Develop (#32)

* replaced coin logo

* bump versioncode

* fixed dep version

* added Bitrefill web listener

* [Techdebt/] pdate match firebase events 33 (#48)

* Added the equivalenmt events

- updated web link

* WIP : Should compile

* Fixed constants

* Udpaded all Analytics constants

* Added basic tests

- This is WIP
- Need to debug the Tests

* version bump

* fiexd compile bug

* version bump

* renmoved staging

* moved backup rates

* code bump

* Updated test configs

* Move api resources to central location

- version code bump

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Commented out the partial work

* Add .circleci/config.yml (#74)

* Feature - donation disclaimer modal (#75)

* Feature - add donation modal disclaimer
 - #60

* Add missing strings

* Upgraded AS

- Reduced donation amount
- Renamed id WIP

* updated stirings key format

- updated the donation  address

* code bump

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

* Feature - Show Litecoin Card as Webview (#82)

* Feature - Show Litecoin Card as Webview
 - remove partner api library
 - create card frament webview and add to bottom nav
 - fixes #58

* bump version code

* Fix UI crash

* bump version code

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

* πŸš€[Release v.2.8.0] Merge into Develop (#124)

* πŸ’£πŸž[Hotbug fix] sharedprefs fb fix (#19)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

* subproject commit

* version bump

* Disabled FB send, Added Get Tasks

* Patch to hard code fees

- Static fees
- Removed the dep
- Turn crashlytics back on/off/on

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature/add bitrefill (#28)

* added bitrefill

- added kotlin fix

* Added localizations

- added logo

* Added Bitrefill Link

* hides fiat scollview from Bitrefill

* Adjusted the padding at the buy tab item view

* fixe test in Bitrefill detail

* fied logo and layout

* bump version and version code

* Feature/update branding (#29)

* added new logo

- reset the layout

* version code

* Delete ISSUE_TEMPLATE

* πŸš€[ Release v.2.7.0] Merge into Develop (#32)

* replaced coin logo

* bump versioncode

* fixed dep version

* added Bitrefill web listener

* [Techdebt/] pdate match firebase events 33 (#48)

* Added the equivalenmt events

- updated web link

* WIP : Should compile

* Fixed constants

* Udpaded all Analytics constants

* Added basic tests

- This is WIP
- Need to debug the Tests

* version bump

* fiexd compile bug

* πŸš€[ Release v.2.7.1] Merge into Develop (#104)

* πŸš€[ Release v.2.7.0] Merge into Main (#30)

* Added ΡƒΠΊΡ€Π°Ρ—Π½ΡΡŒΠΊΠΈΠΉ language

- add uk xml file
-  removed the nl, sv, da files
- Escaped apostrphes in UK strings file
- Updated language choices

* πŸ’£πŸž[Hotbug fix] sharedprefs fb fix (#19)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

* subproject commit

* version bump

* Disabled FB send, Added Get Tasks

* Patch to hard code fees

- Static fees
- Removed the dep
- Turn crashlytics back on/off/on

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* πŸš€[ Release v.2.6.0] Merge into Develop  (#13)

* version bump

* Hotfix/crashes v2.6.0 (#17)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* πŸš€[Release] v2.6.1 (#21)

* version code bump

* πŸš€[ Release v.2.6.0] Merge into Main  (#12)

* Added ΡƒΠΊΡ€Π°Ρ—Π½ΡΡŒΠΊΠΈΠΉ language

- add uk xml file
-  removed the nl, sv, da files
- Escaped apostrphes in UK strings file
- Updated language choices

* πŸ₯³[Feature] Unstoppable ext update (#11)

* WIP: DNC

Dropped in the UD code prior to testing

* Added study link

* Fix unstoppable domains dependency

* Updated the UD ext text

WIP::::Need to refactor once UK and deletion on SV, NL, DA

* added UK lang

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* version bump

* Hotfix/crashes v2.6.0 (#17)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature/add bitrefill (#28)

* added bitrefill

- added kotlin fix

* Added localizations

- added logo

* Added Bitrefill Link

* hides fiat scollview from Bitrefill

* Adjusted the padding at the buy tab item view

* fixe test in Bitrefill detail

* fied logo and layout

* bump version and version code

* Feature/update branding (#29)

* added new logo

- reset the layout

* version code

* replaced coin logo

* bump versioncode

* fixed dep version

* added Bitrefill web listener

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Create FUNDING.yml

For GH Sponsor

* πŸ’£πŸž[Hotbug fix] sharedprefs fb fix (#19)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

* subproject commit

* version bump

* Disabled FB send, Added Get Tasks

* Patch to hard code fees

- Static fees
- Removed the dep
- Turn crashlytics back on/off/on

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature/add bitrefill (#28)

* added bitrefill

- added kotlin fix

* Added localizations

- added logo

* Added Bitrefill Link

* hides fiat scollview from Bitrefill

* Adjusted the padding at the buy tab item view

* fixe test in Bitrefill detail

* fied logo and layout

* bump version and version code

* Feature/update branding (#29)

* added new logo

- reset the layout

* version code

* πŸš€[ Release v.2.7.0] Merge into Develop (#32)

* replaced coin logo

* bump versioncode

* fixed dep version

* added Bitrefill web listener

* [Techdebt/] pdate match firebase events 33 (#48)

* Added the equivalenmt events

- updated web link

* WIP : Should compile

* Fixed constants

* Udpaded all Analytics constants

* Added basic tests

- This is WIP
- Need to debug the Tests

* version bump

* fiexd compile bug

* version bump

* renmoved staging

* moved backup rates

* code bump

* Updated test configs

* Move api resources to central location

- version code bump

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature - donation disclaimer modal (#75)

* Feature - add donation modal disclaimer
 - #60

* Add missing strings

* Upgraded AS

- Reduced donation amount
- Renamed id WIP

* updated stirings key format

- updated the donation  address

* code bump

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

* Feature - Show Litecoin Card as Webview (#82)

* Feature - Show Litecoin Card as Webview
 - remove partner api library
 - create card frament webview and add to bottom nav
 - fixes #58

* bump version code

* Fix UI crash

* bump version code

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

* version code bump

- updated version labels to include the version code

* Task - Reduce country iso exception (#118)

- reduce emissions of "java.lang.IllegalArgumentException: Unsupported ISO 3166 country: en"

* made the webview fileprivate (#120)

- the idea is that it will help evaluate the js callbacks

* Refactors version name and code to BRConstants (#121)

* 🐜[Bugfix] Refactor strings files (#122)

* bump version code

* Refactor strings files

There were many unused strings and they were removed.

* bump version code

* resolved bad resolution

---------

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* 🐜[Bugfix] Fragment fingerprint crash 125 (#131)

* Removed comments and header as a non-effecting change

* Refactored by overriding onAnimation

Used notes from : https://stackoverflow.com/questions/4750939/android-animation-is-not-finished-in-onanimationend

There calling super.onAnimationEnd(animation) seems to resolves the crash

* Clearing the layout should be valid ??

* version code and name bump

* Added semi-permenant test point

- No Error Nominal Response..where the crash used to be
- version code bump

* - remove animation logic from fragment#onStop()
 - remove fragment close logic from SlideDetector
 - clean up duplicate fragmentmanager stack pop
 - other small fixes

---------

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* 🐜[Bugfix] Displaylistcanvas 129 (#130)

* fixed broken Timber by reverting to 4.7.1

- horrible but effectuve fix:
remove reference to a deleted file.
use a placeholder that is tiny.
The size made the difference in the Crash

* version name and code bump

* bump version name and code

* reset to version name and code

---------

Co-authored-by: Victor Sima <vic.sima@gmail.com>
  • Loading branch information
kcw-grunt and vsima authored Feb 6, 2023
1 parent 92807ba commit 0fc11f9
Show file tree
Hide file tree
Showing 25 changed files with 220 additions and 338 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ android {
applicationId = 'com.loafwallet'
minSdkVersion 27
targetSdkVersion 32
versionCode 722
versionName "v2.8.0"
versionCode 725
versionName "v2.8.1"
multiDexEnabled true
archivesBaseName = "${versionName}(${versionCode})"

Expand Down Expand Up @@ -309,7 +309,7 @@ dependencies {
implementation 'com.google.firebase:firebase-crashlytics-ndk'

// Timber
implementation 'com.jakewharton.timber:timber:5.0.1'
implementation 'com.jakewharton.timber:timber:4.7.1'

// Unstoppable domain
implementation 'com.unstoppabledomains:resolution:5.0.0'
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/breadwallet/BreadApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;

import static timber.log.Timber.DebugTree;

import timber.log.Timber;

public class BreadApp extends Application {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
package com.breadwallet.presenter.fragments;/*
* Copyright (C) 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.breadwallet.presenter.fragments;

import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
Expand All @@ -24,7 +10,6 @@
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.os.Handler;
import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -36,15 +21,20 @@
import android.widget.RelativeLayout;
import android.widget.TextView;

import androidx.annotation.Nullable;

import com.breadwallet.R;
import com.breadwallet.presenter.activities.BreadActivity;
import com.breadwallet.presenter.interfaces.BRAuthCompletion;
import com.breadwallet.tools.animation.BRAnimator;
import com.breadwallet.tools.animation.DecelerateOvershootInterpolator;
import com.breadwallet.tools.manager.AnalyticsManager;
import com.breadwallet.tools.security.AuthManager;
import com.breadwallet.tools.security.FingerprintUiHelper;
import com.breadwallet.tools.util.BRConstants;
import com.breadwallet.tools.util.Utils;

import timber.log.Timber;

/**
* A dialog which uses fingerprint APIs to authenticate the user, and falls back to password
Expand Down Expand Up @@ -74,22 +64,18 @@ public FragmentFingerprint() {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

// Do not create a new Fragment when the Activity is re-created such as orientation changes.
setRetainInstance(true);
// setStyle(DialogFragment.STYLE_NORMAL, android.R.style.Theme_Material_Light_Dialog);
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {

View v = inflater.inflate(R.layout.fingerprint_dialog_container, container, false);
// getDialog().setTitle(R.string.fingerprint_auth);
message = (TextView) v.findViewById(R.id.fingerprint_description);
title = (TextView) v.findViewById(R.id.fingerprint_title);
fingerPrintLayout = (LinearLayout) v.findViewById(R.id.fingerprint_layout);
fingerprintBackground = (RelativeLayout) v.findViewById(R.id.fingerprint_background);
View authModalView = inflater.inflate(R.layout.fingerprint_dialog_container, container, false);
message = (TextView) authModalView.findViewById(R.id.fingerprint_description);
title = (TextView) authModalView.findViewById(R.id.fingerprint_title);
fingerPrintLayout = (LinearLayout) authModalView.findViewById(R.id.fingerprint_layout);
fingerprintBackground = (RelativeLayout) authModalView.findViewById(R.id.fingerprint_background);
Bundle bundle = getArguments();
String titleString = bundle.getString("title");
String messageString = bundle.getString("message");
Expand All @@ -103,21 +89,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
}
FingerprintManager mFingerprintManager = (FingerprintManager) getActivity().getSystemService(Activity.FINGERPRINT_SERVICE);
mFingerprintUiHelperBuilder = new FingerprintUiHelper.FingerprintUiHelperBuilder(mFingerprintManager);
mFingerprintUiHelper = mFingerprintUiHelperBuilder.build((ImageView) v.findViewById(R.id.fingerprint_icon),
(TextView) v.findViewById(R.id.fingerprint_status), this, getContext());
View mFingerprintContent = v.findViewById(R.id.fingerprint_container);
mFingerprintUiHelper = mFingerprintUiHelperBuilder.build((ImageView) authModalView.findViewById(R.id.fingerprint_icon),
(TextView) authModalView.findViewById(R.id.fingerprint_status), this, getContext());
View mFingerprintContent = authModalView.findViewById(R.id.fingerprint_container);

Button mCancelButton = (Button) v.findViewById(R.id.cancel_button);
Button mSecondDialogButton = (Button) v.findViewById(R.id.second_dialog_button);
Button mCancelButton = (Button) authModalView.findViewById(R.id.cancel_button);
Button mSecondDialogButton = (Button) authModalView.findViewById(R.id.second_dialog_button);
mCancelButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (!BRAnimator.isClickAllowed()) return;
// if (!BRAnimator.scanResultFragmentOn && mode == BRConstants.AUTH_FOR_PAY && request.isAmountRequested) {
//// FragmentScanResult.address = request.address[0];
// BRWalletManager.getInstance().offerToChangeTheAmount(getActivity(), "");
// }
// dismiss();
closeMe();
}
});
Expand All @@ -133,7 +114,7 @@ public void onClick(View view) {
}
});

return v;
return authModalView;
}

@Override
Expand All @@ -156,9 +137,8 @@ public void onGlobalLayout() {
@Override
public void onStop() {
super.onStop();

animateBackgroundDim(true);
animateSignalSlide(true);
// animateBackgroundDim(true);
// animateSignalSlide(true);
if (!authSucceeded)
completion.onCancel();
}
Expand Down Expand Up @@ -248,12 +228,16 @@ private void animateSignalSlide(final boolean reverse) {
fingerPrintLayout.animate()
.translationY(1500)
.setDuration(ANIMATION_DURATION)
.withLayer().setInterpolator(new AnticipateInterpolator(2f)).setListener(new AnimatorListenerAdapter() {
.withLayer()
.setInterpolator(new AnticipateInterpolator(2.0f))
.setListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
if (getActivity() != null)
getActivity().getFragmentManager().beginTransaction().remove(FragmentFingerprint.this).commit();
if (getActivity() != null) {
fingerPrintLayout.clearAnimation();
AnalyticsManager.logCustomEvent(BRConstants._20230131_NENR);
}
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public View onCreateView(LayoutInflater inflater,
background.setOnClickListener(v -> {
if (!BRAnimator.isClickAllowed()) return;
closeMenu();
getActivity().onBackPressed();
});

itemList = new ArrayList<>();
Expand Down Expand Up @@ -82,21 +81,18 @@ public View onCreateView(LayoutInflater inflater,
itemList.add(new BRMenuItem(getString(R.string.MenuButton_lock), R.drawable.ic_lock, v -> {
closeMenu();
final Activity from = getActivity();
from.getFragmentManager().popBackStack();
BRAnimator.startBreadActivity(from, true);
}));

/* Close button*/
rootView.findViewById(R.id.close_button).setOnClickListener(v -> {
closeMenu();
Activity app = getActivity();
app.getFragmentManager().popBackStack();
});

mTitle = rootView.findViewById(R.id.title);
mListView = rootView.findViewById(R.id.menu_listview);
mListView.setAdapter(new MenuListAdapter(getContext(), R.layout.menu_list_item, itemList));
signalLayout.setOnTouchListener(new SlideDetector(getContext(), signalLayout));
signalLayout.setOnTouchListener(new SlideDetector(signalLayout, this::closeMenu));

return rootView;
}
Expand Down Expand Up @@ -154,7 +150,7 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
private void closeMenu() {
BRAnimator.animateBackgroundDim(background, true);
BRAnimator.animateSignalSlide(signalLayout, true, () -> {
if (getActivity() != null) {
if (getActivity() != null && !getActivity().isDestroyed() && !getActivity().isFinishing()) {
getActivity().getFragmentManager().popBackStack();
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,22 +204,22 @@ public void run() {
@Override
public void onStop() {
super.onStop();
keyboard.animate()
.translationY(1000)
.withLayer();
dialogLayout.animate()
.scaleY(0)
.scaleX(0).alpha(0);
mainLayout.animate().alpha(0);
if (!authSucceeded)
completion.onCancel();
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
if (getActivity() != null)
getActivity().getFragmentManager().beginTransaction().remove(FragmentPin.this).commit();
}
}, 1000);
// keyboard.animate()
// .translationY(1000)
// .withLayer();
// dialogLayout.animate()
// .scaleY(0)
// .scaleX(0).alpha(0);
// mainLayout.animate().alpha(0);
// if (!authSucceeded)
// completion.onCancel();
// new Handler().postDelayed(new Runnable() {
// @Override
// public void run() {
// if (getActivity() != null)
// getActivity().getFragmentManager().beginTransaction().remove(FragmentPin.this).commit();
// }
// }, 1000);
}

public void setCompletion(BRAuthCompletion completion) {
Expand Down
Loading

0 comments on commit 0fc11f9

Please sign in to comment.