Skip to content

Commit

Permalink
Fix lollipop
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucasnlm
lucasnlm committed Feb 17, 2021
1 parent 79da0bd commit 72f4dfd
Show file tree
Hide file tree
Showing 16 changed files with 176 additions and 156 deletions.
146 changes: 78 additions & 68 deletions app/src/main/res/layout/fragment_main_new_game.xml
View file
Original file line number Diff line number Diff line change
@@ -1,97 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:paddingHorizontal="20dp">
android:fadeScrollbars="false"
android:scrollbarThumbVertical="?attr/colorAccent"
android:scrollbarSize="4dp"
android:fitsSystemWindows="true">

<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/main"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<LinearLayout
android:id="@+id/new_game_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:dividerPadding="8dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/main">

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/continue_game"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:paddingHorizontal="20dp"
android:paddingBottom="64dp">

<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/new_game"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/standard"
<LinearLayout
android:id="@+id/new_game_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:dividerPadding="8dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/main">

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/beginner"
<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/continue_game"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/new_game"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/standard"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/beginner"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/intermediate"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/expert"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/custom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp" />

</LinearLayout>

<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/general"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/new_game_buttons" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/intermediate"
android:id="@+id/settings"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
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" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/expert"
android:id="@+id/remove_ads"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/custom"
android:id="@+id/themes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp" />

</LinearLayout>

<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/general"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/new_game_buttons" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/remove_ads" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/settings"
android:layout_width="match_parent"
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" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/remove_ads"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/themes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/remove_ads" />
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
146 changes: 78 additions & 68 deletions app/src/main/res/layout/fragment_main_settings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fadeScrollbars="false"
android:scrollbarThumbVertical="?attr/colorAccent"
android:scrollbarSize="4dp"
android:fitsSystemWindows="true">

<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/settings_menu"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:paddingBottom="64dp">

<LinearLayout
android:id="@+id/new_game_buttons"
android:layout_width="match_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">

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/settings"
<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/settings_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/controls"
<LinearLayout
android:id="@+id/new_game_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
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">

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/themes"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/settings"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/tutorial"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"/>
<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/controls"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/previous_games"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/themes"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/stats"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/tutorial"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp" />

<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/about_menu_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/new_game_buttons" />
<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/previous_games"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<LinearLayout
android:id="@+id/about_menu"
android:layout_width="match_parent"
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">

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/translation"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/stats"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/play_games"
<dev.lucasnlm.antimine.ui.view.SectionView
android:id="@+id/about_menu_text"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:paddingHorizontal="20dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/new_game_buttons" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/about"
<LinearLayout
android:id="@+id/about_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
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">

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/translation"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/play_games"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<dev.lucasnlm.antimine.main.view.CardButtonView
android:id="@+id/about"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
31 changes: 15 additions & 16 deletions common/src/main/res/drawable/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:scaleX="0.14554687"
android:scaleY="0.14554687"
android:translateX="16.74"
android:translateY="16.74">
<path
android:fillColor="#1a1a1a"
android:pathData="m246.602,122.687a133.507,133.507 135,0 0,-31.176 6.167l-4.192,49.433 -48.867,-16.913a133.507,133.507 135,0 0,-18.64 23.358l30.287,43.006 -50.487,19.289a133.507,133.507 45,0 0,-0.288 8.779,133.507 133.507,45 0,0 1.477,19.802l52.573,13.936 -26.454,47.546a133.507,133.507 135,0 0,19.734 20.686l48.956,-22.989 9.967,51.715a133.507,133.507 0,0 0,27.252 2.812,133.507 133.507,135 0,0 2.456,-0.024l21.761,-46.993 38.569,31.332a133.507,133.507 0,0 0,26.03 -18.143l-12.71,-46.928 46.855,-0.744a133.507,133.507 0,0 0,9.055 -32.104l-37.847,-26.351 34.337,-29.754a133.507,133.507 0,0 0,-13.312 -31.286l-45.241,4.079 7.279,-45.493a133.507,133.507 0,0 0,-29.436 -15.757l-33.004,33.184z"
android:strokeWidth="95.1572"
android:strokeColor="#00000000" />
<path
android:fillColor="#1a1a1a"
android:pathData="m256,256m-109.945,0a109.945,109.945 0,1 1,219.889 0,109.945 109.945,0 1,1 -219.889,0"
android:strokeWidth="42.2765"
android:strokeColor="#00000000" />
</group>
<group android:scaleX="0.14554687"
android:scaleY="0.14554687"
android:translateX="16.74"
android:translateY="16.74">
<path
android:pathData="m246.602,122.687a133.507,133.507 135,0 0,-31.176 6.167l-4.192,49.433 -48.867,-16.913a133.507,133.507 135,0 0,-18.64 23.358l30.287,43.006 -50.487,19.289a133.507,133.507 45,0 0,-0.288 8.779,133.507 133.507,45 0,0 1.477,19.802l52.573,13.936 -26.454,47.546a133.507,133.507 135,0 0,19.734 20.686l48.956,-22.989 9.967,51.715a133.507,133.507 0,0 0,27.252 2.812,133.507 133.507,135 0,0 2.456,-0.024l21.761,-46.993 38.569,31.332a133.507,133.507 0,0 0,26.03 -18.143l-12.71,-46.928 46.855,-0.744a133.507,133.507 0,0 0,9.055 -32.104l-37.847,-26.351 34.337,-29.754a133.507,133.507 0,0 0,-13.312 -31.286l-45.241,4.079 7.279,-45.493a133.507,133.507 0,0 0,-29.436 -15.757l-33.004,33.184z"
android:strokeWidth="95.1572"
android:fillColor="#1a1a1a"
android:strokeColor="#00000000"/>
<path
android:pathData="m256,256m-109.945,0a109.945,109.945 0,1 1,219.889 0,109.945 109.945,0 1,1 -219.889,0"
android:strokeWidth="42.2765"
android:fillColor="#1a1a1a"
android:strokeColor="#00000000"/>
</group>
</vector>
4 changes: 2 additions & 2 deletions common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Loading

0 comments on commit 72f4dfd

Please sign in to comment.