more help & restyle reallysend button (#114)

app/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 36
+        versionCode 37
         versionName "1.1.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java

@@ -1071,6 +1071,9 @@ public class LoginActivity extends AppCompatActivity
             case R.id.action_license_info:
                 AboutFragment.display(getSupportFragmentManager());
                 return true;
+            case R.id.action_help_list:
+                HelpFragment.display(getSupportFragmentManager(), R.string.help_list);
+                return true;
             case R.id.action_privacy_policy:
                 PrivacyFragment.display(getSupportFragmentManager());
                 return true;

app/src/main/java/com/m2049r/xmrwallet/SendFragment.java

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
@@ -27,6 +28,8 @@ import android.text.InputType;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
@@ -483,4 +486,15 @@ public class SendFragment extends Fragment {
         pbProgress.setVisibility(View.GONE);
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.send_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
 }

app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java

@@ -163,8 +163,14 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
             case R.id.action_help_tx_info:
                 HelpFragment.display(getSupportFragmentManager(), R.string.help_tx_details);
                 return true;
-            case R.id.action_help_sync:
-                HelpFragment.display(getSupportFragmentManager(), R.string.help_sync);
+            case R.id.action_help_wallet:
+                HelpFragment.display(getSupportFragmentManager(), R.string.help_wallet);
+                return true;
+            case R.id.action_details_help:
+                HelpFragment.display(getSupportFragmentManager(), R.string.help_details);
+                return true;
+            case R.id.action_help_send:
+                HelpFragment.display(getSupportFragmentManager(), R.string.help_send);
                 return true;
             default:
                 return super.onOptionsItemSelected(item);

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

@@ -265,6 +265,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4sp"
+                android:backgroundTint="@color/moneroGray"
                 android:hint="@string/send_notes_hint"
                 android:imeOptions="actionDone"
                 android:inputType="textMultiLine"
@@ -283,7 +284,7 @@
 
             <Button
                 android:id="@+id/bReallySend"
-                style="@style/MoneroButton.Alert"
+                style="@style/MoneroButton.ReallySend"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8sp"

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

@@ -85,6 +85,7 @@
                         android:layout_width="0sp"
                         android:layout_height="wrap_content"
                         android:layout_weight="8"
+                        android:backgroundTint="@color/moneroGray"
                         android:hint="@string/tx_notes_hint"
                         android:inputType="textMultiLine"
                         android:textAlignment="textStart" />

app/src/main/res/menu/list_menu.xml

@@ -17,8 +17,15 @@
 
     <item
         android:id="@+id/action_privacy_policy"
-        android:orderInCategory="200"
+        android:orderInCategory="300"
         android:title="@string/menu_privacy"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/action_help_list"
+        android:icon="@drawable/ic_help_white_24dp"
+        android:orderInCategory="400"
+        android:title="@string/menu_help"
+        app:showAsAction="ifRoom" />
+
 </menu>

app/src/main/res/menu/send_menu.xml

@@ -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_help_send"
+        android:icon="@drawable/ic_help_white_24dp"
+        android:orderInCategory="100"
+        android:title="@string/menu_help"
+        app:showAsAction="ifRoom" />
+
+</menu>

app/src/main/res/menu/wallet_menu.xml

@@ -17,11 +17,10 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_help_sync"
+        android:id="@+id/action_help_wallet"
         android:icon="@drawable/ic_help_white_24dp"
         android:orderInCategory="200"
         android:title="@string/menu_help"
         app:showAsAction="never" />
 
-
 </menu>

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

@@ -36,7 +36,12 @@
         for the purpose of processing transactions and transmitted into the Monero Network
         in encrypted form.
         </p>
-        <p>Other personal data is not collected.</p>
+        <p>Other personal data is not collected by the app.</p>
+        <p>If you use the USD/EUR exchange (optional) functionality, monerujo fetches the exchange
+        rate through the public API of kraken.com.
+        See their privacy policy at https://www.kraken.com/legal/privacy for
+        details on how data in your requests is collected (especially the
+        section "Information We Collect Automatically").</p>
         <h2>App Permissions</h2>
         <ul>
         <li>INTERNET : Connect to the Monero Network via a Monero Daemon Node</li>

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

@@ -2,7 +2,7 @@
 <resources>
     <string name="help_create_new"><![CDATA[
         <h1>Create Wallet - New</h1>
-        <p>You need a new Monero Address - great!</p>
+        <p>If you need a new Monero Address!</p>
         <p>Enter a unique wallet name and password.
         The password is used for securing your wallet data on the device. Use a strong password -
         even better use a passphrase.</p>
@@ -22,7 +22,7 @@
 
     <string name="help_create_seed"><![CDATA[
         <h1>Create Wallet - Seed</h1>
-        <p>You already have a Monero Address and want to recover the transactions from the blockchain.</p>
+        <p>If you already have a Monero Address and want to recover the transactions from the blockchain!</p>
         <p>Enter a unique wallet name and password. The password is used for securing your wallet data on the device.
         Use a strong password - even better use a passphrase.</p>
         <p>Enter your Seed in the field \"Mnemonic Seed\".<p>
@@ -33,7 +33,7 @@
 
     <string name="help_create_keys"><![CDATA[
         <h1>Create Wallet - Keys</h1>
-        <p>You are recovering your wallet using your keys.</p>
+        <p>If you are recovering your wallet using your keys!</p>
         <p>Enter a unique wallet name and password. The password is used for securing your wallet data on the device.
         Use a strong password - even better use a passphrase.<p>
         <p>Enter your Monero Address in the field \"Public Address\" and fill out \"View Key\" and  \"Spend Key\".</p>
@@ -44,7 +44,7 @@
 
     <string name="help_create_view"><![CDATA[
         <h1>Create Wallet - View</h1>
-        <p>You just want to monitor incoming transactions to a wallet.</p>
+        <p>If you just want to monitor incoming transactions to a wallet!</p>
         <p>Enter a unique wallet name and password. The password is used for securing your wallet data on the device.
         Use a strong password - even better use a passphrase.<p>
         <p>Enter your Monero Address in the field \"Public Address\" and fill out the \"View Key\".</p>
@@ -70,12 +70,44 @@
         anyone this key, keep it safe like your Mnemonic Seed.
     ]]></string>
 
-    <string name="help_sync"><![CDATA[
-        <h1>Scanning</h1>
+    <string name="help_list"><![CDATA[
+        <h1>Wallet List</h1>
+        <p>Here you see your wallets. They are located in the <tt>monerujo</tt> folder
+        in the internal storage of your device. You can use a file explorer app to see them.
+        You should make backups of this folder on a regular basis to off-device storage in
+        case your device explodes or gets stolen.</p>
+        <p>Select a wallet to open it or press the \"+\" to create a new one.
+        Or select one of the wallet operations:</p>
+        <h2>Details</h2>
+        <p>Show the wallet details, seed &amp; keys.</p>
+        <h2>Receive</h2>
+        <p>Make a QR code for receiving Moneroj.</p>
+        <h2>Rename</h2>
+        <p>Rename the wallet. Backups are not renamed.</p>
+        <h2>Backup</h2>
+        <p>Make a copy of the wallet in the <tt>backups</tt> folder inside the <tt>monerujo</tt>
+        overwriting previous copies there.</p>
+        <h2>Archive</h2>
+        <p>Make a backup and delete the wallet afterwards. The copy remains in the <tt>backups</tt>
+        folder. If you no longer need your backups you should delete them with a file explorer or
+        secure delete app.</p>
+    ]]></string>
+
+    <string name="help_wallet"><![CDATA[
+        <h1>The Wallet</h1>
+        <h2>Scanning</h2>
         Because Monero likes to keep things private, every time you open a Monerujo wallet we have to
         scan the blockchain to see if any new Moneroj have been sent to your wallet, this only
         stores information to your phone which belongs to your wallet. Sometimes it can take a while
         because you haven’t synced in a long time.
+        <h2>The Balance</h2>
+        <p><b>Help! My wallet balance has disappeared or is unconfirmed!</b><br/>
+        Don’t panic! When you send funds from your wallet, some of your balance will temporarily show
+        as unconfirmed.
+        This happens as a result of how Monero is exchanged on the blockchain and how change works.
+        Read more about change at https://getmonero.org/resources/moneropedia/change.html
+        <h2>Transaction List</h2>
+        <p>A list of the wallet transactions. In view wallets, only incoming transactions are shown.</p>
     ]]></string>
 
     <string name="help_tx_details"><![CDATA[
@@ -96,4 +128,28 @@
         This was the block your transaction was included in.
     ]]></string>
 
+    <string name="help_send"><![CDATA[
+        <h1>Send</h1>
+        <h2>Receiver’s address</h2>
+        <p>This is the public address of the wallet you are sending Moneroj to, you can copy this from
+        your clipboard, scan a QR code or enter it manually. Make sure you triple check this to
+        ensure you aren’t sending coins to the wrong address.</p>
+        <h2>Payment ID</h2>
+        <p>You can use a Payment ID to identify the reason you sent Monero between two parties. This
+        is fully optional and private. For example it can allow a business to reconcile your
+        transaction with an item you bought.<p>
+        <h2>Ring size</h2>
+        <p>There are a number of ring sizes to choose from in Monerujo. If you are a beginner user
+        we recommend you stick with a ring size of 5. Increasing the ring size above 5 increases
+        the amount of signers in a ring signature, theoretically providing increased plausible
+        deniability. However setting high ring sizes can also make your transaction stand out on
+        the blockchain.</p>
+        <h2>Priority</h2>
+        <p>This setting determines the speed at which your transaction will be included in the
+        blockchain. A high priority setting will correlate directly with a higher transaction fee
+        and the inverse is true for a low priority. Please note that if you set your transaction to
+        a low priority it can be hours before it is included on the blockchain. The default priority
+        is \"Medium\".</p>
+    ]]></string>
+
 </resources>

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

@@ -168,7 +168,7 @@
     <string name="send_prepare_hint">Prepare</string>
     <string name="send_dispose_hint">Dispose (Undo)</string>
     <string name="send_send_hint">Spend my sweet Moneroj</string>
-    <string name="send_really_send_hint">I understand I am sending real Monero!</string>
+    <string name="send_really_send_hint">Last Step - Confirm!</string>
     <string name="send_qr_invalid">Not a monero QR Code</string>
     <string name="send_qr_address_invalid">Invalid Monero address</string>
     <string name="send_preparing_progress">Preparing transaction</string>

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

@@ -193,6 +193,10 @@
         <item name="android:background">@color/gradientPink</item>
     </style>
 
+    <style name="MoneroButton.ReallySend">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
     <style name="MoneroButton.Take">
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@color/take</item>