Refactor colors

This commit is contained in:
Boris Timofeev 2016-10-27 20:50:28 +03:00
parent a52ab310fa
commit 96ae3a0e73
9 changed files with 30 additions and 34 deletions

View file

@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/colorDivider">
android:background="@color/colorAdBackground">
</FrameLayout>
<android.support.design.widget.AppBarLayout

View file

@ -21,6 +21,8 @@
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:headerLayout="@layout/nav_header_main"
app:menu="@menu/activity_main_drawer" />
app:menu="@menu/activity_main_drawer"
app:itemTextColor="@color/colorDrawerText"
app:itemIconTint="@color/colorDrawerText" />
</android.support.v4.widget.DrawerLayout>

View file

@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/colorDivider">
android:background="@color/colorAdBackground">
</FrameLayout>
</RelativeLayout>

View file

@ -23,7 +23,7 @@
android:id="@+id/patchLabel"
android:padding="8dp"
android:text="@string/main_activity_patch_file"
android:textColor="@color/colorHeaderText"
android:textColor="@color/colorCardHeaderText"
android:textSize="24sp"/>
<View
@ -31,7 +31,7 @@
android:layout_marginBottom="@dimen/card_line_margin"
android:layout_width="match_parent"
android:layout_height="@dimen/card_line_height"
android:background="@color/line"/>
android:background="@color/colorCardLine"/>
<TextView
android:layout_width="match_parent"
@ -63,7 +63,7 @@
android:id="@+id/romLabel"
android:padding="8dp"
android:text="@string/main_activity_rom_file"
android:textColor="@color/colorHeaderText"
android:textColor="@color/colorCardHeaderText"
android:textSize="24sp"/>
<View
@ -71,7 +71,7 @@
android:layout_marginBottom="@dimen/card_line_margin"
android:layout_width="match_parent"
android:layout_height="@dimen/card_line_height"
android:background="@color/line"/>
android:background="@color/colorCardLine"/>
<TextView
android:layout_width="match_parent"
@ -103,7 +103,7 @@
android:id="@+id/outputLabel"
android:padding="8dp"
android:text="@string/main_activity_output_file"
android:textColor="@color/colorHeaderText"
android:textColor="@color/colorCardHeaderText"
android:textSize="24sp"/>
<View
@ -111,7 +111,7 @@
android:layout_marginBottom="@dimen/card_line_margin"
android:layout_width="match_parent"
android:layout_height="@dimen/card_line_height"
android:background="@color/line"/>
android:background="@color/colorCardLine"/>
<TextView
android:layout_width="match_parent"

View file

@ -23,7 +23,7 @@
android:id="@+id/romLabel"
android:padding="8dp"
android:text="@string/main_activity_rom_file"
android:textColor="@color/colorHeaderText"
android:textColor="@color/colorCardHeaderText"
android:textSize="24sp"/>
<View
@ -32,7 +32,7 @@
android:layout_marginBottom="@dimen/card_line_margin"
android:layout_width="match_parent"
android:layout_height="@dimen/card_line_height"
android:background="@color/line"/>
android:background="@color/colorCardLine"/>
<TextView
android:layout_width="match_parent"

View file

@ -23,7 +23,7 @@
android:id="@+id/romLabel"
android:padding="8dp"
android:text="@string/main_activity_rom_file"
android:textColor="@color/colorHeaderText"
android:textColor="@color/colorCardHeaderText"
android:textSize="24sp"/>
<View
@ -32,7 +32,7 @@
android:layout_marginBottom="@dimen/card_line_margin"
android:layout_width="match_parent"
android:layout_height="@dimen/card_line_height"
android:background="@color/line"/>
android:background="@color/colorCardLine"/>
<TextView
android:layout_width="match_parent"
@ -79,7 +79,7 @@
android:id="@+id/headerLabel"
android:padding="8dp"
android:text="@string/main_activity_header_file"
android:textColor="@color/colorHeaderText"
android:textColor="@color/colorCardHeaderText"
android:textSize="24sp"/>
<View
@ -88,7 +88,7 @@
android:layout_marginBottom="@dimen/card_line_margin"
android:layout_width="match_parent"
android:layout_height="@dimen/card_line_height"
android:background="@color/line"/>
android:background="@color/colorCardLine"/>
<TextView
android:layout_width="match_parent"

View file

@ -3,14 +3,11 @@
<color name="colorPrimary">#393939</color>
<color name="colorPrimaryDark">#2d2d2d</color>
<color name="colorAccent">#f2777a</color>
<color name="colorPrimaryText">#eeeeee</color>
<color name="colorSecondaryText">#cccccc</color>
<color name="colorHeaderText">@color/colorPrimaryText</color>
<color name="colorIcons">#cccccc</color>
<color name="colorDivider">#393939</color>
<color name="line">#2d2d2d</color>
<color name="card_background">#393939</color>
<color name="drawer_background">#ff343434</color>
<color name="drawer_text">#cccccc</color>
<color name="colorCardHeaderText">#cccccc</color>
<color name="colorCardLine">#4b4b4b</color>
<color name="colorCardBackground">#393939</color>
<color name="colorAdBackground">#393939</color>
<color name="colorDrawerText">@color/colorCardHeaderText</color>
</resources>

View file

@ -3,14 +3,11 @@
<color name="colorPrimary">#795548</color>
<color name="colorPrimaryDark">#5d4037</color>
<color name="colorAccent">#f44336</color>
<color name="colorPrimaryText">#212121</color>
<color name="colorSecondaryText">#727272</color>
<color name="colorHeaderText">@color/colorPrimary</color>
<color name="colorIcons">#FFFFFF</color>
<color name="colorDivider">#B6B6B6</color>
<color name="line">#ffe8e8e8</color>
<color name="card_background">#ffffffff</color>
<color name="drawer_background">#ff343434</color>
<color name="drawer_text">#ffffffff</color>
<color name="colorCardHeaderText">@color/colorPrimary</color>
<color name="colorCardLine">#e8e8e8</color>
<color name="colorCardBackground">#ffffff</color>
<color name="colorAdBackground">#b6b6b6</color>
<color name="colorDrawerText">#8a000000</color>
</resources>

View file

@ -32,7 +32,7 @@
<item name="android:layout_gravity">center</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="cardBackgroundColor">@color/card_background</item>
<item name="cardBackgroundColor">@color/colorCardBackground</item>
<item name="cardElevation">@dimen/card_elevation</item>
<item name="cardCornerRadius">@dimen/card_corner_radius</item>
<item name="cardUseCompatPadding">true</item>