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 14d27635..86411bc5 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 = 1; + private static final int PIN_OFFSET = 2; private static final int TYPE_HEADER = 0; private static final int TYPE_PIN = 1; @@ -92,9 +92,9 @@ public class PinAdapter extends RecyclerView.Adapter im case TYPE_LINK: LinkHolder linkHolder = (LinkHolder) holder; switch (position) { - case 1: - linkHolder.text.setText(R.string.settings_screen); - theme().settingsDrawable.apply(linkHolder.image); + case 0: + linkHolder.text.setText(R.string.history_screen); + theme().historyDrawable.apply(linkHolder.image); break; } break; @@ -123,6 +123,8 @@ public class PinAdapter extends RecyclerView.Adapter im public int getItemViewType(int position) { switch (position) { case 0: + return TYPE_LINK; + case 1: return TYPE_HEADER; default: return TYPE_PIN; @@ -367,5 +369,7 @@ public class PinAdapter extends RecyclerView.Adapter im void onPinRemoved(Pin pin); void onPinLongClocked(Pin pin); + + 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 f4dd30c0..81402177 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 @@ -51,6 +51,7 @@ import java.util.List; import de.greenrobot.event.EventBus; import static org.floens.chan.ui.theme.ThemeHelper.theme; +import static org.floens.chan.utils.AndroidUtils.ROBOTO_MEDIUM; import static org.floens.chan.utils.AndroidUtils.dp; import static org.floens.chan.utils.AndroidUtils.getAttrColor; @@ -86,6 +87,7 @@ public class RootNavigationController extends NavigationController implements Pi settings = (LinearLayout) view.findViewById(R.id.settings); settings.setOnClickListener(this); theme().settingsDrawable.apply((ImageView) settings.findViewById(R.id.image)); + ((TextView) settings.findViewById(R.id.text)).setTypeface(ROBOTO_MEDIUM); toolbar.setBackgroundColor(ThemeHelper.getInstance().getTheme().primaryColor.color); @@ -249,6 +251,10 @@ public class RootNavigationController extends NavigationController implements Pi dialog.show(); } + @Override + public void openHistory() { + } + public void onEvent(WatchManager.PinAddedMessage message) { pinAdapter.onPinAdded(message.pin); drawerLayout.openDrawer(drawer); 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 d3f969f5..b896bcc5 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 @@ -16,5 +16,6 @@ public class DarkTheme extends Theme { clearDrawable = new ThemeDrawable(R.drawable.ic_clear_white_24dp, 1f); 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); } } 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 18b6fd48..589d60b2 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 @@ -61,6 +61,7 @@ public class Theme { public ThemeDrawable clearDrawable; public ThemeDrawable backDrawable; public ThemeDrawable doneDrawable; + public ThemeDrawable historyDrawable; public Theme(String displayName, String name, int resValue, ThemeHelper.PrimaryColor primaryColor) { this.displayName = displayName; @@ -79,6 +80,7 @@ public class Theme { clearDrawable = new ThemeDrawable(R.drawable.ic_clear_black_24dp, 0.54f); 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); } private void resolveSpanColors() { diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png new file mode 100644 index 00000000..b74e2899 Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png new file mode 100644 index 00000000..703d30b9 Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png new file mode 100644 index 00000000..e77a077a Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png new file mode 100644 index 00000000..b3000d31 Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_history_black_24dp.png new file mode 100644 index 00000000..8e44d94f Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_history_black_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png new file mode 100644 index 00000000..e188d4a3 Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png new file mode 100644 index 00000000..18519ee5 Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png new file mode 100644 index 00000000..f44df1af Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png new file mode 100644 index 00000000..8a198153 Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png differ diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png new file mode 100644 index 00000000..5b96af5b Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png differ diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 04967270..edeefaf4 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -180,6 +180,8 @@ along with this program. If not, see . %1$d new posts, %2$d quoting you + History + Settings General Boards