norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix actionbar color and draggable row

Browse Source
This commit is contained in:
Adrian Ulrich 2015-04-03 11:15:36 +02:00
parent 6e9a108098
commit 49b5de26f5
2 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
res/layout-v21/draggable_row.xml Normal file
View File

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2014 Adrian Ulrich <adrian@blinkenlights.ch>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<ch.blinkenlights.android.vanilla.DraggableRow
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<LinearLayout
android:background="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<View
android:id="@+id/pmark"
android:layout_width="4dip"
android:layout_height="44dip"
android:visibility="invisible"
android:background="@color/vanillaAccent" />
<TextView
android:id="@+id/text"
android:maxLines="2"
android:textColor="?android:textColorPrimary"
android:gravity="left|center_vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:paddingLeft="4dip" />
<!-- spacer -->
<View
android:layout_height="match_parent"
android:layout_width="0px"
android:layout_weight="1"/>
<CheckedTextView
android:id="@+id/checkbox"
android:visibility="gone"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center_vertical"
android:layout_height="match_parent"
android:layout_width="44dip"/>
<ImageView
android:id="@+id/dragger"
android:scaleType="center"
android:src="@drawable/grabber"
android:layout_width="44dip"
android:layout_height="44dip" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/divider_color"/>
</ch.blinkenlights.android.vanilla.DraggableRow>

8
res/values-v21/theme.xml
View File

@ -22,16 +22,17 @@ THE SOFTWARE.
-->
<resources>
<!-- Color used in LibraryActivity list dividers -->
<color name="divider_color">#00ff00</color>
<color name="divider_color">#f888</color>
<color name="overlay_color">#feee</color>
<!-- Material design primary colors -->
<color name="vanillaPrimary">#607D8B</color>
<color name="vanillaPrimaryDark">#455A64</color>
<color name="vanillaAccent">#9E9E9E</color>
<color name="vanillaAccent">#607D8B</color>
<color name="material_grey_900">#ff212121</color>
<!-- styles -->
<style name="VanillaBase" parent="android:Theme.Material.Light">
<style name="VanillaBase" parent="android:Theme.Material.Light.DarkActionBar">
<item name="android:colorAccent">@color/vanillaAccent</item>
<item name="android:colorPrimary">@color/vanillaPrimary</item>
<item name="android:colorPrimaryDark">@color/vanillaPrimaryDark</item>
@ -63,6 +64,7 @@ THE SOFTWARE.
<style name="LibraryActionBarTabText" parent="android:Widget.Material.ActionBar.TabText">
<item name="android:singleLine">true</item>
<item name="android:textSize">11.5sp</item>
<item name="android:textColor">@color/material_grey_900</item>
</style>
</resources>