diff --git a/app/src/main/res/layout/fragment_main_new_game.xml b/app/src/main/res/layout/fragment_main_new_game.xml index a85b0c87b..b7e5871f8 100644 --- a/app/src/main/res/layout/fragment_main_new_game.xml +++ b/app/src/main/res/layout/fragment_main_new_game.xml @@ -1,97 +1,107 @@ - + android:fadeScrollbars="false" + android:scrollbarThumbVertical="?attr/colorAccent" + android:scrollbarSize="4dp" + android:fitsSystemWindows="true"> - - - - - + android:paddingHorizontal="20dp" + android:paddingBottom="64dp"> - + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + android:dividerPadding="8dp" + android:orientation="vertical" + app:layout_constraintTop_toBottomOf="@+id/main"> - + + + + + + + + + + + + + + + + + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/new_game_buttons" /> + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/general" /> + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/settings" /> - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/remove_ads" /> - - - - - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml index 09e41d753..b2c47b99a 100644 --- a/app/src/main/res/layout/fragment_main_settings.xml +++ b/app/src/main/res/layout/fragment_main_settings.xml @@ -1,91 +1,101 @@ - - + android:paddingBottom="64dp"> - - - + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + android:dividerPadding="8dp" + android:orientation="vertical" + android:paddingHorizontal="20dp" + app:layout_constraintTop_toBottomOf="@+id/settings_menu"> - + - + - + - - + - + - - - + + - + android:layout_height="wrap_content" + android:paddingHorizontal="20dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/new_game_buttons" /> - - + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + android:dividerPadding="8dp" + android:orientation="vertical" + android:paddingHorizontal="20dp" + app:layout_constraintTop_toBottomOf="@+id/about_menu_text"> + + + + + + + + + - + diff --git a/common/src/main/res/drawable/ic_launcher_foreground.xml b/common/src/main/res/drawable/ic_launcher_foreground.xml index 3479c867e..babad69eb 100644 --- a/common/src/main/res/drawable/ic_launcher_foreground.xml +++ b/common/src/main/res/drawable/ic_launcher_foreground.xml @@ -3,20 +3,19 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - - - - + + + + diff --git a/common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cfe5..bbd3e0212 100644 --- a/common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/common/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cfe5..bbd3e0212 100644 --- a/common/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/common/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-hdpi/ic_launcher.png b/common/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..1fcf6d8c5 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/common/src/main/res/mipmap-hdpi/ic_launcher_round.png b/common/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..1811473ec Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_launcher.png b/common/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..2e5d77dc8 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/common/src/main/res/mipmap-mdpi/ic_launcher_round.png b/common/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..c5d71c2c8 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_launcher.png b/common/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..98461bbda Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/common/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..61671dae7 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_launcher.png b/common/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..7ac1edd5b Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/common/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..78c56c613 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/common/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..a33bcbabc Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/common/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..b31500e5b Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml index d94fc375f..6f948f559 100644 --- a/wear/src/main/AndroidManifest.xml +++ b/wear/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ +