0.4.5

Fix Dockerfile scripts (new Zlib version: 1.3)
Adds block counts for sync progress bar
Adds option to hide Monerochan on wallet creation screen
Coloring changes
Update address in README.md

README.md

@@ -27,4 +27,4 @@ See [the instructions](doc/BUILDING-external-libs.md)
 Then, fire up Android Studio and build the APK.
 
 ### Donations
-- Address: 87MRtZPrWUCVUgcFHdsVb5MoZUcLtqfD3FvQVGwftFb8eSdMnE39JhAJcbuSW8X2vRaRsB9RQfuCpFciybJFHaz3QYPhCLw
+- Address: 87BqQYkugEzh6Tuyotm2uc3DzJzKM6MuZaC161e6u1TsQxxPmXVPHpdNRyK47JY4d1hhbe25YVz4e9vTXCLDxvHkRXEAeBC

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "net.mynero.wallet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 40407
+        versionCode 40500
-        versionName "0.4.4.7 'Fluorine Fermi'"
+        versionName "0.4.5 'Fluorine Fermi'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/java/net/mynero/wallet/fragment/home/HomeFragment.java

@@ -105,6 +105,7 @@ public class HomeFragment extends Fragment implements TransactionInfoAdapter.TxI
         }
 
         ProgressBar progressBar = view.findViewById(R.id.sync_progress_bar);
+        TextView progressBarText = view.findViewById(R.id.sync_progress_text);
         if (blockchainService != null) {
             blockchainService.height.observe(getViewLifecycleOwner(), height -> {
                 Wallet wallet = WalletManager.getInstance().getWallet();
@@ -118,9 +119,14 @@ public class HomeFragment extends Fragment implements TransactionInfoAdapter.TxI
                     progressBar.setIndeterminate(height <= 1 || daemonHeight <= 0);
                     if (height > 1 && daemonHeight > 1) {
                         progressBar.setProgress(x);
+                        progressBarText.setVisibility(View.VISIBLE);
+                        progressBarText.setText("Syncing... " + height + " / " + daemonHeight);
+                    } else {
+                        progressBarText.setVisibility(View.GONE);
                     }
                 } else {
                     progressBar.setVisibility(View.INVISIBLE);
+                    progressBarText.setVisibility(View.GONE);
                 }
             });
         }

app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingFragment.java

@@ -92,6 +92,8 @@ public class OnboardingFragment extends Fragment implements NodeSelectionBottomS
     private ImageView moreOptionsChevronImageView;
     private CheckBox seedOffsetCheckbox;
     private Button selectNodeButton;
+    private SwitchCompat showXmrchanSwitch;
+    private ImageView xmrchanOnboardingImage;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@@ -118,6 +120,8 @@ public class OnboardingFragment extends Fragment implements NodeSelectionBottomS
         walletProxyPortEditText = view.findViewById(R.id.wallet_proxy_port_edittext);
         seedOffsetCheckbox.setChecked(useOffset);
         advancedOptionsLayout = view.findViewById(R.id.more_options_layout);
+        showXmrchanSwitch = view.findViewById(R.id.show_xmrchan_switch);
+        xmrchanOnboardingImage = view.findViewById(R.id.xmrchan_onboarding_imageview);
 
         bindListeners();
         bindObservers();
@@ -223,6 +227,16 @@ public class OnboardingFragment extends Fragment implements NodeSelectionBottomS
             mViewModel.updateProxy(((MoneroApplication)getActivity().getApplication()));
         });
 
