Skip to content

Commit

Permalink
Merge pull request #242 from lucasnlm/update-app
Browse files Browse the repository at this point in the history 
Update app
  • Loading branch information
@lucasnlm
lucasnlm authored Feb 17, 2021
2 parents 79da0bd + 8957ba0 commit 58b6870
Show file tree
Hide file tree
Showing 30 changed files with 203 additions and 183 deletions.
4 changes: 2 additions & 2 deletions about/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
defaultConfig {
minSdkVersion 21
targetSdkVersion 30
versionCode 900001
versionName '9.0.0'
versionCode 900011
versionName '9.0.1'

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {

defaultConfig {
// versionCode and versionName must be hardcoded to support F-droid
versionCode 900001
versionName '9.0.0'
versionCode 900011
versionName '9.0.1'
minSdkVersion 21
targetSdkVersion 30
multiDexEnabled true
Expand Down
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>
4 changes: 2 additions & 2 deletions common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {

defaultConfig {
// versionCode and versionName must be hardcoded to support F-droid
versionCode 900001
versionName '9.0.0'
versionCode 900011
versionName '9.0.1'
minSdkVersion 21
targetSdkVersion 30
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand Down
Loading

0 comments on commit 58b6870

Please sign in to comment.