simple renaming to std dir 'app'. fixed github ci file. Release 3.4.

scoutant · Apr 1, 2020 · b0fb72a · b0fb72a
1 parent 7c63189
commit b0fb72a
Show file tree

Hide file tree

Showing 103 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -23,4 +23,4 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew test assembleDebug
diff --git a/mobile/build.gradle → app/build.gradle b/mobile/build.gradle → app/build.gradle
diff --git a/mobile/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml
diff --git a/...n/java/org/scoutant/blokish/AppRater.java → ...n/java/org/scoutant/blokish/AppRater.java b/...n/java/org/scoutant/blokish/AppRater.java → ...n/java/org/scoutant/blokish/AppRater.java
diff --git a/...a/org/scoutant/blokish/BusyIndicator.java → ...a/org/scoutant/blokish/BusyIndicator.java b/...a/org/scoutant/blokish/BusyIndicator.java → ...a/org/scoutant/blokish/BusyIndicator.java
diff --git a/...ava/org/scoutant/blokish/ButtonsView.java → ...ava/org/scoutant/blokish/ButtonsView.java b/...ava/org/scoutant/blokish/ButtonsView.java → ...ava/org/scoutant/blokish/ButtonsView.java
diff --git a/...a/org/scoutant/blokish/EndGameDialog.java → ...a/org/scoutant/blokish/EndGameDialog.java b/...a/org/scoutant/blokish/EndGameDialog.java → ...a/org/scoutant/blokish/EndGameDialog.java
diff --git a/...n/java/org/scoutant/blokish/GameView.java → ...n/java/org/scoutant/blokish/GameView.java b/...n/java/org/scoutant/blokish/GameView.java → ...n/java/org/scoutant/blokish/GameView.java
diff --git a/.../main/java/org/scoutant/blokish/Help.java → .../main/java/org/scoutant/blokish/Help.java b/.../main/java/org/scoutant/blokish/Help.java → .../main/java/org/scoutant/blokish/Help.java
diff --git a/...java/org/scoutant/blokish/IconDialog.java → ...java/org/scoutant/blokish/IconDialog.java b/...java/org/scoutant/blokish/IconDialog.java → ...java/org/scoutant/blokish/IconDialog.java
diff --git a/...in/java/org/scoutant/blokish/PieceUI.java → ...in/java/org/scoutant/blokish/PieceUI.java b/...in/java/org/scoutant/blokish/PieceUI.java → ...in/java/org/scoutant/blokish/PieceUI.java
diff --git a/...java/org/scoutant/blokish/RateDialog.java → ...java/org/scoutant/blokish/RateDialog.java b/...java/org/scoutant/blokish/RateDialog.java → ...java/org/scoutant/blokish/RateDialog.java
diff --git a/...n/java/org/scoutant/blokish/Settings.java → ...n/java/org/scoutant/blokish/Settings.java b/...n/java/org/scoutant/blokish/Settings.java → ...n/java/org/scoutant/blokish/Settings.java
diff --git a/...va/org/scoutant/blokish/SplashScreen.java → ...va/org/scoutant/blokish/SplashScreen.java b/...va/org/scoutant/blokish/SplashScreen.java → ...va/org/scoutant/blokish/SplashScreen.java
diff --git a/...rc/main/java/org/scoutant/blokish/UI.java → ...rc/main/java/org/scoutant/blokish/UI.java b/...rc/main/java/org/scoutant/blokish/UI.java → ...rc/main/java/org/scoutant/blokish/UI.java
diff --git a/...n/java/org/scoutant/blokish/model/AI.java → ...n/java/org/scoutant/blokish/model/AI.java b/...n/java/org/scoutant/blokish/model/AI.java → ...n/java/org/scoutant/blokish/model/AI.java
diff --git a/...ava/org/scoutant/blokish/model/Board.java → ...ava/org/scoutant/blokish/model/Board.java b/...ava/org/scoutant/blokish/model/Board.java → ...ava/org/scoutant/blokish/model/Board.java
diff --git a/...java/org/scoutant/blokish/model/Game.java → ...java/org/scoutant/blokish/model/Game.java b/...java/org/scoutant/blokish/model/Game.java → ...java/org/scoutant/blokish/model/Game.java
diff --git a/...java/org/scoutant/blokish/model/Move.java → ...java/org/scoutant/blokish/model/Move.java b/...java/org/scoutant/blokish/model/Move.java → ...java/org/scoutant/blokish/model/Move.java
diff --git a/...ava/org/scoutant/blokish/model/Piece.java → ...ava/org/scoutant/blokish/model/Piece.java b/...ava/org/scoutant/blokish/model/Piece.java → ...ava/org/scoutant/blokish/model/Piece.java
diff --git a/...va/org/scoutant/blokish/model/Square.java → ...va/org/scoutant/blokish/model/Square.java b/...va/org/scoutant/blokish/model/Square.java → ...va/org/scoutant/blokish/model/Square.java
diff --git a/mobile/src/main/res/anim/wave_scale.xml → app/src/main/res/anim/wave_scale.xml b/mobile/src/main/res/anim/wave_scale.xml → app/src/main/res/anim/wave_scale.xml
diff --git a/mobile/src/main/res/drawable-ldpi/love.png → app/src/main/res/drawable-ldpi/love.png b/mobile/src/main/res/drawable-ldpi/love.png → app/src/main/res/drawable-ldpi/love.png
diff --git a/.../src/main/res/drawable-ldpi/playstore.png → app/src/main/res/drawable-ldpi/playstore.png b/.../src/main/res/drawable-ldpi/playstore.png → app/src/main/res/drawable-ldpi/playstore.png
diff --git a/...e/src/main/res/drawable-xlarge/cancel.png → app/src/main/res/drawable-xlarge/cancel.png b/...e/src/main/res/drawable-xlarge/cancel.png → app/src/main/res/drawable-xlarge/cancel.png
diff --git a/...rc/main/res/drawable-xlarge/checkmark.png → ...rc/main/res/drawable-xlarge/checkmark.png b/...rc/main/res/drawable-xlarge/checkmark.png → ...rc/main/res/drawable-xlarge/checkmark.png
diff --git a/mobile/src/main/res/drawable/blokish.gif → app/src/main/res/drawable/blokish.gif b/mobile/src/main/res/drawable/blokish.gif → app/src/main/res/drawable/blokish.gif
diff --git a/mobile/src/main/res/drawable/blokish2.png → app/src/main/res/drawable/blokish2.png b/mobile/src/main/res/drawable/blokish2.png → app/src/main/res/drawable/blokish2.png
diff --git a/...le/src/main/res/drawable/blokish_21_1.png → app/src/main/res/drawable/blokish_21_1.png b/...le/src/main/res/drawable/blokish_21_1.png → app/src/main/res/drawable/blokish_21_1.png
diff --git a/...res/drawable/blokish_21_youtube_arrow.png → ...res/drawable/blokish_21_youtube_arrow.png b/...res/drawable/blokish_21_youtube_arrow.png → ...res/drawable/blokish_21_youtube_arrow.png
diff --git a/...rc/main/res/drawable/blokish_2_pieces.png → ...rc/main/res/drawable/blokish_2_pieces.png b/...rc/main/res/drawable/blokish_2_pieces.png → ...rc/main/res/drawable/blokish_2_pieces.png
diff --git a/...rc/main/res/drawable/blokish_dragging.png → ...rc/main/res/drawable/blokish_dragging.png b/...rc/main/res/drawable/blokish_dragging.png → ...rc/main/res/drawable/blokish_dragging.png
diff --git a/...rc/main/res/drawable/blokish_rotating.png → ...rc/main/res/drawable/blokish_rotating.png b/...rc/main/res/drawable/blokish_rotating.png → ...rc/main/res/drawable/blokish_rotating.png
diff --git a/.../src/main/res/drawable/blokish_scroll.png → app/src/main/res/drawable/blokish_scroll.png b/.../src/main/res/drawable/blokish_scroll.png → app/src/main/res/drawable/blokish_scroll.png
diff --git a/...e/src/main/res/drawable/blokish_title.png → app/src/main/res/drawable/blokish_title.png b/...e/src/main/res/drawable/blokish_title.png → app/src/main/res/drawable/blokish_title.png
diff --git a/mobile/src/main/res/drawable/blue.png → app/src/main/res/drawable/blue.png b/mobile/src/main/res/drawable/blue.png → app/src/main/res/drawable/blue.png
diff --git a/mobile/src/main/res/drawable/blue_bold.png → app/src/main/res/drawable/blue_bold.png b/mobile/src/main/res/drawable/blue_bold.png → app/src/main/res/drawable/blue_bold.png
diff --git a/mobile/src/main/res/drawable/bol_blauw.png → app/src/main/res/drawable/bol_blauw.png b/mobile/src/main/res/drawable/bol_blauw.png → app/src/main/res/drawable/bol_blauw.png
diff --git a/mobile/src/main/res/drawable/bol_geel.png → app/src/main/res/drawable/bol_geel.png b/mobile/src/main/res/drawable/bol_geel.png → app/src/main/res/drawable/bol_geel.png
diff --git a/mobile/src/main/res/drawable/bol_groen.png → app/src/main/res/drawable/bol_groen.png b/mobile/src/main/res/drawable/bol_groen.png → app/src/main/res/drawable/bol_groen.png
diff --git a/mobile/src/main/res/drawable/bol_rood.png → app/src/main/res/drawable/bol_rood.png b/mobile/src/main/res/drawable/bol_rood.png → app/src/main/res/drawable/bol_rood.png
diff --git a/...res/drawable/bullet_ball_glass_yellow.png → ...res/drawable/bullet_ball_glass_yellow.png b/...res/drawable/bullet_ball_glass_yellow.png → ...res/drawable/bullet_ball_glass_yellow.png
diff --git a/mobile/src/main/res/drawable/cancel.png → app/src/main/res/drawable/cancel.png b/mobile/src/main/res/drawable/cancel.png → app/src/main/res/drawable/cancel.png
diff --git a/mobile/src/main/res/drawable/checkmark.png → app/src/main/res/drawable/checkmark.png b/mobile/src/main/res/drawable/checkmark.png → app/src/main/res/drawable/checkmark.png
diff --git a/...le/src/main/res/drawable/checkmark_48.png → app/src/main/res/drawable/checkmark_48.png b/...le/src/main/res/drawable/checkmark_48.png → app/src/main/res/drawable/checkmark_48.png
diff --git a/mobile/src/main/res/drawable/disc.xml → app/src/main/res/drawable/disc.xml b/mobile/src/main/res/drawable/disc.xml → app/src/main/res/drawable/disc.xml
diff --git a/mobile/src/main/res/drawable/disc_ok.xml → app/src/main/res/drawable/disc_ok.xml b/mobile/src/main/res/drawable/disc_ok.xml → app/src/main/res/drawable/disc_ok.xml
diff --git a/mobile/src/main/res/drawable/green.png → app/src/main/res/drawable/green.png b/mobile/src/main/res/drawable/green.png → app/src/main/res/drawable/green.png
diff --git a/mobile/src/main/res/drawable/green_bold.png → app/src/main/res/drawable/green_bold.png b/mobile/src/main/res/drawable/green_bold.png → app/src/main/res/drawable/green_bold.png
diff --git a/mobile/src/main/res/drawable/help_48.png → app/src/main/res/drawable/help_48.png b/mobile/src/main/res/drawable/help_48.png → app/src/main/res/drawable/help_48.png
diff --git a/mobile/src/main/res/drawable/left_48.png → app/src/main/res/drawable/left_48.png b/mobile/src/main/res/drawable/left_48.png → app/src/main/res/drawable/left_48.png
diff --git a/mobile/src/main/res/drawable/orange.png → app/src/main/res/drawable/orange.png b/mobile/src/main/res/drawable/orange.png → app/src/main/res/drawable/orange.png
diff --git a/mobile/src/main/res/drawable/orange_bold.png → app/src/main/res/drawable/orange_bold.png b/mobile/src/main/res/drawable/orange_bold.png → app/src/main/res/drawable/orange_bold.png
diff --git a/.../src/main/res/drawable/preferences_48.png → app/src/main/res/drawable/preferences_48.png b/.../src/main/res/drawable/preferences_48.png → app/src/main/res/drawable/preferences_48.png
diff --git a/mobile/src/main/res/drawable/red.png → app/src/main/res/drawable/red.png b/mobile/src/main/res/drawable/red.png → app/src/main/res/drawable/red.png
diff --git a/mobile/src/main/res/drawable/red_bold.png → app/src/main/res/drawable/red_bold.png b/mobile/src/main/res/drawable/red_bold.png → app/src/main/res/drawable/red_bold.png
diff --git a/mobile/src/main/res/drawable/restart_48.png → app/src/main/res/drawable/restart_48.png b/mobile/src/main/res/drawable/restart_48.png → app/src/main/res/drawable/restart_48.png
diff --git a/...src/main/res/drawable/spinner_blue_76.png → ...src/main/res/drawable/spinner_blue_76.png b/...src/main/res/drawable/spinner_blue_76.png → ...src/main/res/drawable/spinner_blue_76.png
diff --git a/mobile/src/main/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml
diff --git a/mobile/src/main/res/layout/alert_dialog.xml → app/src/main/res/layout/alert_dialog.xml b/mobile/src/main/res/layout/alert_dialog.xml → app/src/main/res/layout/alert_dialog.xml
diff --git a/...src/main/res/layout/alert_dialog_holo.xml → ...src/main/res/layout/alert_dialog_holo.xml b/...src/main/res/layout/alert_dialog_holo.xml → ...src/main/res/layout/alert_dialog_holo.xml
diff --git a/mobile/src/main/res/layout/app_bar_main.xml → app/src/main/res/layout/app_bar_main.xml b/mobile/src/main/res/layout/app_bar_main.xml → app/src/main/res/layout/app_bar_main.xml
diff --git a/mobile/src/main/res/layout/endgame.xml → app/src/main/res/layout/endgame.xml b/mobile/src/main/res/layout/endgame.xml → app/src/main/res/layout/endgame.xml
diff --git a/mobile/src/main/res/layout/help.xml → app/src/main/res/layout/help.xml b/mobile/src/main/res/layout/help.xml → app/src/main/res/layout/help.xml
diff --git a/...e/src/main/res/layout/nav_header_main.xml → app/src/main/res/layout/nav_header_main.xml b/...e/src/main/res/layout/nav_header_main.xml → app/src/main/res/layout/nav_header_main.xml
diff --git a/mobile/src/main/res/layout/rate.xml → app/src/main/res/layout/rate.xml b/mobile/src/main/res/layout/rate.xml → app/src/main/res/layout/rate.xml
diff --git a/mobile/src/main/res/layout/simple_dialog.xml → app/src/main/res/layout/simple_dialog.xml b/mobile/src/main/res/layout/simple_dialog.xml → app/src/main/res/layout/simple_dialog.xml
diff --git a/mobile/src/main/res/layout/splashscreen.xml → app/src/main/res/layout/splashscreen.xml b/mobile/src/main/res/layout/splashscreen.xml → app/src/main/res/layout/splashscreen.xml
diff --git a/mobile/src/main/res/layout/tabs.xml → app/src/main/res/layout/tabs.xml b/mobile/src/main/res/layout/tabs.xml → app/src/main/res/layout/tabs.xml
diff --git a/mobile/src/main/res/menu/drawer_menu.xml → app/src/main/res/menu/drawer_menu.xml b/mobile/src/main/res/menu/drawer_menu.xml → app/src/main/res/menu/drawer_menu.xml
diff --git a/mobile/src/main/res/values-de/arrays.xml → app/src/main/res/values-de/arrays.xml b/mobile/src/main/res/values-de/arrays.xml → app/src/main/res/values-de/arrays.xml
diff --git a/mobile/src/main/res/values-de/strings.xml → app/src/main/res/values-de/strings.xml b/mobile/src/main/res/values-de/strings.xml → app/src/main/res/values-de/strings.xml
diff --git a/mobile/src/main/res/values-es/arrays.xml → app/src/main/res/values-es/arrays.xml b/mobile/src/main/res/values-es/arrays.xml → app/src/main/res/values-es/arrays.xml
diff --git a/mobile/src/main/res/values-es/strings.xml → app/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml → app/src/main/res/values-es/strings.xml
diff --git a/mobile/src/main/res/values-fr/arrays.xml → app/src/main/res/values-fr/arrays.xml b/mobile/src/main/res/values-fr/arrays.xml → app/src/main/res/values-fr/arrays.xml
diff --git a/mobile/src/main/res/values-fr/strings.xml → app/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml → app/src/main/res/values-fr/strings.xml
diff --git a/mobile/src/main/res/values-nl/strings.xml → app/src/main/res/values-nl/strings.xml b/mobile/src/main/res/values-nl/strings.xml → app/src/main/res/values-nl/strings.xml
diff --git a/...le/src/main/res/values-pt-rBR/strings.xml → app/src/main/res/values-pt-rBR/strings.xml b/...le/src/main/res/values-pt-rBR/strings.xml → app/src/main/res/values-pt-rBR/strings.xml
diff --git a/mobile/src/main/res/values-ru/arrays.xml → app/src/main/res/values-ru/arrays.xml b/mobile/src/main/res/values-ru/arrays.xml → app/src/main/res/values-ru/arrays.xml
diff --git a/mobile/src/main/res/values-ru/strings.xml → app/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml → app/src/main/res/values-ru/strings.xml
diff --git a/mobile/src/main/res/values-sv/arrays.xml → app/src/main/res/values-sv/arrays.xml b/mobile/src/main/res/values-sv/arrays.xml → app/src/main/res/values-sv/arrays.xml
diff --git a/mobile/src/main/res/values-sv/strings.xml → app/src/main/res/values-sv/strings.xml b/mobile/src/main/res/values-sv/strings.xml → app/src/main/res/values-sv/strings.xml
diff --git a/mobile/src/main/res/values/arrays.xml → app/src/main/res/values/arrays.xml b/mobile/src/main/res/values/arrays.xml → app/src/main/res/values/arrays.xml
diff --git a/mobile/src/main/res/values/colors.xml → app/src/main/res/values/colors.xml b/mobile/src/main/res/values/colors.xml → app/src/main/res/values/colors.xml
diff --git a/mobile/src/main/res/values/colors_theme.xml → app/src/main/res/values/colors_theme.xml b/mobile/src/main/res/values/colors_theme.xml → app/src/main/res/values/colors_theme.xml
diff --git a/mobile/src/main/res/values/dimens-text.xml → app/src/main/res/values/dimens-text.xml b/mobile/src/main/res/values/dimens-text.xml → app/src/main/res/values/dimens-text.xml
diff --git a/mobile/src/main/res/values/dimens.xml → app/src/main/res/values/dimens.xml b/mobile/src/main/res/values/dimens.xml → app/src/main/res/values/dimens.xml
diff --git a/mobile/src/main/res/values/strings.xml → app/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml → app/src/main/res/values/strings.xml
diff --git a/mobile/src/main/res/values/styles.xml → app/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml → app/src/main/res/values/styles.xml
diff --git a/...e/src/main/res/values/styles_calendar.xml → app/src/main/res/values/styles_calendar.xml b/...e/src/main/res/values/styles_calendar.xml → app/src/main/res/values/styles_calendar.xml
diff --git a/mobile/src/main/res/values/styles_drawer.xml → app/src/main/res/values/styles_drawer.xml b/mobile/src/main/res/values/styles_drawer.xml → app/src/main/res/values/styles_drawer.xml
diff --git a/mobile/src/main/res/values/themes.xml → app/src/main/res/values/themes.xml b/mobile/src/main/res/values/themes.xml → app/src/main/res/values/themes.xml
diff --git a/mobile/src/main/res/xml-de/preferences.xml → app/src/main/res/xml-de/preferences.xml b/mobile/src/main/res/xml-de/preferences.xml → app/src/main/res/xml-de/preferences.xml
diff --git a/mobile/src/main/res/xml-es/preferences.xml → app/src/main/res/xml-es/preferences.xml b/mobile/src/main/res/xml-es/preferences.xml → app/src/main/res/xml-es/preferences.xml
diff --git a/mobile/src/main/res/xml-fr/preferences.xml → app/src/main/res/xml-fr/preferences.xml b/mobile/src/main/res/xml-fr/preferences.xml → app/src/main/res/xml-fr/preferences.xml
diff --git a/mobile/src/main/res/xml-ru/preferences.xml → app/src/main/res/xml-ru/preferences.xml b/mobile/src/main/res/xml-ru/preferences.xml → app/src/main/res/xml-ru/preferences.xml
diff --git a/mobile/src/main/res/xml/preferences.xml → app/src/main/res/xml/preferences.xml b/mobile/src/main/res/xml/preferences.xml → app/src/main/res/xml/preferences.xml
diff --git a/...va/org/scoutant/blokish/model/AITest.java → ...va/org/scoutant/blokish/model/AITest.java b/...va/org/scoutant/blokish/model/AITest.java → ...va/org/scoutant/blokish/model/AITest.java
diff --git a/...org/scoutant/blokish/model/BoardTest.java → ...org/scoutant/blokish/model/BoardTest.java b/...org/scoutant/blokish/model/BoardTest.java → ...org/scoutant/blokish/model/BoardTest.java
diff --git a/.../org/scoutant/blokish/model/GameTest.java → .../org/scoutant/blokish/model/GameTest.java b/.../org/scoutant/blokish/model/GameTest.java → .../org/scoutant/blokish/model/GameTest.java
diff --git a/...org/scoutant/blokish/model/PieceTest.java → ...org/scoutant/blokish/model/PieceTest.java b/...org/scoutant/blokish/model/PieceTest.java → ...org/scoutant/blokish/model/PieceTest.java
diff --git a/lint.xml b/lint.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':mobile'
+include ':app'