From d62256f1db859eca0f1213db3378c94caa19cc6b Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Sun, 18 Nov 2018 14:55:03 +0100
Subject: [PATCH] Implemented Shortcuts

---
 .../java/de/sebse/fuplanner/MainActivity.java |   2 +-
 .../moddetails/ModDetailOverviewAdapter.java  |  17 ++++++++
 .../tools/ui/ShortcutViewHolder.java          |  17 ++++++++
 .../ui/treeview/DirectoryNodeBinder.java      |   2 +-
 .../ic_keyboard_arrow_right_black_18dp.png    | Bin 156 -> 0 bytes
 .../ic_keyboard_arrow_right_black_18dp.png    | Bin 128 -> 0 bytes
 .../ic_keyboard_arrow_right_black_18dp.png    | Bin 168 -> 0 bytes
 .../ic_keyboard_arrow_right_black_18dp.png    | Bin 199 -> 0 bytes
 .../ic_keyboard_arrow_right_black_18dp.png    | Bin 258 -> 0 bytes
 .../res/drawable/ic_keyboard_arrow_right.xml  |   4 ++
 app/src/main/res/layout/item_dir.xml          |   2 +-
 .../res/layout/list_moddetails_shortcuts.xml  |  40 ++++++++++++++++++
 12 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/de/sebse/fuplanner/tools/ui/ShortcutViewHolder.java
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_18dp.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_keyboard_arrow_right_black_18dp.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_right_black_18dp.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_black_18dp.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_right_black_18dp.png
 create mode 100644 app/src/main/res/drawable/ic_keyboard_arrow_right.xml
 create mode 100644 app/src/main/res/layout/list_moddetails_shortcuts.xml

diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index cdd0e59..2467c20 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -270,7 +270,7 @@ public class MainActivity extends AppCompatActivity
     }
 
     private int getDefaultFragmentAfterLogin() {
-        return FRAGMENT_NEWS;
+        return FRAGMENT_MODULES;
     }
 
     private void toLogoutState() {
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
index 5d8cb79..6b616d4 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
@@ -25,6 +25,7 @@ import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.ui.CustomViewHolder;
 import de.sebse.fuplanner.tools.ui.ItemViewHolder;
 import de.sebse.fuplanner.tools.ui.MailViewHolder;
+import de.sebse.fuplanner.tools.ui.ShortcutViewHolder;
 import de.sebse.fuplanner.tools.ui.StringViewHolder;
 
 class ModDetailOverviewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -35,6 +36,7 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private static final int TYPE_ITEM = 2;
     private static final int TYPE_SHOW_MORE = 3;
     private static final int TYPE_MAIL = 4;
+    private static final int TYPE_SHORTCUTS = 5;
 
     @Nullable private final ModDetailListener mListener;
 
@@ -57,6 +59,7 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         mPositionalData.clear();
         mPositionalData.add(new Pair<>(TYPE_HEADER, ModulePart.DESCRIPTION));
         mPositionalData.add(new Pair<>(TYPE_DESCRIPTION, null));
+        mPositionalData.add(new Pair<>(TYPE_SHORTCUTS, null));
         mPositionalData.add(new Pair<>(TYPE_HEADER, ModulePart.LECTURERS));
         for (int i = 0; i < mValue.lecturer.size(); i++) {
             mPositionalData.add(new Pair<>(TYPE_MAIL, ModulePart.LECTURERS+1024*i));
@@ -103,6 +106,10 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 view = LayoutInflater.from(parent.getContext())
                         .inflate(R.layout.list_all_mails, parent, false);
                 return new MailViewHolder(view);
+            case TYPE_SHORTCUTS:
+                view = LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.list_moddetails_shortcuts, parent, false);
+                return new ShortcutViewHolder(view);
             default:
                 //noinspection ConstantConditions
                 return null;
@@ -218,6 +225,16 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                         });
                         break;
                 }
