Skip to content

Commit fba1c85

Browse files
author
Anschutz1927
committed
create eos wallet screen
1 parent 237d20b commit fba1c85

21 files changed

+1217
-12
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ dependencies {
9898
implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1'
9999
implementation 'io.reactivex.rxjava2:rxjava:2.1.9'
100100
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
101+
implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
101102
implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
102103
implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
103104
implementation 'com.google.code.gson:gson:2.8.2'

app/src/main/java/io/multy/ui/fragments/asset/AssetInfoFragment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ public void onClickWarn() {
428428
startActivity(new Intent(getActivity(), SeedActivity.class));
429429
}
430430

431+
//todo need to move in a common activity
431432
public static class SharingBroadcastReceiver extends BroadcastReceiver {
432433

433434
public SharingBroadcastReceiver() {

app/src/main/java/io/multy/ui/fragments/asset/CreateAssetFragment.java

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,27 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
7676

7777
View v = inflater.inflate(R.layout.view_assets_action_add, container, false);
7878
ButterKnife.bind(this, v);
79-
initialize();
80-
subscribeToCurrencyUpdate();
81-
Analytics.getInstance(getActivity()).logCreateWalletLaunch();
79+
if (chainId == NativeDataHelper.Blockchain.EOS.getValue() && getFragmentManager() != null) {
80+
getActivity().getIntent().putExtra(Constants.CHAIN_ID, chainId);
81+
CreatePayableAssetFragment fragment = CreatePayableAssetFragment.getInstance();
82+
getFragmentManager().beginTransaction()
83+
.replace(R.id.container_main, fragment, CreatePayableAssetFragment.TAG)
84+
.commit();
85+
} else {
86+
initialize();
87+
subscribeToCurrencyUpdate();
88+
Analytics.getInstance(getActivity()).logCreateWalletLaunch();
8289

83-
editTextWalletName.requestFocus();
84-
editTextWalletName.postDelayed(() -> {
85-
InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
86-
if (imm.isActive()) {
87-
imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
88-
}
90+
editTextWalletName.requestFocus();
91+
editTextWalletName.postDelayed(() -> {
92+
InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
93+
if (imm.isActive()) {
94+
imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
95+
}
8996

90-
imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
91-
}, 100);
97+
imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
98+
}, 100);
99+
}
92100
return v;
93101
}
94102

0 commit comments

Comments
 (0)