Revert changes to the landscape version of the DailySudoku layout from the last commit
This commit is contained in:
parent
bd3f0031cb
commit
e46ed28316
1 changed files with 132 additions and 123 deletions
|
@ -1,4 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
<androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout_main"
|
<androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout_main"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -23,7 +24,8 @@
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
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_toBottomOf="parent">
|
app:layout_constraintTop_toBottomOf="parent"
|
||||||
|
tools:layout_editor_absoluteY="433dp">
|
||||||
|
|
||||||
</androidx.viewpager.widget.ViewPager>
|
</androidx.viewpager.widget.ViewPager>
|
||||||
|
|
||||||
|
@ -74,6 +76,7 @@
|
||||||
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_marginTop="128dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:onClick="onClick"
|
android:onClick="onClick"
|
||||||
|
@ -85,144 +88,150 @@
|
||||||
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" />
|
||||||
|
|
||||||
<ImageView
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/statistic_image"
|
android:id="@+id/linearLayout11"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_marginStart="16dp"
|
|
||||||
android:layout_marginLeft="16dp"
|
|
||||||
android:layout_marginTop="16dp"
|
|
||||||
android:layout_marginBottom="8dp"
|
|
||||||
android:adjustViewBounds="true"
|
|
||||||
android:src="@drawable/icon_default_9x9"
|
|
||||||
app:layout_constraintBottom_toTopOf="@+id/view3"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/view"
|
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/appbar" />
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/first_diff_text"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center|center_horizontal"
|
|
||||||
android:text="diffi"
|
|
||||||
android:textSize="22sp"
|
|
||||||
app:layout_constraintBottom_toTopOf="@+id/first_diff_bar"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/first_diff_bar"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/first_diff_bar"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/statistic_image"
|
|
||||||
app:layout_constraintVertical_bias="1.0" />
|
|
||||||
|
|
||||||
<RatingBar
|
|
||||||
android:id="@+id/first_diff_bar"
|
|
||||||
style="?android:attr/ratingBarStyleSmall"
|
|
||||||
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
|
|
||||||
android:layout_marginStart="8dp"
|
|
||||||
android:layout_marginLeft="8dp"
|
|
||||||
android:layout_marginEnd="8dp"
|
|
||||||
android:layout_marginRight="8dp"
|
|
||||||
android:numStars="4"
|
|
||||||
android:scaleX="1.5"
|
|
||||||
android:scaleY="1.5"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/statistic_image"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/view"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/statistic_image"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/statistic_image"
|
|
||||||
app:layout_constraintVertical_bias="0.50" />
|
|
||||||
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/view"
|
|
||||||
android:layout_width="1dp"
|
|
||||||
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:background="?attr/colorPrimary"
|
android:weightSum="5"
|
||||||
android:foregroundGravity="center_vertical"
|
|
||||||
app:layout_constraintBottom_toTopOf="@+id/view3"
|
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_toBottomOf="@+id/appbar" />
|
app:layout_constraintTop_toBottomOf="@+id/appbar">
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
<ImageView
|
||||||
android:id="@+id/textView4"
|
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:text="@string/daily_number_of_hints"
|
android:layout_marginStart="16dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
android:layout_marginLeft="16dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
android:adjustViewBounds="true"
|
||||||
app:layout_constraintHorizontal_bias="0.25"
|
android:src="@drawable/icon_default_9x9"
|
||||||
app:layout_constraintStart_toStartOf="@id/view"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@+id/statistic_image"
|
app:layout_constraintEnd_toStartOf="@id/view"
|
||||||
app:layout_constraintVertical_bias="0.0" />
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/numb_of_hints"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="0"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/textView4"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/textView4"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/textView4" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView5"
|
android:id="@+id/first_diff_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/number_of_completed_games"
|
android:gravity="center|center_horizontal"
|
||||||
|
android:text="diffi"
|
||||||
|
android:textSize="22sp"
|
||||||
|
app:layout_constraintBottom_toTopOf="@+id/first_diff_bar"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/first_diff_bar"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/first_diff_bar"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/statistic_image"
|
||||||
|
app:layout_constraintVertical_bias="1.0" />
|
||||||
|
|
||||||
android:layout_marginBottom="8dp"
|
<RatingBar
|
||||||
app:layout_constraintBottom_toTopOf="@+id/view3"
|
android:id="@+id/first_diff_bar"
|
||||||
app:layout_constraintEnd_toEndOf="@+id/textView4"
|
style="?android:attr/ratingBarStyleSmall"
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/textView4"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/textView4"
|
|
||||||
app:layout_constraintVertical_bias="0.0" />
|
|
||||||
|
|
||||||
<TextView
|
android:layout_width="wrap_content"
|
||||||
android:id="@+id/numb_of_total_games"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="0"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/textView5"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/numb_of_hints"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/numb_of_hints"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/textView5" />
|
|
||||||
|
|
||||||
<TextView
|
android:layout_marginStart="8dp"
|
||||||
android:id="@+id/textView6"
|
android:layout_marginLeft="8dp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_marginEnd="8dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_marginRight="8dp"
|
||||||
android:text="@string/total_of_time"
|
android:numStars="4"
|
||||||
|
android:scaleX="1.5"
|
||||||
|
android:scaleY="1.5"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/statistic_image"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/view"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/statistic_image"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/statistic_image"
|
||||||
|
app:layout_constraintVertical_bias="0.50" />
|
||||||
|
|
||||||
android:layout_marginBottom="8dp"
|
|
||||||
app:layout_constraintBottom_toTopOf="@+id/view3"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/textView4"
|
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/textView4"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/textView5"
|
|
||||||
app:layout_constraintVertical_bias="0.0" />
|
|
||||||
|
|
||||||
<TextView
|
<View
|
||||||
android:id="@+id/numb_of_total_time"
|
android:id="@+id/view"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="1dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="0"
|
android:background="?attr/colorPrimary"
|
||||||
|
android:foregroundGravity="center_vertical"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
android:layout_marginBottom="8dp"
|
|
||||||
app:layout_constraintBottom_toTopOf="@+id/view3"
|
<TextView
|
||||||
app:layout_constraintEnd_toEndOf="@+id/textView6"
|
android:id="@+id/textView4"
|
||||||
app:layout_constraintHorizontal_bias="0.0"
|
android:layout_width="wrap_content"
|
||||||
app:layout_constraintStart_toStartOf="@+id/textView4"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/textView6"
|
android:text="@string/daily_number_of_hints"
|
||||||
app:layout_constraintVertical_bias="0.0" />
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.25"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/view"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/statistic_image"
|
||||||
|
app:layout_constraintVertical_bias="0.0" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/numb_of_hints"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="0"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/textView4"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/textView4"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/textView4" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView5"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/number_of_completed_games"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/textView4"
|
||||||
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/textView4"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/textView4"
|
||||||
|
app:layout_constraintVertical_bias="0.0" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/numb_of_total_games"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="0"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/textView5"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/numb_of_hints"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/numb_of_hints"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/textView5" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView6"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/total_of_time"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/textView4"
|
||||||
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/textView4"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/textView5"
|
||||||
|
app:layout_constraintVertical_bias="0.0" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/numb_of_total_time"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="0"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/textView6"
|
||||||
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/textView4"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/textView6"
|
||||||
|
app:layout_constraintVertical_bias="0.0" />
|
||||||
|
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
android:id="@+id/sudoku_list"
|
android:id="@+id/sudoku_list"
|
||||||
|
|
Loading…
Reference in a new issue