From b7cf234db619c8298229f8ce6f146c2914cfee14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= Date: Tue, 2 Apr 2019 15:47:07 +0200 Subject: [PATCH] Add smaller view mode Closes #39 --- .../com/beemdevelopment/aegis/ViewMode.java | 10 +- .../aegis/ui/views/EntryAdapter.java | 4 +- app/src/main/res/layout/card_entry_small.xml | 131 ++++++++++++++++++ 3 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/layout/card_entry_small.xml diff --git a/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java b/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java index 9ba2880d..44d1c6f4 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java @@ -2,7 +2,8 @@ package com.beemdevelopment.aegis; public enum ViewMode { NORMAL, - COMPACT; + COMPACT, + SMALL; public static ViewMode fromInteger(int x) { switch(x) { @@ -10,6 +11,8 @@ public enum ViewMode { return NORMAL; case 1: return COMPACT; + case 2: + return SMALL; } return null; } @@ -20,6 +23,8 @@ public enum ViewMode { return "Normal"; case 1: return "Compact"; + case 2: + return "Small"; } return null; } @@ -27,7 +32,8 @@ public enum ViewMode { public static String[] getViewModeNames() { return new String[] { "Normal", - "Compact" + "Compact", + "Small" }; } } diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java index e5d80eaa..2ed9b493 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java @@ -209,11 +209,13 @@ public class EntryAdapter extends RecyclerView.Adapter implements I @Override public EntryHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry_compact, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry, parent, false); if (_viewMode == ViewMode.NORMAL) { view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry, parent, false); } else if (_viewMode == ViewMode.COMPACT) { view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry_compact, parent, false); + } else if (_viewMode == ViewMode.SMALL) { + view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry_small, parent, false); } return new EntryHolder(view); diff --git a/app/src/main/res/layout/card_entry_small.xml b/app/src/main/res/layout/card_entry_small.xml new file mode 100644 index 00000000..482f42c0 --- /dev/null +++ b/app/src/main/res/layout/card_entry_small.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +