From b5ded700fe83144c3a39800de5aeb8b3ac70fbe9 Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Mon, 28 Aug 2017 22:08:36 +0200
Subject: [PATCH] toolbar info action for wallet activity
---
.../com/m2049r/xmrwallet/LoginActivity.java | 2 +-
.../com/m2049r/xmrwallet/WalletActivity.java | 40 ++++++++++++++-----
.../drawable/ic_navigate_next_black_24dp.xml | 9 -----
.../drawable/ic_notifications_black_24dp.xml | 9 -----
.../main/res/drawable/ic_sync_black_24dp.xml | 9 -----
app/src/main/res/layout/login_activity.xml | 2 +-
app/src/main/res/layout/wallet_activity.xml | 2 +-
app/src/main/res/menu/wallet_menu.xml | 12 ++++++
app/src/main/res/values/strings.xml | 2 +
9 files changed, 48 insertions(+), 39 deletions(-)
delete mode 100644 app/src/main/res/drawable/ic_navigate_next_black_24dp.xml
delete mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml
delete mode 100644 app/src/main/res/drawable/ic_sync_black_24dp.xml
create mode 100644 app/src/main/res/menu/wallet_menu.xml
diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
index fde65fc7..c4a94a8d 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
@@ -66,7 +66,7 @@ public class LoginActivity extends AppCompatActivity
return;
}
- toolbar = (Toolbar) findViewById(R.id.tbLogin);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
if (Helper.getWritePermission(this)) {
diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
index af07d81d..9d3e7f69 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -29,7 +29,9 @@ import android.os.PowerManager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
-import android.view.View;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.widget.Toast;
import com.m2049r.xmrwallet.model.PendingTransaction;
@@ -105,6 +107,27 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
super.onDestroy();
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ if (!haveWallet) return true;
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.wallet_menu, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.action_info:
+ onWalletDetails();
+ break;
+ default:
+ break;
+ }
+
+ return true;
+ }
+
@Override
protected void onCreate(Bundle savedInstanceState) {
Log.d(TAG, "onCreate()");
@@ -114,15 +137,9 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
return;
}
- toolbar = (Toolbar) findViewById(R.id.tbWallet);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar.setTitle(R.string.app_name);
setSupportActionBar(toolbar);
- toolbar.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- onWalletDetails();
- }
- });
Fragment walletFragment = new WalletFragment();
getFragmentManager().beginTransaction()
@@ -347,6 +364,8 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
});
}
+ boolean haveWallet = false;
+
@Override
public void onWalletStarted(final boolean success) {
runOnUiThread(new Runnable() {
@@ -358,6 +377,9 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
});
if (!success) {
finish();
+ } else {
+ haveWallet = true;
+ invalidateOptionsMenu();
}
}
@@ -555,7 +577,7 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
private void onWalletDetails() {
Fragment fragment = getFragmentManager().findFragmentById(R.id.fragment_container);
- if (fragment instanceof WalletFragment) {
+ if (!(fragment instanceof GenerateReviewFragment)) {
Bundle extras = new Bundle();
extras.putString("type", GenerateReviewFragment.VIEW_WALLET);
replaceFragment(new GenerateReviewFragment(), null, extras);
diff --git a/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml b/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml
deleted file mode 100644
index 24835127..00000000
--- a/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml
deleted file mode 100644
index e3400cfc..00000000
--- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml
deleted file mode 100644
index 5a283aa7..00000000
--- a/app/src/main/res/drawable/ic_sync_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/login_activity.xml b/app/src/main/res/layout/login_activity.xml
index f4fc400f..8290c2bc 100644
--- a/app/src/main/res/layout/login_activity.xml
+++ b/app/src/main/res/layout/login_activity.xml
@@ -6,7 +6,7 @@
android:orientation="vertical">
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 10a09583..24d0fba8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,8 @@
Select Wallet
Wallet
+ Info
+
[<user>:<pass>@]<daemonhost>[:<port>]
Net Selection
TestNet