Mensa Bild angepasst & links auf dem Dashboard hinzugefügt

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/Dashboard.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/Dashboard.java
index f7413c813a944c820f666780a745d5ce7c6160ca..8034015e240da3295eb0dfd695db8d9f45798680 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/Dashboard.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/Dashboard.java
@@ -76,6 +76,22 @@ public class Dashboard extends CampusAppFragment {
             }
         });
 
+        image = (ImageView)view.findViewById(R.id.news_dhbw_image);
+        image.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AppContext.getNavigationManager().navigatePage("News");
+            }
+        });
+
+        image = (ImageView)view.findViewById(R.id.news_stuv_image);
+        image.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AppContext.getNavigationManager().navigatePage("News");
+            }
+        });
+
         return view;
     }
 }

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java
index 5a9c41ba137db3b5d245172647a21ed46e5d4011..fdfea3d8b63bdb9cc13bb07ef49e0100e168a614 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java
@@ -36,6 +36,14 @@ public class DashboardMensa extends CampusAppFragment {
                              Bundle savedInstanceState) {
         view = inflater.inflate(R.layout.fragment_dashboard_mensa, container, false);
         refreshMensaMenue();
+
+        LinearLayout linearcontainer = (LinearLayout)view.findViewById(R.id.menuList);
+        linearcontainer.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AppContext.getNavigationManager().navigatePage("Mensa");
+            }
+        });
         return view;
     }
 

diff --git a/app/src/main/res/drawable-nodpi/dhbw_mensa.jpg b/app/src/main/res/drawable-nodpi/dhbw_mensa.jpg
new file mode 100644 (file)
index 0000000..ef2baab
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/dhbw_mensa.jpg differ

diff --git a/app/src/main/res/drawable/dhbw_mensa.jpg b/app/src/main/res/drawable/dhbw_mensa.jpg
deleted file mode 100644 (file)
index 4d04fc4..0000000
Binary files a/app/src/main/res/drawable/dhbw_mensa.jpg and /dev/null differ

diff --git a/app/src/main/res/layout-land/fragment_dashboard.xml b/app/src/main/res/layout-land/fragment_dashboard.xml
index b23f1ea4298c42c1f63cf0cdaa5d45b17a01ae17..01b1dd05c3c2d6c020f0bfcc5f11a9ea721c497e 100644 (file)
--- a/app/src/main/res/layout-land/fragment_dashboard.xml
+++ b/app/src/main/res/layout-land/fragment_dashboard.xml
@@ -128,7 +128,7 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="60dp"
-                    android:id="@+id/imageView6"
+                    android:id="@+id/news_dhbw_image"
                     android:layout_alignParentTop="true"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
@@ -140,7 +140,7 @@
                     android:layout_height="fill_parent"
                     android:name="de.dhbwloe.campusapp.fragments.DashboardNewsDhbw"
                     android:id="@+id/fragment_dhbw"
-                    android:layout_below="@+id/imageView6"
+                    android:layout_below="@+id/news_dhbw_image"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true" />
 
@@ -161,7 +161,7 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="60dp"
-                    android:id="@+id/imageView7"
+                    android:id="@+id/news_stuv_image"
                     android:layout_alignParentTop="true"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
@@ -173,7 +173,7 @@
                     android:layout_height="fill_parent"
                     android:name="de.dhbwloe.campusapp.fragments.DashboardNewsStuv"
                     android:id="@+id/fragment_stuv"
-                    android:layout_below="@+id/imageView7"
+                    android:layout_below="@+id/news_stuv_image"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true" />
 

diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 72e8d87425ac88964c4c0494b437c35dab47098f..7947741f88bf28f9df8d2344464d08605bd710e2 100644 (file)
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -35,7 +35,7 @@
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:src="@drawable/header_kalender"
-                        android:scaleType="fitXY" />
+                        android:scaleType="centerCrop" />
 
                     <TextView
                         android:id="@+id/title"
@@ -74,13 +74,13 @@
 
                     <ImageView
                         android:layout_width="fill_parent"
-                        android:layout_height="70dp"
+                        android:layout_height="80dp"
                         android:id="@+id/mensa_image"
                         android:layout_alignParentTop="true"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:src="@drawable/platzhalter"
-                        android:scaleType="fitXY" />
+                        android:src="@drawable/dhbw_mensa"
+                        android:scaleType="centerCrop" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -126,19 +126,20 @@
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="60dp"
-                            android:id="@+id/imageView6"
+                            android:id="@+id/news_dhbw_image"
                             android:layout_alignParentTop="true"
                             android:layout_alignParentLeft="true"
                             android:layout_alignParentStart="true"
                             android:src="@drawable/header_dhbw"
-                            android:scaleType="fitCenter" />
+                            android:scaleType="fitCenter"
+                            android:background="#ffffff" />
 
                         <fragment
                             android:layout_width="match_parent"
                             android:layout_height="fill_parent"
                             android:name="de.dhbwloe.campusapp.fragments.DashboardNewsDhbw"
                             android:id="@+id/fragment_dhbw"
-                            android:layout_below="@+id/imageView6"
+                            android:layout_below="@+id/news_dhbw_image"
                             android:layout_alignParentLeft="true"
                             android:layout_alignParentStart="true"
                             tools:layout="@layout/fragment_dashboard_news_entry" />
@@ -161,19 +162,20 @@
                         <ImageView
                             android:layout_width="wrap_content"
                             android:layout_height="60dp"
-                            android:id="@+id/imageView7"
+                            android:id="@+id/news_stuv_image"
                             android:layout_alignParentTop="true"
                             android:layout_alignParentLeft="true"
                             android:layout_alignParentStart="true"
                             android:src="@drawable/header_stuv"
-                            android:scaleType="fitCenter" />
+                            android:scaleType="fitCenter"
+                            android:background="#ffffff" />
 
                         <fragment
                             android:layout_width="match_parent"
                             android:layout_height="fill_parent"
                             android:name="de.dhbwloe.campusapp.fragments.DashboardNewsStuv"
                             android:id="@+id/fragment_stuv"
-                            android:layout_below="@+id/imageView7"
+                            android:layout_below="@+id/news_stuv_image"
                             android:layout_alignParentLeft="true"
                             android:layout_alignParentStart="true"
                             tools:layout="@layout/fragment_dashboard_news_none" />

diff --git a/app/src/main/res/layout/fragment_mensa.xml b/app/src/main/res/layout/fragment_mensa.xml
index 310a1a6a5979a6b9410099589c07fc306f82edea..0563194465fb7f1f9df0cdd3da55c9e8a04faa33 100644 (file)
--- a/app/src/main/res/layout/fragment_mensa.xml
+++ b/app/src/main/res/layout/fragment_mensa.xml
@@ -9,7 +9,7 @@
         android:layout_height="100dp"
         android:id="@+id/imageView8"
         android:src="@drawable/dhbw_mensa"
-        android:scaleType="center"
+        android:scaleType="centerCrop"
         android:background="#000000" />
 
     <android.support.design.widget.AppBarLayout