Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

center sync status

This commit is contained in:
m2049r 2023-05-03 08:22:23 +02:00
parent 3406f585f2
commit a42f750fc4
No known key found for this signature in database
GPG Key ID: 4386E69AF260078D
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -8,8 +8,8 @@ android {
applicationId "com.m2049r.xmrwallet" applicationId "com.m2049r.xmrwallet"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 31 targetSdkVersion 31
versionCode 3110 versionCode 3120
versionName "3.1.1 'Fluorine Fermi'" versionName "3.1.2 'Fluorine Fermi'"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {
cmake { cmake {

2
app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
View File

@ -447,6 +447,7 @@ public class WalletFragment extends Fragment
String sync; String sync;
if (!activityCallback.hasBoundService()) if (!activityCallback.hasBoundService())
throw new IllegalStateException("WalletService not bound."); throw new IllegalStateException("WalletService not bound.");
ivSynced.setVisibility(View.GONE);
Wallet.ConnectionStatus daemonConnected = activityCallback.getConnectionStatus(); Wallet.ConnectionStatus daemonConnected = activityCallback.getConnectionStatus();
if (daemonConnected == Wallet.ConnectionStatus.ConnectionStatus_Connected) { if (daemonConnected == Wallet.ConnectionStatus.ConnectionStatus_Connected) {
if (!wallet.isSynchronized()) { if (!wallet.isSynchronized()) {
@ -460,7 +461,6 @@ public class WalletFragment extends Fragment
int x = 100 - Math.round(100f * n / (1f * daemonHeight - firstBlock)); int x = 100 - Math.round(100f * n / (1f * daemonHeight - firstBlock));
if (x == 0) x = 101; // indeterminate if (x == 0) x = 101; // indeterminate
setProgress(x); setProgress(x);
ivSynced.setVisibility(View.INVISIBLE);
} else { } else {
sync = getString(R.string.status_synced) + " " + formatter.format(wallet.getBlockChainHeight()); sync = getString(R.string.status_synced) + " " + formatter.format(wallet.getBlockChainHeight());
ivSynced.setVisibility(View.VISIBLE); ivSynced.setVisibility(View.VISIBLE);

4
app/src/main/res/layout/fragment_wallet.xml
View File

@ -26,7 +26,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="24dp"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
@ -36,7 +36,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:src="@drawable/ic_done_all" android:src="@drawable/ic_done_all"
android:visibility="invisible" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvProgress" android:id="@+id/tvProgress"