From 639031737f6cbfd2c9cf3bcede8d1c85e9ddac67 Mon Sep 17 00:00:00 2001 From: zeapo Date: Sun, 19 Oct 2014 18:14:35 +0200 Subject: nicer layout for pass list --- app/app-release.apk | Bin 1735814 -> 2068942 bytes .../java/com/zeapo/pwdstore/PasswordFragment.java | 4 +- .../java/com/zeapo/pwdstore/crypto/PgpHandler.java | 7 +- .../pwdstore/utils/PasswordRecyclerAdapter.java | 26 +- app/src/main/res/drawable/category_rectangle.xml | 15 ++ app/src/main/res/drawable/password_rectangle.xml | 15 ++ app/src/main/res/drawable/rectangle.xml | 9 +- app/src/main/res/layout/activity_pwdstore.xml | 1 - app/src/main/res/layout/password_row_layout.xml | 15 +- app/src/main/res/values/colors.xml | 277 +++++++++++++++++++++ app/src/main/res/values/refs.xml | 3 - app/src/main/res/values/styles.xml | 7 +- 12 files changed, 354 insertions(+), 25 deletions(-) create mode 100644 app/src/main/res/drawable/category_rectangle.xml create mode 100644 app/src/main/res/drawable/password_rectangle.xml create mode 100644 app/src/main/res/values/colors.xml diff --git a/app/app-release.apk b/app/app-release.apk index 98c73adb..ffb4dc4f 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java index 67e3e858..615087c8 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java @@ -74,7 +74,7 @@ public class PasswordFragment extends Fragment{ } @Override - public void onAttach(Activity activity) { + public void onAttach(final Activity activity) { super.onAttach(activity); try { mListener = new OnFragmentInteractionListener() { @@ -89,6 +89,8 @@ public class PasswordFragment extends Fragment{ ((ActionBarActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } else { + ((PasswordStore) getActivity()).decryptPassword(item); } } diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index efeabc3e..39010a53 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -31,6 +31,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.SystemClock; import android.preference.PreferenceManager; +import android.support.v7.app.ActionBarActivity; import android.text.TextUtils; import android.util.Log; import android.view.Menu; @@ -46,7 +47,7 @@ import com.zeapo.pwdstore.R; import com.zeapo.pwdstore.UserPreference; import com.zeapo.pwdstore.utils.PasswordRepository; -public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnBound{ +public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConnection.OnBound{ private OpenPgpServiceConnection mServiceConnection; @@ -109,9 +110,7 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB bindingDialog.show(); registered = true; - - ActionBar actionBar = getActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } } diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java index 47bcb41b..eb611995 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java @@ -1,5 +1,6 @@ package com.zeapo.pwdstore.utils; +import android.graphics.Color; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -57,8 +58,29 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/password_rectangle.xml b/app/src/main/res/drawable/password_rectangle.xml new file mode 100644 index 00000000..e1a19127 --- /dev/null +++ b/app/src/main/res/drawable/password_rectangle.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/rectangle.xml b/app/src/main/res/drawable/rectangle.xml index 1f88f6df..27546153 100644 --- a/app/src/main/res/drawable/rectangle.xml +++ b/app/src/main/res/drawable/rectangle.xml @@ -5,20 +5,17 @@ - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml index b7074083..20878286 100644 --- a/app/src/main/res/layout/activity_pwdstore.xml +++ b/app/src/main/res/layout/activity_pwdstore.xml @@ -2,7 +2,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#eee" tools:context=".pwdstore" android:orientation="vertical"> diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml index 3636a20b..ab6f31af 100644 --- a/app/src/main/res/layout/password_row_layout.xml +++ b/app/src/main/res/layout/password_row_layout.xml @@ -3,25 +3,26 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/front" - android:tag="front" android:background="@drawable/rectangle" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:layout_gravity="start|center_vertical"> + + #fde0dc + #f9bdbb + #f69988 + #f36c60 + #e84e40 + #e51c23 + #dd191d + #d01716 + #c41411 + #b0120a + #ff7997 + #ff5177 + #ff2d6f + #e00032 + + #fce4ec + #f8bbd0 + #f48fb1 + #f06292 + #ec407a + #e91e63 + #d81b60 + #c2185b + #ad1457 + #880e4f + #ff80ab + #ff4081 + #f50057 + #c51162 + + #f3e5f5 + #e1bee7 + #ce93d8 + #ba68c8 + #ab47bc + #9c27b0 + #8e24aa + #7b1fa2 + #6a1b9a + #4a148c + #ea80fc + #e040fb + #d500f9 + #aa00ff + + #ede7f6 + #d1c4e9 + #b39ddb + #9575cd + #7e57c2 + #673ab7 + #5e35b1 + #512da8 + #4527a0 + #311b92 + #b388ff + #7c4dff + #651fff + #6200ea + + #e8eaf6 + #c5cae9 + #9fa8da + #7986cb + #5c6bc0 + #3f51b5 + #3949ab + #303f9f + #283593 + #1a237e + #8c9eff + #536dfe + #3d5afe + #304ffe + + #e7e9fd + #d0d9ff + #afbfff + #91a7ff + #738ffe + #5677fc + #4e6cef + #455ede + #3b50ce + #2a36b1 + #a6baff + #6889ff + #4d73ff + #4d69ff + + #e1f5fe + #b3e5fc + #81d4fa + #4fc3f7 + #29b6f6 + #03a9f4 + #039be5 + #0288d1 + #0277bd + #01579b + #80d8ff + #40c4ff + #00b0ff + #0091ea + + #e0f7fa + #b2ebf2 + #80deea + #4dd0e1 + #26c6da + #00bcd4 + #00acc1 + #0097a7 + #00838f + #006064 + #84ffff + #18ffff + #00e5ff + #00b8d4 + + #e0f2f1 + #b2dfdb + #80cbc4 + #4db6ac + #26a69a + #9688 + #00897b + #00796b + #00695c + #004d40 + #a7ffeb + #64ffda + #1de9b6 + #00bfa5 + + #d0f8ce + #a3e9a4 + #72d572 + #42bd41 + #2baf2b + #259b24 + #0a8f08 + #0a7e07 + #056f00 + #0d5302 + #a2f78d + #5af158 + #14e715 + #12c700 + + #f1f8e9 + #dcedc8 + #c5e1a5 + #aed581 + #9ccc65 + #8bc34a + #7cb342 + #689f38 + #558b2f + #33691e + #ccff90 + #b2ff59 + #76ff03 + #64dd17 + + #f9fbe7 + #f0f4c3 + #e6ee9c + #dce775 + #d4e157 + #cddc39 + #c0ca33 + #afb42b + #9e9d24 + #827717 + #f4ff81 + #eeff41 + #c6ff00 + #aeea00 + + #fffde7 + #fff9c4 + #fff59d + #fff176 + #ffee58 + #ffeb3b + #fdd835 + #fbc02d + #f9a825 + #f57f17 + #ffff8d + #ffff00 + #ffea00 + #ffd600 + + #fff8e1 + #ffecb3 + #ffe082 + #ffd54f + #ffca28 + #ffc107 + #ffb300 + #ffa000 + #ff8f00 + #ff6f00 + #ffe57f + #ffd740 + #ffc400 + #ffab00 + + #fff3e0 + #ffe0b2 + #ffcc80 + #ffb74d + #ffa726 + #ff9800 + #fb8c00 + #f57c00 + #ef6c00 + #e65100 + #ffd180 + #ffab40 + #ff9100 + #ff6d00 + + #fbe9e7 + #ffccbc + #ffab91 + #ff8a65 + #ff7043 + #ff5722 + #f4511e + #e64a19 + #d84315 + #bf360c + #ff9e80 + #ff6e40 + #ff3d00 + #dd2c00 + + #efebe9 + #d7ccc8 + #bcaaa4 + #a1887f + #8d6e63 + #795548 + #6d4c41 + #5d4037 + #4e342e + #3e2723 + + #fafafa + #f5f5f5 + #eeeeee + #e0e0e0 + #bdbdbd + #9e9e9e + #757575 + #616161 + #424242 + #212121 + #000000 + #ffffff + + #eceff1 + #cfd8dc + #b0bec5 + #90a4ae + #78909c + #607d8b + #546e7a + #455a64 + #37474f + #263238 + diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml index 46592ab7..830f4848 100644 --- a/app/src/main/res/values/refs.xml +++ b/app/src/main/res/values/refs.xml @@ -8,7 +8,4 @@ For more on layout aliases, see: http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters --> - - @layout/fragment_password_list - \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9b35ed79..f62f8701 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,6 +1,11 @@ - -- cgit v1.2.3