github-wownero/wownerujo
1
0
Fork 0
mirror of https://github.com/wownero/wownerujo.git synced 2026-10-24 02:38:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup & AppCompatActivity & setTitle

Browse Source
This commit is contained in:
m2049r
2017-08-16 22:22:41 +02:00
parent afc45e1cbc
commit 032aa24ab5
11 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
+12 -9
View File
@@ -20,7 +20,6 @@ import android.app.Fragment;
import android.content.Context;
import android.os.Bundle;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.util.Log;
import android.view.KeyEvent;
@@ -178,8 +177,10 @@ public class GenerateFragment extends Fragment {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_NEXT)) {
if (etWalletAddress.length() == 0) {
Helper.hideKeyboard(getActivity());
generateWallet();
if (bGenerate.getVisibility() == View.VISIBLE) {
Helper.hideKeyboard(getActivity());
generateWallet();
}
} else if (addressOk()) {
etWalletViewKey.requestFocus();
} else {
@@ -247,8 +248,10 @@ public class GenerateFragment extends Fragment {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_NEXT)) {
if (spendKeyOk()) {
Helper.hideKeyboard(getActivity());
generateWallet();
if (bGenerate.getVisibility() == View.VISIBLE) {
Helper.hideKeyboard(getActivity());
generateWallet();
}
} else {
Toast.makeText(getActivity(), getString(R.string.generate_check_key), Toast.LENGTH_LONG).show();
}
@@ -267,8 +270,10 @@ public class GenerateFragment extends Fragment {
etWalletRestoreHeight.setOnEditorActionListener(new TextView.OnEditorActionListener() {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_NEXT)) {
Helper.hideKeyboard(getActivity());
generateWallet();
if (bGenerate.getVisibility() == View.VISIBLE) {
Helper.hideKeyboard(getActivity());
generateWallet();
}
return true;
}
return false;
@@ -324,8 +329,6 @@ public class GenerateFragment extends Fragment {
try {
height = Long.parseLong(etWalletRestoreHeight.getText().toString());
} catch (NumberFormatException ex) {
Log.e(TAG, "Cannot parse " + etWalletRestoreHeight.getText().toString());
Log.e(TAG, ex.getLocalizedMessage());
height = 0; // Keep calm and carry on!
}
app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
-3
View File
@@ -27,8 +27,6 @@ import android.widget.TextView;
import com.m2049r.xmrwallet.model.WalletManager;
import java.text.NumberFormat;
// TODO: somehow show which net we are generating for
public class GenerateReviewFragment extends Fragment {
@@ -93,7 +91,6 @@ public class GenerateReviewFragment extends Fragment {
tvWalletMnemonic.setText(seed);
tvWalletViewKey.setText(view);
tvWalletSpendKey.setText(spend);
NumberFormat formatter = NumberFormat.getInstance();
bAccept.setEnabled(true);
}
app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
+7 -1
View File
@@ -28,6 +28,7 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -44,7 +45,7 @@ import com.m2049r.xmrwallet.util.Helper;
import java.io.File;
public class LoginActivity extends Activity
public class LoginActivity extends AppCompatActivity
implements LoginFragment.Listener, GenerateFragment.Listener, GenerateReviewFragment.Listener {
static final String TAG = "LoginActivity";
@@ -166,6 +167,11 @@ public class LoginActivity extends Activity
return Helper.getStorageRoot(getApplicationContext());
}
@Override
public void setTitle(String title) {
super.setTitle(title);
}
////////////////////////////////////////
////////////////////////////////////////
app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java
+8
View File
@@ -78,6 +78,8 @@ public class LoginFragment extends Fragment {
File getStorageRoot();
void onWalletSelected(final String wallet);
void setTitle(String title);
}
@Override
@@ -135,6 +137,8 @@ public class LoginFragment extends Fragment {
} else {
setDaemon(daemonTestNet);
}
activityCallback.setTitle(getString(R.string.app_name) + " " +
getString(mainnet ? R.string.connect_mainnet : R.string.connect_testnet));
filterList();
((BaseAdapter) listView.getAdapter()).notifyDataSetChanged();
}
@@ -185,6 +189,10 @@ public class LoginFragment extends Fragment {
activityCallback.onWalletSelected(wallet);
}
});
activityCallback.setTitle(getString(R.string.app_name) + " " +
getString(isMainNet() ? R.string.connect_mainnet : R.string.connect_testnet));
loadList();
return view;
}
app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+2 -1
View File
@@ -25,13 +25,14 @@ import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
import android.os.PowerManager;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.widget.Toast;
import com.m2049r.xmrwallet.model.Wallet;
import com.m2049r.xmrwallet.service.WalletService;
public class WalletActivity extends Activity implements WalletFragment.Listener,
public class WalletActivity extends AppCompatActivity implements WalletFragment.Listener,
WalletService.Observer {
private static final String TAG = "WalletActivity";