From 20d604f092373b824a7121906001957d71f09183 Mon Sep 17 00:00:00 2001 From: pokkst Date: Tue, 17 Jan 2023 20:09:14 -0600 Subject: [PATCH] Update zlib version and hash, and add node option to onboarding (untested) --- .../onboarding/OnboardingFragment.java | 39 ++++++++++++++++++- .../main/res/layout/fragment_onboarding.xml | 22 ++++++++++- external-libs/android32.Dockerfile | 4 +- external-libs/android32_x86.Dockerfile | 4 +- external-libs/android64.Dockerfile | 4 +- external-libs/android64_x86.Dockerfile | 4 +- 6 files changed, 66 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingFragment.java b/app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingFragment.java index c13a2e5..f15bb88 100644 --- a/app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingFragment.java +++ b/app/src/main/java/net/mynero/wallet/fragment/onboarding/OnboardingFragment.java @@ -24,6 +24,9 @@ import androidx.lifecycle.ViewModelProvider; import net.mynero.wallet.MainActivity; import net.mynero.wallet.MoneroApplication; import net.mynero.wallet.R; +import net.mynero.wallet.data.Node; +import net.mynero.wallet.fragment.dialog.AddNodeBottomSheetDialog; +import net.mynero.wallet.fragment.dialog.NodeSelectionBottomSheetDialog; import net.mynero.wallet.model.Wallet; import net.mynero.wallet.model.WalletManager; import net.mynero.wallet.service.PrefService; @@ -33,7 +36,7 @@ import net.mynero.wallet.util.RestoreHeight; import java.io.File; import java.util.Calendar; -public class OnboardingFragment extends Fragment { +public class OnboardingFragment extends Fragment implements NodeSelectionBottomSheetDialog.NodeSelectionDialogListener, AddNodeBottomSheetDialog.AddNodeListener { private boolean useOffset = true; private OnboardingViewModel mViewModel; TextWatcher proxyAddressListener = new TextWatcher() { @@ -82,6 +85,7 @@ public class OnboardingFragment extends Fragment { private ConstraintLayout proxySettingsLayout; private ImageView moreOptionsChevronImageView; private CheckBox seedOffsetCheckbox; + private Button selectNodeButton; @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @@ -93,6 +97,7 @@ public class OnboardingFragment extends Fragment { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); mViewModel = new ViewModelProvider(this).get(OnboardingViewModel.class); + selectNodeButton = view.findViewById(R.id.select_node_button); walletPasswordEditText = view.findViewById(R.id.wallet_password_edittext); walletPasswordConfirmEditText = view.findViewById(R.id.wallet_password_confirm_edittext); walletSeedEditText = view.findViewById(R.id.wallet_seed_edittext); @@ -201,6 +206,14 @@ public class OnboardingFragment extends Fragment { mViewModel.updateProxy(((MoneroApplication)getActivity().getApplication())); }); + + Node node = PrefService.getInstance().getNode(); // should be using default here + selectNodeButton.setText(getString(R.string.node_button_text, node.getAddress())); + selectNodeButton.setOnClickListener(view1 -> { + NodeSelectionBottomSheetDialog dialog = new NodeSelectionBottomSheetDialog(); + dialog.listener = this; + dialog.show(getActivity().getSupportFragmentManager(), "node_selection_dialog"); + }); } private void prepareDefaultNode() { @@ -286,4 +299,28 @@ public class OnboardingFragment extends Fragment { private boolean checkMnemonic(String seed) { return (seed.split("\\s").length == 25); } + + @Override + public void onNodeSelected() { + Node node = PrefService.getInstance().getNode(); + selectNodeButton.setText(getString(R.string.node_button_text, node.getAddress())); + mViewModel.updateProxy(((MoneroApplication)getActivity().getApplication())); + } + + @Override + public void onClickedEditNode(String nodeString) { } + + @Override + public void onClickedAddNode() { + AddNodeBottomSheetDialog addNodeDialog = new AddNodeBottomSheetDialog(); + addNodeDialog.listener = this; + addNodeDialog.show(getActivity().getSupportFragmentManager(), "add_node_dialog"); + } + + @Override + public void onNodeAdded() { + NodeSelectionBottomSheetDialog dialog = new NodeSelectionBottomSheetDialog(); + dialog.listener = this; + dialog.show(getActivity().getSupportFragmentManager(), "node_selection_dialog"); + } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml index 941db2a..fc4d5c8 100644 --- a/app/src/main/res/layout/fragment_onboarding.xml +++ b/app/src/main/res/layout/fragment_onboarding.xml @@ -15,11 +15,28 @@ android:text="@string/create_wallet" android:textSize="32sp" android:textStyle="bold" - app:layout_constraintBottom_toTopOf="@id/wallet_password_edittext" + app:layout_constraintBottom_toTopOf="@id/select_node_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> +