joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'Sudoku-v3.0' of https://github.com/SecUSo/privacy-friendly-sudoku into Sudoku-v3.0

Browse source
This commit is contained in:
ErikWaegerle 2020-06-02 21:22:22 +02:00
commit e366bccee9
8 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/layout-land/fragment_stats.xml
View file

@ -86,7 +86,7 @@
android:foregroundGravity="center_vertical"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:background="@color/colorPrimary" />
android:background="?attr/colorPrimary" />
</LinearLayout>
<LinearLayout
@ -116,7 +116,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"/>

4
app/src/main/res/layout-xlarge-land/fragment_stats.xml
View file

@ -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" />
</LinearLayout>

4
app/src/main/res/layout-xlarge/fragment_stats.xml
View file

@ -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" />
</LinearLayout>

34
app/src/main/res/layout-xlarge/win_screen_layout.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="370dp"
android:orientation="vertical"
android:background="@color/white"
android:background="?attr/lightestBackGround"
android:layout_gravity="center">
<LinearLayout
@ -16,7 +16,7 @@
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:background="?attr/backgroundSurroundingDialog"
android:gravity="bottom"
android:orientation="vertical"
android:layout_gravity="bottom">
@ -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" />
<View
android:layout_width="fill_parent"
android:layout_height="10dp"
android:background="@color/middleblue"
android:background="?attr/winScreenPedestalColor"
android:layout_gravity="bottom"
android:foregroundGravity="bottom"/>
</LinearLayout>
@ -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"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/win_time"
android:layout_gravity="center"
android:textColor="@color/white"/>
android:textColor="?attr/lightestFontColor"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/win_time"
android:text=""
android:textColor="@color/white"
android:textColor="?attr/lightestFontColor"
android:layout_gravity="center_horizontal"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/win_hint"
android:textColor="@color/white"
android:textColor="?attr/lightestFontColor"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/win_hints"
android:text=""
android:textColor="@color/white"
android:textColor="?attr/lightestFontColor"
android:layout_gravity="center_horizontal"/>
<TextView
android:layout_width="wrap_content"
@ -92,7 +92,7 @@
android:gravity="center_horizontal"
android:visibility="invisible"
android:id="@+id/win_new_besttime"
android:textColor="@color/white"/>
android:textColor="?attr/lightestFontColor"/>
</LinearLayout>
<LinearLayout
@ -102,7 +102,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="20dp"
android:background="@color/middleblue"
android:background="?attr/winScreenPedestalColor"
android:layout_gravity="bottom"
android:foregroundGravity="bottom"/>
</LinearLayout>
@ -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">
<ImageView
@ -119,11 +119,11 @@
android:layout_height="40dp"
android:layout_gravity="bottom"
android:src="@drawable/ic_trophy_award_black_48dp"
android:background="@color/transparent" />
android:background="?attr/backgroundSurroundingDialog" />
<View
android:layout_width="fill_parent"
android:layout_height="10dp"
android:background="@color/middleblue"
android:background="?attr/winScreenPedestalColor"
android:layout_gravity="bottom"
android:foregroundGravity="bottom"/>
</LinearLayout>
@ -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"/>

4
app/src/main/res/layout/fragment_stats.xml
View file

@ -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" />
</LinearLayout>

34
app/src/main/res/layout/win_screen_layout.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="320dp"
android:orientation="vertical"
android:background="@color/white"
android:background="?attr/lightestBackGround"
android:layout_gravity="center">
<LinearLayout
@ -17,7 +17,7 @@
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:background="?attr/backgroundSurroundingDialog"
android:gravity="bottom"
android:orientation="vertical"
android:layout_gravity="bottom">
@ -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" />
<View
android:layout_width="fill_parent"
android:layout_height="10dp"
android:background="@color/middleblue"
android:background="?attr/winScreenPedestalColor"
android:layout_gravity="bottom"
android:foregroundGravity="bottom"/>
</LinearLayout>
@ -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"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/win_time"
android:layout_gravity="center"
android:textColor="@color/white"/>
android:textColor="?attr/lightestFontColor"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/win_time"
android:text=""
android:textColor="@color/white"
android:textColor="?attr/lightestFontColor"
android:layout_gravity="center_horizontal"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/win_hint"
android:textColor="@color/white"
android:textColor="?attr/lightestFontColor"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/win_hints"
android:text=""
android:textColor="@color/white"
android:textColor="?attr/lightestFontColor"
android:layout_gravity="center_horizontal"/>
<TextView
android:layout_width="wrap_content"
@ -95,7 +95,7 @@
android:gravity="center_horizontal"
android:visibility="invisible"
android:id="@+id/win_new_besttime"
android:textColor="@color/white"/>
android:textColor="?attr/lightestFontColor"/>
</LinearLayout>
<LinearLayout
@ -105,7 +105,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="20dp"
android:background="@color/middleblue"
android:background="?attr/winScreenPedestalColor"
android:layout_gravity="bottom"
android:foregroundGravity="bottom"/>
</LinearLayout>
@ -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">
<ImageView
@ -122,11 +122,11 @@
android:layout_height="40dp"
android:layout_gravity="bottom"
android:src="@drawable/ic_trophy_award_black_48dp"
android:background="@color/transparent" />
android:background="?attr/backgroundSurroundingDialog" />
<View
android:layout_width="fill_parent"
android:layout_height="10dp"
android:background="@color/middleblue"
android:background="?attr/winScreenPedestalColor"
android:layout_gravity="bottom"
android:foregroundGravity="bottom"/>
</LinearLayout>
@ -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"/>

2
app/src/main/res/values/attrs.xml
View file

@ -4,5 +4,7 @@
<attr name="lightestBackGround" format="color"/>
<attr name="lightestFontColor" format="color"/>
<attr name="standardVectorGraphic" format="color"/>
<attr name="winScreenPedestalColor" format="color"/>
<attr name="backgroundSurroundingDialog" format="color"/>
</declare-styleable>
</resources>

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

@ -9,6 +9,8 @@
<item name="lightestBackGround">@color/white</item>
<item name="lightestFontColor">@color/white</item>
<item name="standardVectorGraphic">@color/black</item>
<item name="winScreenPedestalColor">@color/middleblue</item>
<item name="backgroundSurroundingDialog">@color/transparent</item>
<item name="actionBarTheme">@style/ToolbarStyle</item>
</style>