Skip to content

Commit

Permalink
Refactor styles and colours
Browse files Browse the repository at this point in the history
  • Loading branch information
intrications committed Apr 25, 2015
1 parent 213a663 commit 514099f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@android:color/holo_blue_dark" />
<item android:state_focused="true" android:drawable="@android:color/transparent" />

<item android:drawable="@drawable/magazines_view_button_focused" android:state_focused="true"/>
<item android:drawable="@drawable/magazines_view_button_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/magazines_view_button"/>

</selector>
10 changes: 1 addition & 9 deletions main/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
<color name="thumbnail_selected_background">#bba8a8a8</color>
<color name="transparent_gray">#aa000000</color>

<color name="text_color">@android:color/white</color>
<color name="button_stroke_color">#000</color>
<color name="button_stroke_color_focused">#a000</color>
<color name="button_stroke_color_pressed">#7000</color>
<color name="text_color">@android:color/black</color>
<color name="startup_background_color">@android:color/white</color>

<integer-array name="circular_progress_bar_colors">
<item>@color/colorAccent</item>
</integer-array>

</resources>
8 changes: 0 additions & 8 deletions main/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,6 @@
<item name="colorAccent">@color/colorPrimary</item>
</style>

<!--<style name="MyAppCompatDialogTheme" parent="AppTheme">-->
<!--<item name="android:windowIsFloating">false</item>-->
<!--<item name="android:windowContentOverlay">@null</item>-->
<!--<item name="android:windowSoftInputMode">stateAlwaysHidden</item>-->
<!--<item name="android:windowActionModeOverlay">true</item>-->
<!--<item name="android:windowIsTranslucent">true</item>-->
<!--</style>-->

<style name="mainGridViewButtonStyle" parent="Base.TextAppearance.AppCompat">
<item name="android:background">@drawable/magazines_view_button_selector</item>
<item name="android:textColor">@color/magazine_view_button_text_color</item>
Expand Down

0 comments on commit 514099f

Please sign in to comment.