wownero
/
wownerujo
Archived
4
0
Fork 0
Code Releases 19 Activity

toolbar info action for wallet activity

Browse Source
upstream
m2049r 7 years ago
parent a5527d4efd
commit b5ded700fe
9 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -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)) {

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

@ -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);

9
app/src/main/res/drawable/ic_navigate_next_black_24dp.xml
Unescape View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
</vector>

9
app/src/main/res/drawable/ic_notifications_black_24dp.xml
Unescape View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z" />
</vector>

9
app/src/main/res/drawable/ic_sync_black_24dp.xml
Unescape View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" />
</vector>

2
app/src/main/res/layout/login_activity.xml
Unescape View File

@ -6,7 +6,7 @@
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/tbLogin"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"

2
app/src/main/res/layout/wallet_activity.xml
Unescape View File

@ -6,7 +6,7 @@
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/tbWallet"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"

12
app/src/main/res/menu/wallet_menu.xml
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_info"
android:icon="@drawable/ic_info_black_24dp"
android:orderInCategory="100"
android:title="Info"
app:showAsAction="always" />
</menu>

2
app/src/main/res/values/strings.xml
Unescape View File

@ -3,6 +3,8 @@
<string name="login_activity_name">Select Wallet</string>
<string name="wallet_activity_name">Wallet</string>
<string name="menu_info">Info</string>
<string name="prompt_daemon">[&lt;user&gt;:&lt;pass&gt;@]&lt;daemonhost&gt;[:&lt;port&gt;]</string>
<string name="prompt_mainnet">Net Selection</string>
<string name="connect_testnet">TestNet</string>