From 3cd65351543ab6190600d7f249686c1cb2efdf3e Mon Sep 17 00:00:00 2001 From: Floens Date: Wed, 24 Jun 2015 00:31:39 +0200 Subject: [PATCH] Add link to the board editor in the drawer --- .../floens/chan/ui/adapter/PinAdapter.java | 19 ++++++++++++++++-- .../controller/RootNavigationController.java | 5 +++++ .../org/floens/chan/ui/theme/DarkTheme.java | 1 + .../java/org/floens/chan/ui/theme/Theme.java | 2 ++ .../ic_playlist_add_black_24dp.png | Bin 0 -> 106 bytes .../ic_playlist_add_white_24dp.png | Bin 0 -> 107 bytes .../ic_playlist_add_black_24dp.png | Bin 0 -> 100 bytes .../ic_playlist_add_white_24dp.png | Bin 0 -> 101 bytes .../ic_playlist_add_black_24dp.png | Bin 0 -> 113 bytes .../ic_playlist_add_white_24dp.png | Bin 0 -> 109 bytes .../ic_playlist_add_black_24dp.png | Bin 0 -> 129 bytes .../ic_playlist_add_white_24dp.png | Bin 0 -> 113 bytes .../ic_playlist_add_black_24dp.png | Bin 0 -> 128 bytes .../ic_playlist_add_white_24dp.png | Bin 0 -> 111 bytes 14 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_playlist_add_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_playlist_add_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_playlist_add_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_playlist_add_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_playlist_add_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_playlist_add_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_playlist_add_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_playlist_add_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_white_24dp.png diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java index 86411bc5..f895fb42 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java @@ -44,7 +44,7 @@ import static org.floens.chan.utils.AndroidUtils.setRoundItemBackground; import static org.floens.chan.utils.AndroidUtils.sp; public class PinAdapter extends RecyclerView.Adapter implements SwipeListener.Callback { - private static final int PIN_OFFSET = 2; + private static final int PIN_OFFSET = 3; private static final int TYPE_HEADER = 0; private static final int TYPE_PIN = 1; @@ -93,6 +93,10 @@ public class PinAdapter extends RecyclerView.Adapter im LinkHolder linkHolder = (LinkHolder) holder; switch (position) { case 0: + linkHolder.text.setText(R.string.settings_board_edit); + theme().listAddDrawable.apply(linkHolder.image); + break; + case 1: linkHolder.text.setText(R.string.history_screen); theme().historyDrawable.apply(linkHolder.image); break; @@ -123,8 +127,9 @@ public class PinAdapter extends RecyclerView.Adapter im public int getItemViewType(int position) { switch (position) { case 0: - return TYPE_LINK; case 1: + return TYPE_LINK; + case 2: return TYPE_HEADER; default: return TYPE_PIN; @@ -331,6 +336,14 @@ public class PinAdapter extends RecyclerView.Adapter im itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + switch (getAdapterPosition()) { + case 0: + callback.openBoardEditor(); + break; + case 1: + callback.openHistory(); + break; + } } }); } @@ -370,6 +383,8 @@ public class PinAdapter extends RecyclerView.Adapter im void onPinLongClocked(Pin pin); + void openBoardEditor(); + void openHistory(); } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/RootNavigationController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/RootNavigationController.java index 81402177..f694b241 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/RootNavigationController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/RootNavigationController.java @@ -251,6 +251,11 @@ public class RootNavigationController extends NavigationController implements Pi dialog.show(); } + @Override + public void openBoardEditor() { + pushController(new BoardEditController(context)); + } + @Override public void openHistory() { } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java index b896bcc5..9598cfcd 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java @@ -17,5 +17,6 @@ public class DarkTheme extends Theme { backDrawable = new ThemeDrawable(R.drawable.ic_arrow_back_white_24dp, 1f); doneDrawable = new ThemeDrawable(R.drawable.ic_done_white_24dp, 1f); historyDrawable = new ThemeDrawable(R.drawable.ic_history_white_24dp, 1f); + listAddDrawable = new ThemeDrawable(R.drawable.ic_playlist_add_white_24dp, 1f); } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java index 589d60b2..ffc4eb3a 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java @@ -62,6 +62,7 @@ public class Theme { public ThemeDrawable backDrawable; public ThemeDrawable doneDrawable; public ThemeDrawable historyDrawable; + public ThemeDrawable listAddDrawable; public Theme(String displayName, String name, int resValue, ThemeHelper.PrimaryColor primaryColor) { this.displayName = displayName; @@ -81,6 +82,7 @@ public class Theme { backDrawable = new ThemeDrawable(R.drawable.ic_arrow_back_black_24dp, 0.54f); doneDrawable = new ThemeDrawable(R.drawable.ic_done_black_24dp, 0.54f); historyDrawable = new ThemeDrawable(R.drawable.ic_history_black_24dp, 0.54f); + listAddDrawable = new ThemeDrawable(R.drawable.ic_playlist_add_black_24dp, 0.54f); } private void resolveSpanColors() { diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_playlist_add_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_playlist_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..731b42590633cb2654a0c553b297f87e209cdf09 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;p{I*uNCjiEL{EZ9Pt*UFhZjsT zOs)xNu`hI-(x8|nu(04DJNtY`XSHi?yi#HbA`A=@6CWrnHJ!i))Xd=N>gTe~DWM4f D-jN$L literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_playlist_add_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_playlist_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4fb76e1784aa8d42add6d5dcfc91c304c6c201d8 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>`VBp6OsFEs^HOeH~n!3+##lh0a!q&!_5Ln;`P z75Gp5|KI5IDCjdoD+{AZ(7*YA|FfkCDfxA%@G#8Nlb=@fz2!d06i-(_mvv4FO#njp B9#a4S literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_playlist_add_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_playlist_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d7a7514a84072ca393b32a30aa1427ab8ed37bb5 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1ZBG}+kP60R1*x8<|2Gs*O0lh! xcQDy0#lie4^T0b1ACG-(r~W$B^B(45U@*U(JU7SI#s;X3!PC{xWt~$(69A%_8>#>R literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_playlist_add_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_playlist_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..73c981285837f550453b25eda148c90f1b1c7a47 GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^5+KY7Bp6QcFoXgrrjj7PUx9{KW6@ll{Pre}Cj9mdKI;Vst09JY%g#Z8m literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_playlist_add_black_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_playlist_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..dc4ebe9f39a7bc76959e00f975a36880980654b4 GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}t3r`ovkP61PmoIWMC3FG+?2Zo5J^ZOdkg}ZJ7n!(`d L>gTe~DWM4fRg5BO literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_playlist_add_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_playlist_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..52ccba0b2f500aab5cc7f89184de089425638fe7 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PUsElAj0bSzCLqp zSfb;PGdFyqYu2$dFl?Bu>@h(h;YxhjeQqHY4ONc`3m)8bpKNFb6tz|X5{^wQf7uz> YgL@iQo&P4j3uq>Tr>mdKI;Vst06PUJ-T(jq literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_playlist_add_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_playlist_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3f652366df1d17852a763aa0634361a066ac41da GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJd0L(>jv*C{ z$r4=+KkWr%6#89v?yWzOaFF4p&I--?AC7Dj&pFL-3cuFC$iUQ8>8mdK II;Vst04|sy&Hw-a literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..46020a7e04f2cd8f9945abd5eb75e7917c2e22d4 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0R?HmZtAK52P4Ng8YIR z9G=}s19CJxT^vIy7?Tx*dz$_yI3)A^{rh?TG#Qo!w(Lo&92cfFZzy?D+$PV!;Kh90 TQvZJM5s*Qiu6{1-oD!MT$m`Z~Df*BafCZDwc@-#eM978G? zlNE$}n*Jv^B=i0K`+5E}8I}dM>`AH|7p66DD0xxbCeOg&#eCdS|9