diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java index fde8cb4..45bdcf0 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java @@ -18,9 +18,7 @@ package com.m2049r.xmrwallet; import android.content.Context; import android.content.SharedPreferences; -import android.graphics.drawable.AnimationDrawable; import android.os.Bundle; -import android.os.Handler; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.FloatingActionButton; @@ -66,7 +64,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter List walletList = new ArrayList<>(); List displayedList = new ArrayList<>(); - ImageView ivGuntherWallets; EditText etDummy; DropDownEditText etDaemonAddress; ArrayAdapter nodeAdapter; @@ -134,8 +131,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter Log.d(TAG, "onCreateView"); View view = inflater.inflate(R.layout.fragment_login, container, false); - ivGuntherWallets = (ImageView) view.findViewById(R.id.ivGuntherWallets); - fabScreen = (FrameLayout) view.findViewById(R.id.fabScreen); fab = (FloatingActionButton) view.findViewById(R.id.fab); fabNew = (FloatingActionButton) view.findViewById(R.id.fabNew); @@ -216,22 +211,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter return view; } - void showGunther() { - ivGuntherWallets.setImageResource(R.drawable.gunther_wallets); - final AnimationDrawable guntherWalletsAnim = (AnimationDrawable) ivGuntherWallets.getDrawable(); - final Handler handler = new Handler(); - handler.postDelayed(new Runnable() { - @Override - public void run() { - guntherWalletsAnim.start(); - } - }, getResources().getInteger(R.integer.gunther_wallets_delay)); - } - - void normalGunther() { - ivGuntherWallets.setImageResource(R.drawable.gunther_wallets_00); - } - // Callbacks from WalletInfoAdapter @Override public void onInteraction(final View view, final WalletManager.WalletInfo infoItem) { @@ -288,11 +267,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter filterList(); adapter.setInfos(displayedList); adapter.notifyDataSetChanged(); - if (displayedList.isEmpty()) { - showGunther(); - } else { - normalGunther(); - } } private void showInfo(@NonNull String name) { diff --git a/app/src/main/res/drawable/gunther_desaturated.png b/app/src/main/res/drawable/gunther_desaturated.png new file mode 100644 index 0000000..2f14e52 Binary files /dev/null and b/app/src/main/res/drawable/gunther_desaturated.png differ diff --git a/app/src/main/res/drawable/gunther_wallets.xml b/app/src/main/res/drawable/gunther_wallets.xml deleted file mode 100644 index 9873abd..0000000 --- a/app/src/main/res/drawable/gunther_wallets.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/gunther_wallets_00.png b/app/src/main/res/drawable/gunther_wallets_00.png deleted file mode 100644 index acb5162..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_00.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_01.png b/app/src/main/res/drawable/gunther_wallets_01.png deleted file mode 100644 index eaaabcd..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_01.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_02.png b/app/src/main/res/drawable/gunther_wallets_02.png deleted file mode 100644 index 860705d..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_02.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_03.png b/app/src/main/res/drawable/gunther_wallets_03.png deleted file mode 100644 index eaaabcd..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_03.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_04.png b/app/src/main/res/drawable/gunther_wallets_04.png deleted file mode 100644 index 530ef69..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_04.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_05.png b/app/src/main/res/drawable/gunther_wallets_05.png deleted file mode 100644 index e0e69e1..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_05.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_06.png b/app/src/main/res/drawable/gunther_wallets_06.png deleted file mode 100644 index a616646..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_06.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_07.png b/app/src/main/res/drawable/gunther_wallets_07.png deleted file mode 100644 index 534d353..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_07.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_08.png b/app/src/main/res/drawable/gunther_wallets_08.png deleted file mode 100644 index 7b11c83..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_08.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_09.png b/app/src/main/res/drawable/gunther_wallets_09.png deleted file mode 100644 index 1d3ce00..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_09.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_10.png b/app/src/main/res/drawable/gunther_wallets_10.png deleted file mode 100644 index 1f01399..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_10.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_11.png b/app/src/main/res/drawable/gunther_wallets_11.png deleted file mode 100644 index 7135fd0..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_11.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_12.png b/app/src/main/res/drawable/gunther_wallets_12.png deleted file mode 100644 index 92bb8ac..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_12.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_13.png b/app/src/main/res/drawable/gunther_wallets_13.png deleted file mode 100644 index 9eed5c3..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_13.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_14.png b/app/src/main/res/drawable/gunther_wallets_14.png deleted file mode 100644 index c6b4f89..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_14.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_15.png b/app/src/main/res/drawable/gunther_wallets_15.png deleted file mode 100644 index e878836..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_15.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_16.png b/app/src/main/res/drawable/gunther_wallets_16.png deleted file mode 100644 index 5a598b4..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_16.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_17.png b/app/src/main/res/drawable/gunther_wallets_17.png deleted file mode 100644 index 5a598b4..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_17.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_18.png b/app/src/main/res/drawable/gunther_wallets_18.png deleted file mode 100644 index 5a598b4..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_18.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_19.png b/app/src/main/res/drawable/gunther_wallets_19.png deleted file mode 100644 index e878836..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_19.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_20.png b/app/src/main/res/drawable/gunther_wallets_20.png deleted file mode 100644 index 92bb8ac..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_20.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_21.png b/app/src/main/res/drawable/gunther_wallets_21.png deleted file mode 100644 index 1f01399..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_21.png and /dev/null differ diff --git a/app/src/main/res/drawable/gunther_wallets_22.png b/app/src/main/res/drawable/gunther_wallets_22.png deleted file mode 100644 index eaaabcd..0000000 Binary files a/app/src/main/res/drawable/gunther_wallets_22.png and /dev/null differ diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 41ceb68..bf56446 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -1,71 +1,70 @@ - + android:layout_margin="8sp" + android:orientation="vertical"> - + + + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/label_daemon"> - - - + android:gravity="start" + android:hint="@string/prompt_daemon" + android:imeOptions="actionDone" + android:inputType="textWebEmailAddress|textNoSuggestions" + android:maxLines="1" + android:textIsSelectable="true" /> + - - + + - - - + android:layout_height="match_parent" + android:fillViewport="true"> - - - - + android:adjustViewBounds="true" + android:padding="48dp" + android:src="@drawable/gunther_desaturated" /> + - + - \ No newline at end of file + + +