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

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
	app/src/main/res/drawable/ic_star_blue_48dp.png
	app/src/main/res/drawable/ic_star_grey_48dp.png
	app/src/main/res/drawable/ratingbar.xml
This commit is contained in:
Christopher Beckmann 2016-02-20 21:01:21 +01:00
commit a522f18d13
4 changed files with 71 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
View file

@ -24,6 +24,7 @@ import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.RatingBar;

1
app/src/main/res/layout/activity_main_menu.xml
View file

@ -123,7 +123,6 @@
android:layout_gravity="center_horizontal"
android:layout_weight="3"
android:onClick="onClick"
android:capitalize="none"
android:clickable="false"
android:elevation="10dp"
android:background="@drawable/standalone_button"/>

68
app/src/main/res/layout/welcome_dialog.xml
View file

@ -1,12 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:weightSum="3">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome1" />
android:text="@string/welcome" />
<Space
android:layout_width="10dp"
android:layout_height="20dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:text="@string/field_select_description_headline"
style="@style/Base.DialogWindowTitle.AppCompat"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1.25"
android:weightSum="1"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_keyboard_arrow_left_black_24dp"/>
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:adjustViewBounds="true"
android:layout_weight="1"
android:layout_gravity="center"
android:src="@drawable/icon_default_9x9"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_keyboard_arrow_right_black_24dp"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/field_select_description"/>
<Space
android:layout_width="20dp"
android:layout_height="20dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:text="@string/difficulty_description_headline"
style="@style/Base.DialogWindowTitle.AppCompat"/>
<RatingBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/difficultyBar"
android:layout_gravity="center_horizontal"
android:clickable="false"
android:numStars="3"
android:rating="1"
android:stepSize="1"
style="@style/RatingBar"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/difficulty_description"/>
</LinearLayout>

6
app/src/main/res/values/strings.xml
View file

@ -87,7 +87,11 @@
<string name="reset_confirmation_confirm">Reset</string>
<!-- ### Welcome Dialog ### -->
<string name="welcome1">Welcome to Privacy Friendly Sudoku.</string>
<string name="welcome">Welcome to Privacy Friendly Sudoku.</string>
<string name="field_select_description">Swipe or press the arrow buttons on the left nd right to change the game filed mode</string>
<string name="field_select_description_headline">Field mode:</string>
<string name="difficulty_description">Press or swipe the stars to change the difficulty</string>
<string name="difficulty_description_headline">Difficulty:</string>
<!-- ### Continue Game ### -->
<string name="loadgame_delete_confirmation">Are you sure you want to delete this save?</string>