diff --git a/app/build.gradle b/app/build.gradle index 8c711b7..14ee26e 100644 --- a/app/build.gradle +++ b/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 { diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java index 01c19d4..451be44 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java +++ b/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; diff --git a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java index b8b1be4..f6c435a 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java +++ b/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); + } } diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java index 607c24d..f88718e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java +++ b/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); diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml index f383102..1ef58ea 100644 --- a/app/src/main/res/layout/fragment_send.xml +++ b/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 @@