vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-08 21:31:10 +01:00
Code Issues Releases Wiki Activity

Accent color orange; Notification/Message count badge; Reworked progressbar #40

Browse source
This commit is contained in:
Gregor Santner 2016-09-11 17:15:26 +02:00
parent 1dcd05af10
commit ac19efd847
13 changed files with 203 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/drawable/ic_email_colored_48px.xml
View file

@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#4CAF50" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
<path android:fillColor="#FF5300" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
</vector>

11
app/src/main/res/drawable/ic_mail_white_48px__layer.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/ic_mail_white_48px"
android:gravity="center" />
<!-- set a place holder Drawable so android:drawable isn't null -->
<item
android:id="@+id/ic_badge"
android:drawable="@drawable/ic_mail_white_48px" />
</layer-list>

4
app/src/main/res/drawable/ic_notifications_colored_48px.xml
View file

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#4CAF50" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
</vector>

11
app/src/main/res/drawable/ic_notifications_white_48px__layer.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/ic_notifications_white_48px"
android:gravity="center" />
<!-- set a place holder Drawable so android:drawable isn't null -->
<item
android:id="@+id/ic_badge"
android:drawable="@drawable/ic_notifications_white_48px" />
</layer-list>

15
app/src/main/res/drawable/progressbar.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<solid android:color="@color/colorPrimaryDark"/>
</shape>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="@color/colorAccent"/>
</shape>
</clip>
</item>
</layer-list>

22
app/src/main/res/layout/main__content.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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:id="@+id/content_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".activity.MainActivity"
tools:showIn="@layout/main__app_bar">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".activity.MainActivity"
tools:showIn="@layout/main__app_bar">
<FrameLayout
android:id="@+id/placeholder_webview"
@ -19,11 +19,11 @@
<ProgressBar
android:id="@+id/progressBar"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="fill_parent"
android:layout_height="7dp"
android:indeterminate="false"
android:layout_height="wrap_content"
android:layout_marginTop="-7dp" />
android:progressDrawable="@drawable/progressbar"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
</RelativeLayout>

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

@ -26,11 +26,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="15dp"
android:shadowColor="@color/black"
android:shadowDx="-4"
android:shadowDy="4"
android:shadowRadius="6"
android:layout_marginBottom="30dp"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/white"

11
app/src/main/res/layout/webview.xml
View file

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.github.dfa.diaspora_android.ui.ContextMenuWebView
android:id="@+id/webView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true" />
android:layout_height="fill_parent" />
</LinearLayout>

4
app/src/main/res/menu/main__menu_top.xml
View file

@ -5,13 +5,13 @@
<item
android:id="@+id/action_notifications"
android:icon="@drawable/ic_notifications_white_48px"
android:icon="@drawable/ic_notifications_white_48px__layer"
android:title="@string/notifications"
app:showAsAction="always" />
<item
android:id="@+id/action_conversations"
android:icon="@drawable/ic_mail_white_48px"
android:icon="@drawable/ic_mail_white_48px__layer"
android:title="@string/conversations"
app:showAsAction="always" />

6
app/src/main/res/values/color.xml
View file

@ -8,11 +8,11 @@
<color name="primary">#3F51B5</color>
<color name="primary_dark">#303F9F</color>
<color name="primary_light">#C5CAE9</color>
<color name="accent">#4CAF50</color>
<color name="accent">#FF5300</color>
<color name="primary_text">#212121</color>
<color name="secondary_text">#757575</color>
<color name="secondary_text">#727272</color>
<color name="icons">#FFFFFF</color>
<color name="divider">#BDBDBD</color>
<color name="divider">#B6B6B6</color>
<!-- End colors from Palette -->
<color name="white">#ffffff</color>

3
app/src/main/res/values/dimens.xml
View file

@ -11,4 +11,7 @@
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_width">250dp</dimen>
<dimen name="textsize_badge_count">11sp</dimen>
</resources>