diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index a9e9ee561d6..71264c38ad1 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -7,7 +7,11 @@
"Bash(git check-ignore:*)",
"Bash(npm view:*)",
"Bash(npx expo-doctor:*)",
- "Bash(npm ls:*)"
+ "Bash(npm ls:*)",
+ "Bash(npx expo prebuild:*)",
+ "Bash(npx expo run:android:*)",
+ "Bash(./gradlew assembleDebug:*)",
+ "Bash(echo:*)"
]
}
}
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 535657791f2..93f46021564 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -133,6 +133,12 @@ android {
}
}
+// Exclude old Android Support libraries that conflict with AndroidX
+configurations.all {
+ exclude group: 'com.android.support', module: 'support-compat'
+ exclude group: 'com.android.support', module: 'support-v4'
+}
+
// Apply static values from `gradle.properties` to the `android.packagingOptions`
// Accepts values in comma delimited lists, example:
// android.packagingOptions.pickFirsts=/LICENSE,**/picasa.ini
@@ -156,17 +162,15 @@ android {
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
- implementation platform('com.google.firebase:firebase-bom:34.7.0')
- implementation 'com.google.firebase:firebase-analytics'
- implementation 'androidx.core:core-ktx:1.16.0'
- implementation 'androidx.work:work-runtime-ktx:2.10.5'
- implementation 'com.google.android.material:material:1.12.0'
- implementation 'androidx.compose.ui:ui:1.9.4'
- implementation 'androidx.compose.material3:material3:1.3.2'
- implementation 'androidx.preference:preference-ktx:1.2.1'
- implementation 'androidx.appcompat:appcompat:1.7.1'
- implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+
+ // AndroidX Preference for Settings activity
+ implementation("androidx.preference:preference-ktx:1.2.1")
+
+ // WorkManager for background widget updates
+ implementation("androidx.work:work-runtime-ktx:2.9.0")
+
+ // Material Components for segmented control
+ implementation("com.google.android.material:material:1.11.0")
def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true";
def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true";
@@ -192,5 +196,3 @@ dependencies {
implementation jscFlavor
}
}
-
-apply plugin: 'com.google.gms.google-services' // Google Services plugin
\ No newline at end of file
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
index 4e67b25cc47..551eb41da24 100644
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -7,12 +7,8 @@
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
-# React Native and Hermes
--keep class com.facebook.hermes.unicode.** { *; }
--keep class com.facebook.jni.** { *; }
--keep class com.facebook.react.turbomodule.** { *; }
-
# react-native-reanimated
-keep class com.swmansion.reanimated.** { *; }
+-keep class com.facebook.react.turbomodule.** { *; }
-# Add any project specific keep options here:
\ No newline at end of file
+# Add any project specific keep options here:
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 3e34269aa6e..3ec2507bab7 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,7 @@
+
+
diff --git a/android/app/src/debugOptimized/AndroidManifest.xml b/android/app/src/debugOptimized/AndroidManifest.xml
index 3e34269aa6e..3ec2507bab7 100644
--- a/android/app/src/debugOptimized/AndroidManifest.xml
+++ b/android/app/src/debugOptimized/AndroidManifest.xml
@@ -1,5 +1,7 @@
+
+
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e1fa5fde199..3fba1fc17df 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,56 +1,24 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -59,78 +27,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable-mdpi/splash_icon.png b/android/app/src/main/res/drawable-mdpi/splash_icon.png
deleted file mode 100644
index ec541528a9a..00000000000
Binary files a/android/app/src/main/res/drawable-mdpi/splash_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash_icon.png b/android/app/src/main/res/drawable-xhdpi/splash_icon.png
deleted file mode 100644
index a72c80addc6..00000000000
Binary files a/android/app/src/main/res/drawable-xhdpi/splash_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash_icon.png b/android/app/src/main/res/drawable-xxhdpi/splash_icon.png
deleted file mode 100644
index 5727bf33172..00000000000
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml
index 5c0239d0ad8..5c25e728ea2 100644
--- a/android/app/src/main/res/drawable/rn_edit_text_material.xml
+++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -18,10 +18,10 @@
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
- >
+ >
-
#FFFFFF
- #D3D3D3
- #3A3A3C
- #ffffff
- #ffffff
- #3A3A3C
- #9aa0aa
- #202020
- #ffffff
- #9aa0aa
- #1Affffff
- #1A0A84FF
+ #AAAAAA
+ #155724
+ #721C24
+ #1C1C1E
\ No newline at end of file
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 235721398ee..d3e64f97f5f 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,35 +1,39 @@
- #FFF
- #FFFFFF
- #FFFFFF
- #0C234F
- #949494
- #121212
- #FFFFFF
- #4ADCBA
- #F83661
- #ccddf9
- #0c2550
- #2f5fb3
- #eef0f4
- #9aa0aa
- #d2d2d2
- #0c2550
- #9aa0aa
- #1A0c2550
- #1A2f5fb3
- #3A3A3C
- #ffffff
- #ffffff
- #3A3A3C
- #9aa0aa
- #202020
- #ffffff
- #9aa0aa
- #1Affffff
- #1A0A84FF
- #ffffff
- #023c69
- #F7931A
- #F7931A
+
+ #F7931A
+ #F7931A
+ #F7931A
+ #ffffff
+
+ #FFF
+ #FFFFFF
+ #FFFFFF
+ #0C234F
+ #949494
+ #121212
+ #FFFFFF
+ #4ADCBA
+ #F83661
+
+ #ccddf9
+ #0c2550
+ #2f5fb3
+ #eef0f4
+ #9aa0aa
+ #d2d2d2
+ #0c2550
+ #9aa0aa
+ #1A0c2550
+ #1A2f5fb3
+
+ #3A3A3C
+ #ffffff
+ #ffffff
+ #3A3A3C
+ #9aa0aa
+ #202020
+ #ffffff
+ #9aa0aa
+ #1Affffff
+ #1A0A84FF
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 8b62a69ab40..7205027eacc 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,21 +1,33 @@
HRZN
+ automatic
+ contain
+ false
+
+
Loading...
Last Updated
From
+ Offline
+ From:
+ Price
+
+
Bitcoin Market
View the latest Bitcoin market data including price, satoshi rate, and next block fee.
Market
Next Block
Sats/%s
Price
+
+
Bitcoin Price
View the latest Bitcoin price in your preferred currency
- Offline
- From:
- Price
+
%1$s
%1$s
+
+
Settings
Report Issue
Provide this Unique ID when reporting an issue
@@ -26,7 +38,4 @@
Cache Cleared
The document, cache, and temp directories have been cleared.
Copied to clipboard
- contain
- false
- automatic
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index c7d4f8f0205..07ed8411941 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,15 +1,9 @@
-
-
-