Skip to content

Commit

Permalink
Feature - Show Litecoin Card as Webview (#82)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
vsima and kcw-grunt committed Jan 30, 2023
1 parent 3540c0b commit dc3f4ef
Show file tree
Hide file tree
Showing 27 changed files with 407 additions and 1,303 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@
[submodule "app/src/main/jni/loafwallet-core"]
path = app/src/main/jni/loafwallet-core
url = https://github.com/litecoin-foundation/loafwallet-core.git
[submodule "partnerapi"]
path = partnerapi
url = https://github.com/litecoin-foundation/litewallet-partner-api-android.git
6 changes: 6 additions & 0 deletions .idea/render.experimental.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ android {
applicationId = 'com.loafwallet'
minSdkVersion 27
targetSdkVersion 32
versionCode 710
versionCode 718
versionName "v2.7.1"
multiDexEnabled true
archivesBaseName = "${versionName}(${versionCode})"
Expand Down Expand Up @@ -317,8 +317,6 @@ dependencies {
// Progress Button
implementation 'com.github.razir.progressbutton:progressbutton:2.1.0'

api project(":partnerapi")

// Dagger
implementation 'com.google.dagger:dagger:2.41'
kapt 'com.google.dagger:dagger-compiler:2.41'
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.view.ViewTreeObserver;
import android.view.animation.AnimationUtils;
import android.widget.Button;
Expand All @@ -32,8 +31,6 @@
import com.breadwallet.presenter.customviews.BRNotificationBar;
import com.breadwallet.presenter.fragments.BuyTabFragment;
import com.breadwallet.presenter.history.HistoryFragment;
import com.breadwallet.presenter.spend.AuthBottomSheetDialogFragment;
import com.breadwallet.presenter.transfer.TransferFragment;
import com.breadwallet.tools.animation.BRAnimator;
import com.breadwallet.tools.animation.TextSizeTransition;
import com.breadwallet.tools.manager.BRSharedPrefs;
Expand All @@ -47,15 +44,14 @@
import com.breadwallet.tools.util.BRExchange;
import com.breadwallet.tools.util.ExtensionKt;
import com.breadwallet.tools.util.Utils;
import com.breadwallet.ui.card.CardFragment;
import com.breadwallet.wallet.BRPeerManager;
import com.breadwallet.wallet.BRWalletManager;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.google.android.play.core.review.ReviewInfo;
import com.google.android.play.core.review.ReviewManager;
import com.google.android.play.core.review.ReviewManagerFactory;
import com.google.android.play.core.tasks.Task;
import com.platform.APIClient;

import java.math.BigDecimal;

Expand Down Expand Up @@ -164,11 +160,6 @@ private void removeObservers() {
BRSharedPrefs.removeListener(this);
}

@Override
protected void onSaveInstanceState(Bundle outState) {
//leave it empty, avoiding the os bug
}

private void setUrlHandler(Intent intent) {
Uri data = intent.getData();
if (data == null) return;
Expand Down Expand Up @@ -211,11 +202,7 @@ public boolean handleNavigationItemSelected(int menuItemId) {
mSelectedBottomNavItem = 0;
break;
case R.id.nav_card:
if (TextUtils.isEmpty(BRSharedPrefs.getLitecoinCardId(BreadActivity.this))) {
showAuthModal();
} else {
ExtensionKt.replaceFragment(BreadActivity.this, new TransferFragment(), false, R.id.fragment_container);
}
ExtensionKt.replaceFragment(BreadActivity.this, new CardFragment(), false, R.id.fragment_container);
break;
case R.id.nav_receive:
if (BRAnimator.isClickAllowed()) {
Expand All @@ -230,12 +217,6 @@ public boolean handleNavigationItemSelected(int menuItemId) {
return true;
}

public void showAuthModal() {
BottomSheetDialogFragment fragment = new AuthBottomSheetDialogFragment();
fragment.show(getSupportFragmentManager(), fragment.getTag());
mSelectedBottomNavItem = 0;
}

private void swap() {
if (!BRAnimator.isClickAllowed()) return;
boolean b = !BRSharedPrefs.getPreferredLTC(this);
Expand Down
10 changes: 0 additions & 10 deletions app/src/main/java/com/breadwallet/presenter/base/BasePresenter.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package com.breadwallet.presenter.base

import com.breadwallet.di.component.DaggerPresenterComponent
import com.breadwallet.presenter.spend.LoginPresenter
import com.breadwallet.presenter.spend.RegisterPresenter
import com.breadwallet.presenter.transfer.TransferPresenter

/** Litewallet
* Created by Mohamed Barry on 6/30/20
Expand All @@ -12,18 +8,12 @@ import com.breadwallet.presenter.transfer.TransferPresenter
*/
abstract class BasePresenter<out V : BaseView>(var view: BaseView?) {

private val injector = DaggerPresenterComponent.create()

init {
inject()
}

private fun inject() {
when (this) {
is LoginPresenter -> injector.inject(this)
is RegisterPresenter -> injector.inject(this)
is TransferPresenter -> injector.inject(this)
}
}

abstract fun subscribe()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public View onCreateView(LayoutInflater inflater,
signalLayout = rootView.findViewById(R.id.signal_layout);
background.setOnClickListener(v -> {
if (!BRAnimator.isClickAllowed()) return;
closeMenu();
getActivity().onBackPressed();
});

Expand Down Expand Up @@ -79,13 +80,15 @@ public View onCreateView(LayoutInflater inflater,

/* Lock Wallet */
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();
});
Expand All @@ -99,6 +102,7 @@ public View onCreateView(LayoutInflater inflater,
}

private void launchActivity(Intent intent) {
closeMenu();
Activity app = getActivity();
app.startActivity(intent);
app.overridePendingTransition(R.anim.enter_from_bottom, R.anim.fade_down);
Expand Down Expand Up @@ -147,9 +151,7 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
}
}

@Override
public void onStop() {
super.onStop();
private void closeMenu() {
BRAnimator.animateBackgroundDim(background, true);
BRAnimator.animateSignalSlide(signalLayout, true, () -> {
if (getActivity() != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import android.view.ViewGroup
import android.widget.FrameLayout
import com.breadwallet.R
import com.breadwallet.databinding.ChangeLanguageBottomSheetBinding
import com.breadwallet.databinding.FragmentHistoryBinding
import com.breadwallet.entities.Language
import com.breadwallet.presenter.activities.intro.IntroActivity
import com.breadwallet.presenter.spend.RoundedBottomSheetDialogFragment
import com.breadwallet.ui.RoundedBottomSheetDialogFragment
import com.breadwallet.tools.util.LocaleHelper
import com.breadwallet.tools.util.Utils
import com.breadwallet.tools.util.getString
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit dc3f4ef

Please sign in to comment.