diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java index c9a47d3..ec3c704 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java @@ -40,20 +40,10 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); mViewModel = new ViewModelProvider(this).get(SettingsViewModel.class); - Wallet wallet = WalletManager.getInstance().getWallet(); - Button displaySeedButton = view.findViewById(R.id.display_seed_button); - TextView walletInfoTextView = view.findViewById(R.id.wallet_info_textview); SwitchCompat nightModeSwitch = view.findViewById(R.id.day_night_switch); SwitchCompat torSwitch = view.findViewById(R.id.tor_switch); - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("Private view-key: " + wallet.getSecretViewKey()+"\n\n"); - stringBuilder.append("Restore height: " + wallet.getRestoreHeight() + "\n\n"); - stringBuilder.append("Wallet height: " + wallet.getBlockChainHeight() + "\n\n"); - stringBuilder.append("Daemon height: " + BlockchainService.getInstance().getDaemonHeight() + "\n\n"); - walletInfoTextView.setText(stringBuilder.toString()); - nightModeSwitch.setChecked(NightmodeHelper.getPreferredNightmode() == DayNightMode.NIGHT); nightModeSwitch.setOnCheckedChangeListener((compoundButton, b) -> { if(b) { @@ -67,6 +57,7 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia torSwitch.setOnCheckedChangeListener((compoundButton, b) -> { PrefService.getInstance().edit().putBoolean(Constants.PREF_USES_TOR, b).apply(); + // TODO display "Advanced" settings mode when enabled to configure specific proxy address and port String proxy = b ? "127.0.0.1:9050" : ""; WalletManager.getInstance().setProxy(proxy); WalletManager.getInstance().getWallet().setProxy(proxy); diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 177cd22..6451bf2 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -41,7 +41,7 @@ tools:text="+ 100.000000000000 confirming" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/balance_unlocked_textview" /> + app:layout_constraintTop_toBottomOf="@id/settings_imageview" /> diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml index 1c5792c..9cec94d 100644 --- a/app/src/main/res/layout/fragment_onboarding.xml +++ b/app/src/main/res/layout/fragment_onboarding.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:text="@string/create_wallet" android:layout_marginBottom="32dp" - android:textSize="24sp" + android:textSize="32sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index e0aca46..661e81e 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -11,40 +11,58 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/settings" - android:layout_marginBottom="32dp" - android:textSize="24sp" + android:textSize="32sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toTopOf="@id/display_seed_button"/> + app:layout_constraintBottom_toTopOf="@id/wallet_settings_textview"/> - + app:layout_constraintTop_toBottomOf="@id/settings_textview" + app:layout_constraintBottom_toTopOf="@id/display_seed_button"/>