🚀[ Release v.2.8.0] Merge into Main (litecoin-foundation#123)

* 💣🐞[Hotbug fix] sharedprefs fb fix (litecoin-foundation#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 (litecoin-foundation#13) * version bump * Hotfix/crashes v2.6.0 (litecoin-foundation#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 (litecoin-foundation#21) * version code bump * 🚀[ Release v.2.6.0] Merge into Main (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#32) * replaced coin logo * bump versioncode * fixed dep version * added Bitrefill web listener * [Techdebt/] pdate match firebase events 33 (litecoin-foundation#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 (litecoin-foundation#72) * 🚀[ Release v.2.7.1] Merge into Develop (litecoin-foundation#104) * 🚀[ Release v.2.7.0] Merge into Main (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#13) * version bump * Hotfix/crashes v2.6.0 (litecoin-foundation#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 (litecoin-foundation#21) * version code bump * 🚀[ Release v.2.6.0] Merge into Main (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#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 (litecoin-foundation#29) * added new logo - reset the layout * version code * 🚀[ Release v.2.7.0] Merge into Develop (litecoin-foundation#32) * replaced coin logo * bump versioncode * fixed dep version * added Bitrefill web listener * [Techdebt/] pdate match firebase events 33 (litecoin-foundation#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 (litecoin-foundation#74) * Feature - donation disclaimer modal (litecoin-foundation#75) * Feature - add donation modal disclaimer - litecoin-foundation#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 (litecoin-foundation#82) * Feature - Show Litecoin Card as Webview - remove partner api library - create card frament webview and add to bottom nav - fixes litecoin-foundation#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 (litecoin-foundation#118) - reduce emissions of "java.lang.IllegalArgumentException: Unsupported ISO 3166 country: en" * made the webview fileprivate (litecoin-foundation#120) - the idea is that it will help evaluate the js callbacks * Refactors version name and code to BRConstants (litecoin-foundation#121) * 🐜[Bugfix] Refactor strings files (litecoin-foundation#122) * bump version code * Refactor strings files There were many unused strings and they were removed. * bump version code --------- Co-authored-by: Victor Sima <vic.sima@gmail.com>
josikie · Jan 30, 2023 · 4eb88b5 · 4eb88b5
1 parent 03f807d
commit 4eb88b5
Show file tree

Hide file tree

Showing 56 changed files with 730 additions and 1,658 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,30 +1,26 @@
-version: 2
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  build:
-    working_directory: ~/code
+  say-hello:
+    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
     docker:
-      - image: circleci/android:api-29
-    environment:
-      JVM_OPTS: -Xmx3200m
+      - image: cimg/base:stable
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
     steps:
       - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
       - run:
-          name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
-          command: sudo chmod +x ./gradlew
-      - run:
-          name: Download Dependencies
-          command: ./gradlew androidDependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
-      - run:
-          name: Run Tests
-          command: ./gradlew lint test
-      - store_artifacts:
-          path: app/build/reports
-          destination: reports
-      - store_test_results:
-          path: app/build/test-results
+          name: "Say hello"
+          command: "echo Hello, World!"
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  say-hello-workflow:
+    jobs:
+      - say-hello
diff --git a/.github/ISSUE_TEMPLATE~56e9056c (Create ISSUE_TEMPLATE) b/.github/ISSUE_TEMPLATE~56e9056c (Create ISSUE_TEMPLATE)
@@ -0,0 +1 @@
+
diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -63,9 +63,9 @@ android {
         testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
         applicationId = 'com.loafwallet'
         minSdkVersion 27 
-        targetSdkVersion 32 
-        versionCode 705
-        versionName "v2.7.1" 
+        targetSdkVersion 32  
+        versionCode 722
+        versionName "v2.8.0"
         multiDexEnabled true
         archivesBaseName = "${versionName}(${versionCode})"
 
@@ -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'

diff --git a/app/src/main/java/com/breadwallet/di/component/PresenterComponent.kt b/app/src/main/java/com/breadwallet/di/component/PresenterComponent.kt
diff --git a/app/src/main/java/com/breadwallet/presenter/activities/BreadActivity.java b/app/src/main/java/com/breadwallet/presenter/activities/BreadActivity.java
@@ -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;
@@ -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;
@@ -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;
 
@@ -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;
@@ -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()) {
@@ -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);

diff --git a/app/src/main/java/com/breadwallet/presenter/activities/LoginActivity.java b/app/src/main/java/com/breadwallet/presenter/activities/LoginActivity.java
@@ -118,15 +118,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         keyboard.setCustomButtonBackgroundColor(10, getColor(android.R.color.transparent));
         keyboard.setDeleteImage(getDrawable(R.drawable.ic_delete_white));
-
-        PackageInfo pInfo = null;
-        try {
-            pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            Timber.e(e);
-        }
-        String verName = pInfo != null ? pInfo.versionName : " ";
-        versionText.setText(String.format(Locale.US, "%1$s", verName));
+        versionText.setText(BRConstants.APP_VERSION_NAME_CODE);
 
         findViewById(R.id.scanQRCodeImgBut).setOnClickListener(v -> {
             if (!BRAnimator.isClickAllowed()) return;

diff --git a/app/src/main/java/com/breadwallet/presenter/activities/intro/IntroActivity.java b/app/src/main/java/com/breadwallet/presenter/activities/intro/IntroActivity.java
@@ -20,6 +20,7 @@
 import com.breadwallet.tools.security.PostAuth;
 import com.breadwallet.tools.security.SmartValidator;
 import com.breadwallet.tools.threads.BRExecutor;
+import com.breadwallet.tools.util.BRConstants;
 import com.breadwallet.tools.util.Utils;
 import com.breadwallet.wallet.BRWalletManager;
 import com.platform.APIClient;
@@ -68,15 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
         introActivity = this;
 
         getWindowManager().getDefaultDisplay().getSize(screenParametersPoint);
-
-        PackageInfo pInfo = null;
-        try {
-            pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            Timber.e(e);
-        }
-        String verName = pInfo != null ? pInfo.versionName : " ";
-        versionText.setText(String.format(Locale.US, "%1$s", verName));
+        versionText.setText(BRConstants.APP_VERSION_NAME_CODE);
 
         if (Utils.isEmulatorOrDebug(this))
             Utils.printPhoneSpecs();

diff --git a/app/src/main/java/com/breadwallet/presenter/activities/settings/AboutActivity.java b/app/src/main/java/com/breadwallet/presenter/activities/settings/AboutActivity.java
@@ -25,7 +25,7 @@ public class AboutActivity extends BRActivity {
     private TextView policyText;
     private TextView infoText;
 
-    private ImageView redditShare;
+    private ImageView instagramShare;
     private ImageView twitterShare;
     private ImageView blogShare;
     private static AboutActivity app;
@@ -47,24 +47,16 @@ protected void onCreate(Bundle savedInstanceState) {
 
         infoText = (TextView) findViewById(R.id.info_text);
         policyText = (TextView) findViewById(R.id.policy_text);
-
-        PackageInfo pInfo = null;
-        try {
-            pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            Timber.e(e);
-        }
-        String verName = pInfo != null ? pInfo.versionName : " ";
-        infoText.setText(getString(R.string.About_footer, verName));
-
-        redditShare = (ImageView) findViewById(R.id.reddit_share_button);
+        instagramShare = (ImageView) findViewById(R.id.instagram_share_button);
         twitterShare = (ImageView) findViewById(R.id.twitter_share_button);
         blogShare = (ImageView) findViewById(R.id.blog_share_button);
 
-        redditShare.setOnClickListener(new View.OnClickListener() {
+        infoText.setText(BRConstants.APP_VERSION_NAME_CODE);
+
+        instagramShare.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(BRConstants.REDDIT_LINK));
+                Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(BRConstants.INSTAGRAM_LINK));
                 startActivity(browserIntent);
                 app.overridePendingTransition(R.anim.enter_from_bottom, R.anim.empty_300);
             }

diff --git a/app/src/main/java/com/breadwallet/presenter/base/BasePresenter.kt b/app/src/main/java/com/breadwallet/presenter/base/BasePresenter.kt
@@ -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
@@ -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()