diff --git a/app/src/main/res/layout-land/fragment_stats.xml b/app/src/main/res/layout-land/fragment_stats.xml index 80160d4..409b7a6 100644 --- a/app/src/main/res/layout-land/fragment_stats.xml +++ b/app/src/main/res/layout-land/fragment_stats.xml @@ -86,7 +86,7 @@ android:foregroundGravity="center_vertical" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:background="@color/colorPrimary" /> + android:background="?attr/colorPrimary" /> diff --git a/app/src/main/res/layout-xlarge-land/fragment_stats.xml b/app/src/main/res/layout-xlarge-land/fragment_stats.xml index 035860f..6932511 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_stats.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_stats.xml @@ -32,7 +32,7 @@ android:foregroundGravity="center_vertical" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:background="@color/colorPrimary" + android:background="?attr/colorPrimary" android:layout_marginTop="@dimen/activity_horizontal_margin" android:layout_marginBottom="@dimen/activity_horizontal_margin"/> @@ -97,7 +97,7 @@ android:foregroundGravity="center_vertical" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:background="@color/colorPrimary" /> + android:background="?attr/colorPrimary" /> diff --git a/app/src/main/res/layout-xlarge/fragment_stats.xml b/app/src/main/res/layout-xlarge/fragment_stats.xml index 26997f5..b75bacb 100644 --- a/app/src/main/res/layout-xlarge/fragment_stats.xml +++ b/app/src/main/res/layout-xlarge/fragment_stats.xml @@ -32,7 +32,7 @@ android:foregroundGravity="center_vertical" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:background="@color/colorPrimary" + android:background="?attr/colorPrimary" android:layout_marginTop="@dimen/activity_horizontal_margin" android:layout_marginBottom="@dimen/activity_horizontal_margin"/> @@ -97,7 +97,7 @@ android:foregroundGravity="center_vertical" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:background="@color/colorPrimary" /> + android:background="?attr/colorPrimary" /> diff --git a/app/src/main/res/layout-xlarge/win_screen_layout.xml b/app/src/main/res/layout-xlarge/win_screen_layout.xml index 9e8562a..7481b06 100644 --- a/app/src/main/res/layout-xlarge/win_screen_layout.xml +++ b/app/src/main/res/layout-xlarge/win_screen_layout.xml @@ -2,7 +2,7 @@ @@ -24,12 +24,12 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_gravity="bottom" - android:background="@color/transparent" + android:background="?attr/backgroundSurroundingDialog" android:src="@drawable/ic_trophy_award_black_48dp" /> @@ -40,7 +40,7 @@ android:layout_height="fill_parent" android:layout_weight="3" android:gravity="center" - android:background="@color/transparent" + android:background="?attr/backgroundSurroundingDialog" android:orientation="vertical" android:weightSum="5" > @@ -57,32 +57,32 @@ android:text="@string/win_text" android:textAlignment="center" android:layout_gravity="center_horizontal" - android:textColor="@color/white"/> + android:textColor="?attr/lightestFontColor"/> + android:textColor="?attr/lightestFontColor"/> + android:textColor="?attr/lightestFontColor"/> @@ -111,7 +111,7 @@ android:layout_width="0dp" android:layout_height="fill_parent" android:layout_weight="1" - android:background="@color/transparent" + android:background="?attr/backgroundSurroundingDialog" android:orientation="vertical" android:gravity="bottom"> + android:background="?attr/backgroundSurroundingDialog" /> @@ -142,7 +142,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:background="@drawable/standalone_button" - android:textColor="@color/white" + android:textColor="?attr/lightestFontColor" android:layout_weight="1" android:text="@string/win_button_text" android:layout_marginRight="5dp"/> @@ -151,7 +151,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:background="@drawable/standalone_button" - android:textColor="@color/white" + android:textColor="?attr/lightestFontColor" android:layout_weight="1" android:text="@string/win_show_game" android:layout_marginLeft="5dp"/> diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml index 9e12962..efea7f0 100644 --- a/app/src/main/res/layout/fragment_stats.xml +++ b/app/src/main/res/layout/fragment_stats.xml @@ -32,7 +32,7 @@ android:foregroundGravity="center_vertical" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:background="@color/colorPrimary" + android:background="?attr/colorPrimary" android:layout_marginTop="@dimen/activity_horizontal_margin" android:layout_marginBottom="@dimen/activity_horizontal_margin"/> @@ -98,7 +98,7 @@ android:foregroundGravity="center_vertical" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:background="@color/colorPrimary" /> + android:background="?attr/colorPrimary" /> diff --git a/app/src/main/res/layout/win_screen_layout.xml b/app/src/main/res/layout/win_screen_layout.xml index eb2e5da..df0f5a9 100644 --- a/app/src/main/res/layout/win_screen_layout.xml +++ b/app/src/main/res/layout/win_screen_layout.xml @@ -2,7 +2,7 @@ @@ -25,12 +25,12 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_gravity="bottom" - android:background="@color/transparent" + android:background="?attr/backgroundSurroundingDialog" android:src="@drawable/ic_trophy_award_black_48dp" /> @@ -41,7 +41,7 @@ android:layout_height="fill_parent" android:layout_weight="3" android:gravity="center" - android:background="@color/transparent" + android:background="?attr/backgroundSurroundingDialog" android:orientation="vertical" android:weightSum="5" > @@ -60,32 +60,32 @@ android:text="@string/win_text" android:textAlignment="center" android:layout_gravity="center_horizontal" - android:textColor="@color/white"/> + android:textColor="?attr/lightestFontColor"/> + android:textColor="?attr/lightestFontColor"/> + android:textColor="?attr/lightestFontColor"/> @@ -114,7 +114,7 @@ android:layout_width="0dp" android:layout_height="fill_parent" android:layout_weight="1" - android:background="@color/transparent" + android:background="?attr/backgroundSurroundingDialog" android:orientation="vertical" android:gravity="bottom"> + android:background="?attr/backgroundSurroundingDialog" /> @@ -145,7 +145,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:background="@drawable/standalone_button" - android:textColor="@color/white" + android:textColor="?attr/lightestFontColor" android:layout_weight="1" android:text="@string/win_button_text" android:layout_marginRight="5dp"/> @@ -154,7 +154,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:background="@drawable/standalone_button" - android:textColor="@color/white" + android:textColor="?attr/lightestFontColor" android:layout_weight="1" android:text="@string/win_show_game" android:layout_marginLeft="5dp"/> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 2f0dcbc..6dbe1d6 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -4,5 +4,7 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index dacce95..d5042f9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,6 +9,8 @@ @color/white @color/white @color/black + @color/middleblue + @color/transparent @style/ToolbarStyle