X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Ffragment_dashboard.xml;h=72e8d87425ac88964c4c0494b437c35dab47098f;hb=e12b133e98da88043c66047a6c1334fa92dcbbf6;hp=4f0d324fcf71afc7eaa671bef418faac40ecd5ab;hpb=9a28e7b4c1520f629721693a04b4978fec9692e7;p=DHBWCampusApp.git

diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 4f0d324..72e8d87 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -7,171 +7,181 @@
     android:orientation="vertical">
 
     <!-- TODO: Update blank fragment layout -->
-
-    <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/card_timetable"
-        android:layout_width="match_parent"
-        android:layout_height="180dp"
-        android:layout_margin="8dp"
-        card_view:cardCornerRadius="5dp">
-
-        <RelativeLayout
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:id="@+id/scrollView5" >
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="70dp"
-                android:id="@+id/imageView4"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:src="@drawable/header_kalender"
-                android:scaleType="fitXY" />
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="3"
-                android:padding="8dp"
-                android:text="@string/dashboard_calendar_title"
-                android:textColor="#222"
-                android:textStyle="bold"
-                android:textSize="22dp" />
-
-            <fragment
-                android:layout_width="match_parent"
-                android:layout_height="fill_parent"
-                android:name="de.dhbwloe.campusapp.fragments.DashboardVorlesungsplan"
-                android:layout_below="@+id/imageView4"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:id="@+id/fragment_timetable"
-                tools:layout="@layout/fragment_dashboard_timetable" />
-
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-
-    <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/card_mensa"
-        android:layout_width="match_parent"
-        android:layout_height="180dp"
-        android:layout_margin="8dp"
-        card_view:cardCornerRadius="5dp">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="70dp"
-                android:id="@+id/imageView5"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:src="@drawable/platzhalter"
-                android:scaleType="fitXY" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="3"
-                android:padding="8dp"
-                android:text="@string/dashboard_mensa_title"
-                android:textColor="#222"
-                android:textStyle="bold"
-                android:textSize="22dp"
-                android:id="@+id/textView15" />
-
-            <fragment
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                android:id="@+id/card_timetable"
                 android:layout_width="match_parent"
-                android:layout_height="fill_parent"
-                android:name="de.dhbwloe.campusapp.fragments.DashboardMensa"
-                android:id="@+id/fragment_mensa"
-                android:layout_below="@+id/imageView5"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                tools:layout="@layout/fragment_dashboard_mensa_menu" />
-
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/card_view2"
-            android:layout_width="wrap_content"
-            android:layout_height="140dp"
-            android:layout_margin="8dp"
-            android:layout_weight="1"
-            card_view:cardCornerRadius="5dp">
-
-            <RelativeLayout
+                android:layout_height="180dp"
+                android:layout_margin="8dp"
+                card_view:cardCornerRadius="5dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <ImageView
+                        android:layout_width="fill_parent"
+                        android:layout_height="70dp"
+                        android:id="@+id/timetable_image"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:src="@drawable/header_kalender"
+                        android:scaleType="fitXY" />
+
+                    <TextView
+                        android:id="@+id/title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="3"
+                        android:padding="8dp"
+                        android:text="@string/dashboard_calendar_title"
+                        android:textColor="#222"
+                        android:textStyle="bold"
+                        android:textSize="22dp" />
+
+                    <fragment
+                        android:layout_width="match_parent"
+                        android:layout_height="fill_parent"
+                        android:name="de.dhbwloe.campusapp.fragments.DashboardVorlesungsplan"
+                        android:layout_below="@+id/timetable_image"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:id="@+id/fragment_timetable"
+                        tools:layout="@layout/fragment_dashboard_timetable" />
+
+                </RelativeLayout>
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                android:id="@+id/card_mensa"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="220dp"
+                android:layout_margin="8dp"
+                card_view:cardCornerRadius="5dp">
 
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="60dp"
-                    android:id="@+id/imageView6"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:src="@drawable/header_dhbw"
-                    android:scaleType="fitCenter" />
-
-                <fragment
+                <RelativeLayout
                     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_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    tools:layout="@layout/fragment_dashboard_news_dhbw" />
-
-            </RelativeLayout>
-        </android.support.v7.widget.CardView>
-
-        <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/card_view3"
-            android:layout_width="wrap_content"
-            android:layout_height="140dp"
-            android:layout_margin="8dp"
-            android:layout_weight="1"
-            card_view:cardCornerRadius="5dp">
-
-            <RelativeLayout
+                    android:layout_height="match_parent">
+
+                    <ImageView
+                        android:layout_width="fill_parent"
+                        android:layout_height="70dp"
+                        android:id="@+id/mensa_image"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:src="@drawable/platzhalter"
+                        android:scaleType="fitXY" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="3"
+                        android:padding="8dp"
+                        android:text="@string/dashboard_mensa_title"
+                        android:textColor="#222"
+                        android:textStyle="bold"
+                        android:textSize="22dp"
+                        android:id="@+id/textView15" />
+
+                    <fragment
+                        android:layout_width="match_parent"
+                        android:layout_height="fill_parent"
+                        android:name="de.dhbwloe.campusapp.fragments.DashboardMensa"
+                        android:id="@+id/fragment_mensa"
+                        android:layout_below="@+id/mensa_image"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        tools:layout="@layout/fragment_dashboard_mensa_menu" />
+
+                </RelativeLayout>
+            </android.support.v7.widget.CardView>
+
+            <LinearLayout
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content">
 
-                <ImageView
+                <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/card_view2"
                     android:layout_width="wrap_content"
-                    android:layout_height="60dp"
-                    android:id="@+id/imageView7"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:src="@drawable/header_stuv"
-                    android:scaleType="fitCenter" />
-
-                <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_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    tools:layout="@layout/fragment_dashboard_news_stuv" />
-
-            </RelativeLayout>
-        </android.support.v7.widget.CardView>
-
-    </LinearLayout>
+                    android:layout_height="140dp"
+                    android:layout_margin="8dp"
+                    android:layout_weight="1"
+                    card_view:cardCornerRadius="5dp">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="60dp"
+                            android:id="@+id/imageView6"
+                            android:layout_alignParentTop="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_alignParentStart="true"
+                            android:src="@drawable/header_dhbw"
+                            android:scaleType="fitCenter" />
+
+                        <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_alignParentLeft="true"
+                            android:layout_alignParentStart="true"
+                            tools:layout="@layout/fragment_dashboard_news_entry" />
+
+                    </RelativeLayout>
+                </android.support.v7.widget.CardView>
+
+                <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/card_view3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="140dp"
+                    android:layout_margin="8dp"
+                    android:layout_weight="1"
+                    card_view:cardCornerRadius="5dp">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="60dp"
+                            android:id="@+id/imageView7"
+                            android:layout_alignParentTop="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_alignParentStart="true"
+                            android:src="@drawable/header_stuv"
+                            android:scaleType="fitCenter" />
+
+                        <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_alignParentLeft="true"
+                            android:layout_alignParentStart="true"
+                            tools:layout="@layout/fragment_dashboard_news_none" />
+
+                    </RelativeLayout>
+                </android.support.v7.widget.CardView>
+
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>