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-13 18:31:17 +02:00
commit bf9aee31ed
1 changed files with 202 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

228
app/src/main/res/layout-land/activity_daily_sudoku.xml
View file

@ -1,30 +1,63 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout_main"
xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent"
android:layout_width="match_parent"
android:fitsSystemWindows="true"
tools:openDrawer="start"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/linearLayout5" xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout10"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:weightSum="10"
app:statusBarBackground="?attr/colorPrimary"> tools:context="org.secuso.privacyfriendlysudoku.ui.StatsActivity$PlaceholderFragment">
<LinearLayout <androidx.viewpager.widget.ViewPager
android:id="@+id/linearLayout6" android:id="@+id/main_content"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:orientation="vertical" app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toTopOf="@+id/main_content" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toBottomOf="parent"
tools:layout_editor_absoluteY="433dp">
</androidx.viewpager.widget.ViewPager>
<View
android:id="@+id/view3"
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:background="?attr/colorPrimary"
android:foregroundGravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appbar" />
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipChildren="false" android:clipChildren="false"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
@ -39,89 +72,62 @@
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout10"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="10"
tools:context="org.secuso.privacyfriendlysudoku.ui.StatsActivity$PlaceholderFragment">
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton" android:id="@+id/floatingActionButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginTop="128dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:clickable="true" android:clickable="true"
android:onClick="onClick" android:onClick="onClick"
app:layout_constraintBottom_toTopOf="@+id/linearLayout12" app:layout_constraintBottom_toTopOf="@+id/view3"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="@+id/view3"
app:layout_constraintHorizontal_bias="1.0" app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/appbar"
app:layout_constraintVertical_bias="1.0" app:layout_constraintVertical_bias="1.0"
app:srcCompat="@android:drawable/ic_media_play" /> app:srcCompat="@android:drawable/ic_media_play" />
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout11" android:id="@+id/linearLayout11"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:weightSum="5" android:weightSum="5"
app:layout_constraintBottom_toTopOf="@+id/linearLayout12" app:layout_constraintBottom_toTopOf="@+id/view3"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/appbar">
app:layout_constraintVertical_bias="0.0">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout15"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="2.0"
android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/statistic_image" android:id="@+id/statistic_image"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="16dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="16dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:src="@drawable/icon_default_9x9" android:src="@drawable/icon_default_9x9"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@id/view"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/relativeLayout2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:gravity="center_horizontal"
app:layout_constraintBottom_toBottomOf="@+id/statistic_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/statistic_image"
app:layout_constraintTop_toTopOf="@+id/statistic_image"
app:layout_constraintVertical_bias="0.50">
<TextView <TextView
android:id="@+id/first_diff_text" android:id="@+id/first_diff_text"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center|center_horizontal" android:gravity="center|center_horizontal"
android:text="diffi" android:text="diffi"
android:textSize="22sp" android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@+id/first_diff_bar"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintEnd_toEndOf="@+id/first_diff_bar"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@+id/first_diff_bar"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="@+id/statistic_image"
app:layout_constraintVertical_bias="0.33" /> app:layout_constraintVertical_bias="1.0" />
<RatingBar <RatingBar
android:id="@+id/first_diff_bar" android:id="@+id/first_diff_bar"
@ -129,64 +135,32 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:numStars="4" android:numStars="4"
android:scaleX="1.5" android:scaleX="1.5"
android:scaleY="1.5" android:scaleY="1.5"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="@+id/statistic_image"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/view"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@+id/statistic_image"
app:layout_constraintTop_toBottomOf="@+id/first_diff_text" app:layout_constraintTop_toTopOf="@+id/statistic_image"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.50" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:minHeight="5dp">
<View <View
android:id="@+id/view"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center_vertical"
android:layout_marginTop="0dp"
android:layout_marginBottom="50dp"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:foregroundGravity="center_vertical" /> android:foregroundGravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</RelativeLayout>
<LinearLayout
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:orientation="vertical"
android:paddingTop="0dp"
android:weightSum="6">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout13"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="top"
android:layout_marginRight="0dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:orientation="vertical"
android:paddingTop="0dp"
android:weightSum="10">
<TextView <TextView
android:id="@+id/textView4" android:id="@+id/textView4"
@ -195,9 +169,9 @@
android:text="@string/daily_number_of_hints" android:text="@string/daily_number_of_hints"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.25"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@id/view"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="@+id/statistic_image"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.0" />
<TextView <TextView
@ -214,7 +188,6 @@
android:id="@+id/textView5" android:id="@+id/textView5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/number_of_completed_games" android:text="@string/number_of_completed_games"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/textView4" app:layout_constraintEnd_toEndOf="@+id/textView4"
@ -237,7 +210,6 @@
android:id="@+id/textView6" android:id="@+id/textView6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/total_of_time" android:text="@string/total_of_time"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/textView4" app:layout_constraintEnd_toEndOf="@+id/textView4"
@ -250,7 +222,6 @@
android:id="@+id/numb_of_total_time" android:id="@+id/numb_of_total_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="0" android:text="0"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/textView6" app:layout_constraintEnd_toEndOf="@+id/textView6"
@ -259,60 +230,21 @@
app:layout_constraintTop_toBottomOf="@+id/textView6" app:layout_constraintTop_toBottomOf="@+id/textView6"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.0" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayout12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5">
<View
android:layout_width="wrap_content"
android:layout_height="2dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:background="?attr/colorPrimary"
android:foregroundGravity="center_vertical" />
</LinearLayout>
<ListView <ListView
android:id="@+id/sudoku_list" android:id="@+id/sudoku_list"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/linearLayout12" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout12"> app:layout_constraintTop_toBottomOf="@+id/view3">
</ListView> </ListView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </androidx.drawerlayout.widget.DrawerLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_content"
android:layout_width="wrap_content"
android:layout_height="0dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/linearLayout6"
app:layout_constraintTop_toBottomOf="parent" >
</androidx.viewpager.widget.ViewPager>
</androidx.constraintlayout.widget.ConstraintLayout>