+        showXmrchanSwitch.setChecked(PrefService.getInstance().getBoolean(Constants.PREF_MONEROCHAN, true));
+        showXmrchanSwitch.setOnCheckedChangeListener((compoundButton, b) -> {
+            PrefService.getInstance().edit().putBoolean(Constants.PREF_MONEROCHAN, b).apply();
+            if(b) {
+                xmrchanOnboardingImage.setVisibility(View.VISIBLE);
+            } else {
+                xmrchanOnboardingImage.setVisibility(View.GONE);
+            }
+        });
+
         Node node = PrefService.getInstance().getNode(); // should be using default here
         selectNodeButton.setText(getString(R.string.node_button_text, node.getAddress()));
         selectNodeButton.setOnClickListener(view1 -> {

app/src/main/res/drawable/sync_progress_bar_drawable.xml

@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape>
-            <solid android:color="@android:color/white" />
+            <solid android:color="@color/oled_colorOnBackground" />
         </shape>
     </item>
 

app/src/main/res/layout/fragment_home.xml

@@ -10,7 +10,7 @@
         android:id="@+id/sync_progress_bar"
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="0dp"
-        android:layout_height="4dp"
+        android:layout_height="16dp"
         android:indeterminate="true"
         android:indeterminateTint="@color/oled_colorSecondary"
         android:progressDrawable="@drawable/sync_progress_bar_drawable"
@@ -18,6 +18,22 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/sync_progress_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        android:textAlignment="center"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/sync_progress_bar"
+        app:layout_constraintStart_toStartOf="@id/sync_progress_bar"
+        app:layout_constraintTop_toTopOf="@id/sync_progress_bar"
+        app:layout_constraintBottom_toBottomOf="@id/sync_progress_bar"
+        tools:text="Syncing... 3102333/40010203" />
+
     <TextView
         android:id="@+id/balance_unlocked_textview"
         android:layout_width="0dp"

app/src/main/res/layout/fragment_onboarding.xml

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <ImageView
+        android:id="@+id/xmrchan_onboarding_imageview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scaleType="fitEnd"
@@ -104,11 +105,31 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/advanced_settings_dropdown_textview">
+                <TextView
+                    android:id="@+id/disable_xmrchan_textview"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/option_hide_xmrchan"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@id/show_xmrchan_switch"
+                    app:layout_constraintEnd_toStartOf="@id/show_xmrchan_switch"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/show_xmrchan_switch" />
+
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/show_xmrchan_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp"
+                    android:minWidth="48dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
                 <Button
                     android:id="@+id/select_node_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="8dp"
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
                     tools:text="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -118,7 +139,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/show_xmrchan_switch"
                     tools:ignore="SpeakableTextPresentCheck" />
 
                 <EditText

app/src/main/res/values/colors.xml

@@ -17,7 +17,7 @@
     <color name="oled_noticeColor">#3DC2FF</color>
     <color name="oled_navigationBarColor">#000000</color>
     <color name="oled_colorBackground">#ffffff</color>
-    <color name="oled_colorOnBackground">#232323</color>
+    <color name="oled_colorOnBackground">#A6A6A6</color>
     <color name="oled_colorSurface">@color/oled_colorBackground</color>
     <color name="oled_colorOnSurface">@color/oled_colorOnBackground</color>
     <color name="oled_colorPrimary">#2E2E2E</color>

external-libs/android32.Dockerfile

@@ -80,8 +80,8 @@ RUN set -x \
     && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC}
 
 # download, configure and make Zlib
-ENV ZLIB_VERSION 1.2.13
+ENV ZLIB_VERSION 1.3
-ENV ZLIB_HASH b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+ENV ZLIB_HASH ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
 RUN set -x \
     && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
     && echo "${ZLIB_HASH}  zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \

external-libs/android32_x86.Dockerfile

@@ -80,8 +80,8 @@ RUN set -x \
     && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC}
 
 # download, configure and make Zlib
-ENV ZLIB_VERSION 1.2.13
+ENV ZLIB_VERSION 1.3
-ENV ZLIB_HASH b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+ENV ZLIB_HASH ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
 RUN set -x \
     && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
     && echo "${ZLIB_HASH}  zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \

external-libs/android64.Dockerfile

@@ -80,8 +80,8 @@ RUN set -x \
     && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC}
 
 # download, configure and make Zlib
-ENV ZLIB_VERSION 1.2.13
+ENV ZLIB_VERSION 1.3
-ENV ZLIB_HASH b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+ENV ZLIB_HASH ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
 RUN set -x \
     && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
     && echo "${ZLIB_HASH}  zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \

external-libs/android64_x86.Dockerfile

@@ -80,8 +80,8 @@ RUN set -x \
     && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC}
 
 # download, configure and make Zlib
-ENV ZLIB_VERSION 1.2.13
+ENV ZLIB_VERSION 1.3
-ENV ZLIB_HASH b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+ENV ZLIB_HASH ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
 RUN set -x \
     && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
     && echo "${ZLIB_HASH}  zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \