Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'antiFeatureWarningDark' into 'master'

Browse Source 
Fix anti feature warning drawable in dark mode

Closes #1148

See merge request !570
This commit is contained in:
Chirayu Desai 2017-08-28 05:47:23 +00:00
commit 7d95f80608
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
</vector>

4
app/src/main/res/layout/app_details2_header.xml
View File

@ -262,8 +262,8 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:drawableStart="@drawable/ic_warning_black_24dp" android:drawableStart="?attr/antiFeaturesWarning"
android:drawableLeft="@drawable/ic_warning_black_24dp" android:drawableLeft="?attr/antiFeaturesWarning"
android:gravity="center_vertical" android:gravity="center_vertical"
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:text="@string/antifeatureswarning" /> android:text="@string/antifeatureswarning" />

1
app/src/main/res/values/attrs.xml
View File

@ -11,5 +11,6 @@
<attr name="detailPanel" format="reference" /> <attr name="detailPanel" format="reference" />
<attr name="appListItem" format="color" /> <attr name="appListItem" format="color" />
<attr name="lightGrayTextColor" format="color" /> <attr name="lightGrayTextColor" format="color" />
<attr name="antiFeaturesWarning" format="reference" />
</declare-styleable> </declare-styleable>
</resources> </resources>

2
app/src/main/res/values/styles.xml
View File

@ -22,6 +22,7 @@
<item name="detailPanel">@drawable/details_panel_donate_background_dark</item> <item name="detailPanel">@drawable/details_panel_donate_background_dark</item>
<item name="appListItem">#ffffff</item> <item name="appListItem">#ffffff</item>
<item name="lightGrayTextColor">#a6a6a6</item> <item name="lightGrayTextColor">#a6a6a6</item>
<item name="antiFeaturesWarning">@drawable/ic_warning_white_24dp</item>
</style> </style>
<style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@ -45,6 +46,7 @@
<item name="detailPanel">@drawable/details_panel_donate_background_light</item> <item name="detailPanel">@drawable/details_panel_donate_background_light</item>
<item name="appListItem">#424242</item> <item name="appListItem">#424242</item>
<item name="lightGrayTextColor">#4a4a4a</item> <item name="lightGrayTextColor">#4a4a4a</item>
<item name="antiFeaturesWarning">@drawable/ic_warning_black_24dp</item>
</style> </style>
<style name="AppThemeDark" parent="AppBaseThemeDark"> <style name="AppThemeDark" parent="AppBaseThemeDark">