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

move status above sum

This commit is contained in:
m2049r 2023-04-26 08:15:02 +02:00
parent 4b3b99ff2a
commit 1ece6bfbeb
No known key found for this signature in database
GPG Key ID: 4386E69AF260078D
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,7 +451,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
if (extras != null) { if (extras != null) {
String walletId = extras.getString(REQUEST_ID); String walletId = extras.getString(REQUEST_ID);
if (walletId != null) { if (walletId != null) {
setTitle(walletId, getString(R.string.status_wallet_connecting)); setTitle(walletId);
} }
} }
updateProgress(); updateProgress();

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

@ -460,7 +460,7 @@ 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.GONE); 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);

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

@ -24,6 +24,37 @@
android:layout_margin="8dp" android:layout_margin="8dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/ivSynced"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_done_all"
android:visibility="invisible" />
<TextView
android:id="@+id/tvProgress"
style="@style/MoneroText.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
tools:text="Synced 1 410 674 blocks" />
</LinearLayout>
<ProgressBar
android:id="@+id/pbProgress"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="invisible" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -97,37 +128,6 @@
android:gravity="center" android:gravity="center"
tools:text="+ 0.00 unconfirmed" /> tools:text="+ 0.00 unconfirmed" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/header_top_first"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/ivSynced"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_done_all"
android:visibility="gone" />
<TextView
android:id="@+id/tvProgress"
style="@style/MoneroText.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
tools:text="Synced 1 410 674 blocks" />
</LinearLayout>
<ProgressBar
android:id="@+id/pbProgress"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="invisible" />
</LinearLayout> </LinearLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView