Skip to content

Commit

Permalink
πŸš€[Release v2.12.4 20241130] Merge into Develop (#286)
Browse files Browse the repository at this point in the history
* πŸš€[Release v2.11.1 071024] Merge into Main (#246)

* replaced the control in PeerManager.c

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* reverted BRBitcoinAmount

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Cleaning up the files

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Removed Pusher remnants

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

---------

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* πŸš€[Release v2.12.2 20241118] Merge into Main (#273)

* πŸš€[Release v2.11.1 071024] Merge into Develop (#245)

* replaced the control in PeerManager.c

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* reverted BRBitcoinAmount

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Cleaning up the files

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Removed Pusher remnants

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

---------

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Added Fiat feature, and FCM for push notifications (#247)

* Added fiat feature based on language user chose

* added fcm for push notifications

* Update PushNotificationService.kt

* Added new Icon, removed duplicate fcm library, added in app messaging

* Added new Icon, removed duplicate fcm library, added in app messaging

* Tech debt/add af sdk (#248)

* Recent newline

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* AF added

Refactored cruft

- AF working

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

---------

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Techdebt/refactor brevents syncmarkers (#254)

* Tech debt/add af sdk (#248)

- AF working
- Changed requiredActivity
- Added analytics error report
- test this.Activity is null or not
- Bugfix - Phrase Reminder crash
- added an exception handler for UserNotAuthenticatedException.
		 - note: this should allow for the system to display the native authorization UI when needed
		 - fixes issue - https://console.firebase.google.com/u/0/project/litewallet-beta/crashlytics/app/android:com.loafwallet/issues/09dac17241309f0e823ef597a9a82cd4
- Added dev note
- remove calls to BREventManager
- removed BREventManager
- renamed error message
- fixed Firebase Analytics event error

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* version bump

update gitignore

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

---------

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Techdebt/ fixed send issue add syncing measurements (#255)

* removed unused BRSharedPreferences

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* started commenting out more Timber

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Added more shared preferences for syncing

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Commented out many verbose Timber logs

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* WIP

Still trying to figure out the eplased time and last and start timestamps…???
I dunno

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Moved sync measurment into the method calls

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Debugged the install issue with send

- Moved all the measurements in new methods
- recalculated measure points
- Added analytics
- event did_complete_sync was shown!
- adding a dummy file to make sure file system is set
||||WIP still verifying the JSON is present
- added a blockheight label
-  changed the sleep time (a hack to allow the device time to refresh the view) to 100 ms from 500ms!!
-WIP Why is the bundle not showing on time
Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* replaces afID to first location

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Removed redundant sync measurements

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* code bump

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

---------

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Techdebt/test refactor cruft removal (#250)

* Removed non english seed words

-Refactor tests
- Reset AnalyticsTests

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Rename Bitcoinletter to Litecoinletters

-added tests
testLitecoinSymbolConstants
testAppExternalURLConstants
testFirebaseAnalyticsConstants

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

---------

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* fix: [#152] make sure using Fragment, FragmentManager and FragmentTransaction from androidx (#260)

* fix: [#126] the issue came from FragmentBalanceSeedReminder.fetchSeedPhrase, so we just wrap with runCatching for now to avoid crash (#263)

* version bump

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* Removed donation button

removed xml
removed fragments
removed references of the donation
removed analytical events

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* fix: prevent activity close

* code bump

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* enabled for Debug

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* fix: [#264] add null checking for BRKeyStore.removeAliasAndFiles (#270)

* fix: [#265] add null checking, migrate viewpage… (#271)

* fix: [WIP][#265] work in progress add null checking, migrate viewpager to viewpager2 and more

* fix: [#265] finalize migration some deprecated class and implement null checking at FragmentTransactionItem

* fix: dix dismiss outside FragmentTransactionDetails

* code bump

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

* version bump

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>

---------

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>
Co-authored-by: Josi Kie <54074780+josikie@users.noreply.github.com>
Co-authored-by: Andhika Yuana <andhikayuana@gmail.com>

* bumped version and code

* compiled the env (#284)

please check @andhikayuana @josikie  that you are able to compile

* Users complained that recyclerView was setting to the wrong language

- Polished to index to a language
- bump code

* chore: [#126] simplify exception handling at BRKeyStore._getData and record exception to Firebase Crashlytics (#283)

---------

Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com>
Co-authored-by: Josi Kie <54074780+josikie@users.noreply.github.com>
Co-authored-by: Andhika Yuana <andhikayuana@gmail.com>
  • Loading branch information
3 people authored Dec 2, 2024
1 parent 1407df0 commit 7e2c42a
Show file tree
Hide file tree
Showing 9 changed files with 262 additions and 168 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,4 @@ app/src/litewalletDebug/google-services.json
/app/debug/google-services.json
/.idea/dictionaries/grunt.xml
androidTestResultsUserPreferences.xml
.idea/deploymentTargetSelector.xml
6 changes: 4 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ android {
applicationId = 'com.loafwallet'
minSdkVersion 29
targetSdkVersion 34
versionCode 20241118
versionName "v2.12.2"
versionCode 20241130
versionName "v2.12.4"
multiDexEnabled true
archivesBaseName = "${versionName}(${versionCode})"

Expand All @@ -83,8 +83,10 @@ android {
// libraries Gradle should build and package with your APK.
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
}
ndkVersion "25.1.8937393"
externalNativeBuild {
cmake {
version "3.22.1"
arguments "-DANDROID_TOOLCHAIN=clang"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ protected void onCreate(Bundle savedInstanceState) {
int currentIndex = introLanguageResource.findLanguageIndex(currentLanguage);
countryLanguageAdapter.updateCenterPosition(currentIndex);
new Handler().post(() -> listLangRecyclerView.scrollToPosition(currentIndex));


listLangRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
Expand All @@ -96,12 +94,12 @@ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newStat
countryLanguageAdapter.updateCenterPosition(centerPosition);
description.setText(countryLanguageAdapter.selectedDesc());
showDialogForItem(countryLanguageAdapter.selectedMessage());
listLangRecyclerView.smoothScrollToPosition(centerPosition);
}
}
}

});

listLangRecyclerView.setLayoutManager(layoutManager);

setListeners();
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/activity_intro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/language_list"
android:layout_width="200dp"
android:layout_height="55dp"
android:layout_height="70dp"
android:layout_marginTop="96dp"
android:paddingBottom="14dp"
android:background="@drawable/lang_rounded_background"
android:paddingStart="10dp"
android:paddingTop="18dp"
android:paddingEnd="10dp"
android:paddingTop="14dp"
android:background="@drawable/lang_rounded_background"
android:paddingBottom="17dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
// in below line we are adding configurations to our project.
configurations.all {
// in below line we are adding strategy for each dependency and requesting the details
resolutionStrategy.eachDependency {DependencyResolveDetails details ->
resolutionStrategy.eachDependency {details ->
// on below line we are getting to see the details using requested.
def requested = details.requested
// in below line we are requesting a group.
Expand All @@ -29,7 +29,7 @@ buildscript {

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.google.gms:google-services:4.4.2'

classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Sat Jan 20 19:11:29 EST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 7e2c42a

Please sign in to comment.