+                break;
+            case TYPE_SHORTCUTS:
+                ShortcutViewHolder s = (ShortcutViewHolder) holder;
+                s.mLeft.setOnClickListener(view -> {
+                    if (mListener != null) mListener.gotoFragmentPart(ModulePart.RESOURCES, -1);
+                });
+                s.mRight.setOnClickListener(view -> {
+                    if (mListener != null) mListener.gotoFragmentPart(ModulePart.GRADEBOOK, -1);
+                });
+                break;
             case TYPE_SHOW_MORE:
                 CustomViewHolder c = (CustomViewHolder) holder;
                 c.mView.setOnClickListener(view -> {
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/ShortcutViewHolder.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/ShortcutViewHolder.java
new file mode 100644
index 0000000..01ac8e1
--- /dev/null
+++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/ShortcutViewHolder.java
@@ -0,0 +1,17 @@
+package de.sebse.fuplanner.tools.ui;
+
+import android.view.View;
+import android.widget.TextView;
+
+import de.sebse.fuplanner.R;
+
+public class ShortcutViewHolder extends CustomViewHolder {
+    public final TextView mLeft;
+    public final TextView mRight;
+
+    public ShortcutViewHolder(View view) {
+        super(view);
+        mLeft = view.findViewById(R.id.left);
+        mRight = view.findViewById(R.id.right);
+    }
+}
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DirectoryNodeBinder.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DirectoryNodeBinder.java
index 6257dfa..b086207 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DirectoryNodeBinder.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/DirectoryNodeBinder.java
@@ -20,7 +20,7 @@ public class DirectoryNodeBinder extends TreeViewBinder<DirectoryNodeBinder.View
     @Override
     public void bindView(ViewHolder holder, int position, TreeNode node) {
         holder.ivArrow.setRotation(0);
-        holder.ivArrow.setImageResource(R.drawable.ic_keyboard_arrow_right_black_18dp);
+        holder.ivArrow.setImageResource(R.drawable.ic_keyboard_arrow_right);
         int rotateDegree = node.isExpand() ? 90 : 0;
         holder.ivArrow.setRotation(rotateDegree);
         Resource.Folder dirNode = (Resource.Folder) node.getContent();
diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_18dp.png b/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_18dp.png
deleted file mode 100644
index 10800e09e27c130c4485a0ff0d447bb4d62a41e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|o$(}BbAr-fh6C_v{CulI`DQsKb
z?rP&uBhXRLxY2&Ct}xr9Zihef<HWicKB`tlX;=w}#VuRjn)GGc2GJ}@j`a(dx=!^F
z%VkRX7TC=;*Y%UbpI$k!gAK+4>ld`UE=~~PF=k*`+oJl@VA0kZpmhwMu6{1-oD!M<
D02woW

diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_right_black_18dp.png b/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_right_black_18dp.png
deleted file mode 100644
index 8d9ab0e29dd8ecec55d9d4f1a9e331de36d0d87f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|cTX3`kcwN$2@<SR7|ay(SdzlL
zct0^d`tPu(O{(o_;N=ZWSyEw~ra6|XZ6BCE3M%|#KC;mHzJNdh>!bHmq?ni|E&e&F
bih;pkzQ8ldw*gauMlyK1`njxgN@xNAc^fB*

diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_right_black_18dp.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_right_black_18dp.png
deleted file mode 100644
index 1966d47adf0d209c0a5f2b91a7dc039e43542394..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB@;zM~Ln>~)y?T(>!9k$)q3sHW
zsVg|PYIyT5Vld6&lsGA4<|i!P|EK<wUiB}d>AsyEFLs-5i(<WeE9~~7hE*~}KU4zt
z=CX@sFo@=`h~{WHTz_V6I9FGE#+&?v0}Yj*Zs%*w_}!{vpz6iu?DFNd-;){6(Q_Yk
Rivq1?@O1TaS?83{1OTmgJf8pn

diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_black_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_black_18dp.png
deleted file mode 100644
index 414f2f9830bfecb6f19a481ce279a552b5b5f0a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e?^K2I0NkcwMx&l~bF28y&kTz;%B
zVAj`&j(b{HvJ&mJgx>BrIy*(F#Q9U+K6^{cui;%Po|Be%&N}|>Yw$w7jdo?{nxc=a
z6TO;#=<U6L%!17~82P|po$sBG-0!X!<p@{TIM^o3id=ag_&sNZsffsxC2JQ*Wkn0F
v3~;{7F`doy*xgMF+orirQt`a>zlyP9-}I>ma%SlPUB=+)>gTe~DWM4ft9DQe

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_right_black_18dp.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_right_black_18dp.png
deleted file mode 100644
index 01191c7c36e060f69c47c5a251a6bc0cdb69ce6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Cp}#pLn>~)y>7{MC_tp`V#%$Y
zs_Bn6L>$!gE-;<OH`PwjHQ?lB7lAXDAIi7?+BI7RsE6UedEdi9l5w+JV-KBEvYq|B
zaNSQAtq7YVf-4sYmsJS5FKNoV5xAttcH*O7N=JEJs`M{;s!Yt1?h-K<(#)IFF5tPO
zN=@nLQl-w2XzQGKp%?p7CqGV^Xc1Yb-e>V>k8C=Sn))c`sNnPDwHtaZ9(8<vYmr@e
zWTi;Ds^3@fMHdT`CLYo3RPpmvDO8$xgc0PTe`k2D=kr`if1ec#;(EIJxvX<aXaWEh
Cm1cSX

diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
new file mode 100644
index 0000000..0d7b7e0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
@@ -0,0 +1,4 @@
+<vector android:height="18dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_dir.xml b/app/src/main/res/layout/item_dir.xml
index bc49063..9f4e1be 100644
--- a/app/src/main/res/layout/item_dir.xml
+++ b/app/src/main/res/layout/item_dir.xml
@@ -11,7 +11,7 @@
         android:layout_width="18dp"
         android:layout_height="18dp"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_keyboard_arrow_right_black_18dp"
+        android:src="@drawable/ic_keyboard_arrow_right"
         android:contentDescription="@string/arrow" />
 
     <TextView
diff --git a/app/src/main/res/layout/list_moddetails_shortcuts.xml b/app/src/main/res/layout/list_moddetails_shortcuts.xml
new file mode 100644
index 0000000..09fc399
--- /dev/null
+++ b/app/src/main/res/layout/list_moddetails_shortcuts.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    android:padding="@dimen/text_margin">
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5"/>
+
+    <TextView
+        android:id="@+id/left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/resources"
+        android:textStyle="bold"
+        android:typeface="sans"
+        android:gravity="center"
+        android:textColor="@color/colorFUBlue"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/guideline"
+        />
+
+    <TextView
+        android:id="@+id/right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/gradebook"
+        android:textStyle="bold"
+        android:typeface="sans"
+        android:gravity="center"
+        android:textColor="@color/colorFUBlue"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toRightOf="@id/guideline"
+        />
+</androidx.constraintlayout.widget.ConstraintLayout>