bitPickups/bitPicksAktivpause
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/SecUSo/privacy-friendly-break-reminder

Browse source
This commit is contained in:
Sergej A 2016-08-19 11:16:57 +02:00
commit 686addb774
9 changed files with 114 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable/arrow_black_left.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable/arrow_black_right.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

9
app/src/main/res/drawable/button_normal.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/colorAccent" />
<corners android:radius="6dp" />
</shape>
</item>
</selector>

8
app/src/main/res/drawable/side_nav_bar.xml
View file

@ -1,9 +1,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="135"
android:centerColor="#0274B2"
android:endColor="#024265"
android:startColor="#8aa5ce"
android:angle="90"
android:centerColor="@color/middlegrey"
android:endColor="@color/middlegrey"
android:startColor="@color/middlegrey"
android:type="linear" />
</shape>

60
app/src/main/res/layout/activity_break_reminder.xml
View file

@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout 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"
@ -24,3 +29,58 @@
app:menu="@menu/activity_break_reminder_drawer" />
</android.support.v4.widget.DrawerLayout>
-->
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
android:layout_height="match_parent"
android:layout_width="match_parent">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<android.support.v4.widget.DrawerLayout
android:id="@+id/drawer_layout"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:fitsSystemWindows="true"
tools:openDrawer="start">
<include layout="@layout/content_break_reminder" />
<android.support.design.widget.NavigationView
android:id="@+id/nav_view"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="@color/white"
app:headerLayout="@layout/nav_header_break_reminder"
app:menu="@menu/activity_break_reminder_drawer"/>
</android.support.v4.widget.DrawerLayout>
</android.support.design.widget.CoordinatorLayout>

6
app/src/main/res/layout/app_bar_break_reminder.xml
View file

@ -17,10 +17,14 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
app:popupTheme="@style/AppTheme.PopupOverlay">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_break_reminder" />

30
app/src/main/res/layout/content_break_reminder.xml
View file

@ -9,6 +9,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="@color/middleblue"
tools:context="orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder.BreakReminder"
tools:showIn="@layout/app_bar_break_reminder">
@ -26,15 +27,18 @@
android:popupBackground="@drawable/side_nav_bar"
android:spinnerMode="dropdown" />
<Button
android:id="@+id/button_playStop"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:background="@drawable/button_normal"
android:text="@string/play_stop"
android:layout_alignTop="@+id/button_reset"
android:layout_toLeftOf="@+id/button_reset"
android:layout_toStartOf="@+id/button_reset"
android:text="@string/play_stop" />
android:layout_alignLeft="@+id/textView"
android:layout_alignStart="@+id/textView" />
<Button
android:id="@+id/button_reset"
@ -45,7 +49,25 @@
android:layout_alignParentBottom="true"
android:layout_alignRight="@+id/textView"
android:layout_marginBottom="182dp"
android:text="@string/reset" />
android:textColor="@color/white"
android:background="@drawable/button_normal"
android:text="@string/reset"
android:layout_toRightOf="@+id/button_playStop"
android:layout_toEndOf="@+id/button_playStop" />
<!--
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:shape="ring">
<stroke android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:width="2dp"
android:color="@color/black" />
</shape>
-->
<TextView
android:id="@+id/textView"

12
app/src/main/res/values/colors.xml
View file

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="colorPrimary">#024265</color>
<color name="colorPrimaryDark">#024265</color>
<color name="colorAccent">#0274B2</color>
<color name="transparent">#00000000</color>
<color name="middlegrey">#A8A8A8</color>
<color name="white">#ffffff</color>
<color name="yellow">#f6d126</color>
<color name="black">#000000</color>
<color name="middleblue">#8aa5ce</color>
</resources>

2
app/src/main/res/values/strings.xml
View file

@ -1,5 +1,5 @@
<resources>
<string name="app_name">Privacy Friendly Break Reminder</string>
<string name="app_name">Break Reminder</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>