sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Module Detail Overview Implementation #2

Browse Source
This commit is contained in:
Caesar2011
2018-06-06 14:45:43 +02:00
parent 0f6de85bcb
commit 3b0eb28b1e
37 changed files with 457 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/layout/fragment_login.xml
View File

@@ -17,7 +17,8 @@
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_marginBottom="24dp"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:contentDescription="@string/cd_ic_launcher"/>
<!-- Email Label -->
<android.support.design.widget.TextInputLayout
@@ -29,7 +30,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:hint="Username" />
android:hint="@string/username" />
</android.support.design.widget.TextInputLayout>
<!-- Password Label -->
@@ -42,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:hint="Password"/>
android:hint="@string/password"/>
</android.support.design.widget.TextInputLayout>
<android.support.v7.widget.AppCompatButton
@@ -52,7 +53,7 @@
android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:padding="12dp"
android:text="Login"/>
android:text="@string/log_in"/>
</LinearLayout>

2
app/src/main/res/layout/fragment_mod_detail_announce.xml
View File

@@ -9,6 +9,6 @@
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="Announcement fragment" />
android:text="@string/lorem_ipsum_100" />
</FrameLayout>

3
app/src/main/res/layout/fragment_startup.xml
View File

@@ -10,6 +10,7 @@
android:layout_width="@android:dimen/thumbnail_width"
android:layout_height="@android:dimen/thumbnail_height"
android:layout_gravity="center"
android:src="@mipmap/ic_launcher" />
android:src="@mipmap/ic_launcher"
android:contentDescription="@string/cd_ic_launcher"/>
</FrameLayout>

7
app/src/main/res/layout/list_all_caption.xml
View File

@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/caption"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin"
android:text="Caption"
tools:text="Caption"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline" />
</LinearLayout>

19
app/src/main/res/layout/list_all_show_more.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin"
android:text="@string/show_all"
android:textStyle="bold"
android:typeface="sans"
android:gravity="center"
android:textColor="@color/colorFUSecondary"
/>
</LinearLayout>

12
app/src/main/res/layout/list_moddetails_announcements.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dip" >
@@ -15,21 +15,21 @@
tools:text="Test this new stuff!" />
<TextView
android:id="@+id/publisher"
android:id="@+id/sub_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_marginTop="5dip"
android:textColor="#343434"
android:textSize="12sp"
tools:text="Peter Müller" />
tools:text="Peter Bauer" />
<TextView
android:id="@+id/date"
android:id="@+id/sub_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/publisher"
android:layout_alignBottom="@+id/publisher"
android:layout_alignBaseline="@id/sub_left"
android:layout_alignBottom="@id/sub_left"
android:textColor="#343434"
android:textSize="12sp"
android:layout_alignParentEnd="true"

33
app/src/main/res/layout/list_moddetails_description.xml
View File

@@ -1,14 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<!-- sample xml -->
<com.ms.square.android.expandabletextview.ExpandableTextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:expandableTextView="http://schemas.android.com/apk/res-auto"
android:id="@+id/expand_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
expandableTextView:maxCollapsedLines="4"
expandableTextView:animDuration="200">
<TextView
android:id="@id/expandable_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:textSize="16sp"
android:textColor="#666666" />
<ImageButton
android:id="@id/expand_collapse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:layout_gravity="end|bottom"
android:background="@android:color/transparent"
android:contentDescription="@string/description" />
</com.ms.square.android.expandabletextview.ExpandableTextView>
<!--<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin"
android:text="@string/lorem_ipsum_100"
android:textAppearance="?attr/textAppearanceListItem" />
android:textAppearance="?attr/textAppearanceListItem" />-->
</LinearLayout>

8
app/src/main/res/layout/nav_header_main.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
android:background="@drawable/side_nav_bar"
@@ -17,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.AppCompat.Button.Colored"
android:text="Login"
android:text="@string/log_in"
android:visibility="gone" />
@@ -27,14 +28,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@mipmap/ic_launcher"
android:visibility="gone" />
android:visibility="gone"
android:contentDescription="@string/cd_ic_launcher"/>
<TextView
android:id="@+id/login_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="Android Studio"
tools:text="Android Studio"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" />
</LinearLayout>

29
app/src/main/res/layout/nav_header_main_login.xml
View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
android:background="@drawable/side_nav_bar"
android:gravity="bottom"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@mipmap/ic_launcher" />
<TextView
android:id="@+id/login_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="Android Studio"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
</LinearLayout>

6
app/src/main/res/menu/activity_main_drawer.xml
View File

@@ -5,15 +5,15 @@
<item
android:id="@+id/nav_dining"
android:icon="@drawable/ic_local_dining"
android:title="Mensaplan" />
android:title="@string/canteen_plan" />
</group>
<item android:title="Optionen">
<item android:title="@string/options">
<menu>
<item
android:id="@+id/nav_share"
android:icon="@drawable/ic_menu_share"
android:title="Teilen"/>
android:title="@string/share"/>
</menu>
</item>

14
app/src/main/res/menu/activity_main_drawer_login.xml
View File

@@ -5,37 +5,37 @@
<item
android:id="@+id/nav_schedule"
android:icon="@drawable/ic_event"
android:title="Stundenplan"
android:title="@string/schedule"
android:orderInCategory="10"/>
<item
android:id="@+id/nav_modules"
android:icon="@drawable/ic_apps"
android:title="Module"
android:title="@string/events"
android:orderInCategory="100" />
<item
android:id="@+id/nav_dining"
android:icon="@drawable/ic_local_dining"
android:title="Mensaplan"
android:title="@string/canteen_plan"
android:orderInCategory="200"/>
<item
android:id="@+id/nav_settings"
android:icon="@drawable/ic_settings"
android:title="Einstellungen"
android:title="@string/settings"
android:orderInCategory="300"/>
</group>
<item android:title="Optionen"
<item android:title="@string/options"
android:orderInCategory="499">
<menu>
<item
android:id="@+id/nav_logout"
android:icon="@drawable/ic_exit_to_app"
android:title="Logout"
android:title="@string/log_out"
android:orderInCategory="500"/>
<item
android:id="@+id/nav_share"
android:icon="@drawable/ic_menu_share"
android:title="Teilen"
android:title="@string/share"
android:orderInCategory="600"/>
</menu>
</item>

13
app/src/main/res/values/strings.xml
View File

@@ -7,10 +7,21 @@
<string name="action_settings">Settings</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="overview">Overview</string>
<string name="announcements">Announcements</string>
<string name="lorem_ipsum_100">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</string>
<string name="description">Description</string>
<string name="announcements_count">Announcements (%1$d)</string>
<string name="cd_ic_launcher">App Icon</string>
<string name="schedule">Schedule</string>
<string name="events">Events</string>
<string name="canteen_plan">Canteen Plan</string>
<string name="settings">Settings</string>
<string name="options">Options</string>
<string name="log_out">Log out</string>
<string name="share">Share</string>
<string name="log_in">Log in</string>
<string name="username">Username</string>
<string name="password">Password</string>
<string name="show_all">Show All</string>
</resources>