Android 10 and AndroidX Jetpack libraries refactoring. Github CI build.

Author: scoutant

.github/workflows/gradle.yml

@@ -0,0 +1,26 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build

README.md

@@ -8,8 +8,6 @@ Open-source Android implementation of the popular board game Blokus. With very s
 
 <a href="https://f-droid.org/packages/org.scoutant.blokish" target="_blank">
 <img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"/></a>
-<a href="https://play.google.com/store/apps/details?id=org.scoutant.blokish" target="_blank">
-<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="100"/></a>
 
 #### The rules
 Blokus is family game involving four players and a board with 20 x 20 squares. Like chess or checkers, it's a game for which at any time you can see your opponent's pieces.
@@ -54,6 +52,11 @@ Stephane Coutant, http://scoutant.org
 
 # Changelog
 
+## v3.4, 2020/04 : Android 10 and AndroidX Jetpack libraries refactoring
+ * build with Android 10, from nom on : available on Android 7+
+ * refactored Manifest and source dir
+ * Github-CI build with tests
+
 ## v3.3, 2018/06 : locale nl, Android 8.1
  * locale nl, credits to Vistaus
  * now targetting Android 8.1
@@ -67,12 +70,9 @@ Stephane Coutant, http://scoutant.org
  * better german translation
 
 ## v3.0, 2015/11 : Network multi-player support with PlayHub
- * Network multi-player framework PlayHub. https://bitbucket.org/playhub/playhublibrary, licence GPL v3. Live on https://play.google.com/store/apps/details?id=com.playhub.
+ * Network multi-player framework PlayHub.
  * build with Sdk Android 6.0
 
-![blokish](http://scoutant.org/blokish/blokish-playhub-menu.png)
-
-
 ## v2.4, 2015/06 : Move validation possible directly on piece.
 * Smarter move validation : vibration and green color as soon move is valid
 * Validation by double tap on piece

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

gradle.properties

@@ -0,0 +1,19 @@
+## Project-wide Gradle settings.
+#
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Fri May 27 16:34:25 CEST 2016
+
+# android.useDeprecatedNdk=true
+android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

mobile/build.gradle

@@ -1,26 +1,36 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.2"
-    project.archivesBaseName = "blokish-3.4" // TODO sync with Manifest
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
+    project.archivesBaseName = "blokish-3.4" // sync with Manifest
+
+    defaultConfig {
+        applicationId "org.scoutant.blokish"
+        minSdkVersion 24 // Android 7
+        targetSdkVersion 29 // Android 10
+        versionCode 22
+        versionName "3.4"
+        project.ext.set("archivesBaseName", "blokish-" + defaultConfig.versionName)
+    }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     dependencies {
-        testImplementation 'junit:junit:4.12'
+        testImplementation 'junit:junit:4.13'
 
-        implementation 'com.android.support:appcompat-v7:28.0.0'
-        implementation 'com.android.support:support-v4:28.0.0'
-        implementation 'com.android.support:design:28.0.0'
+        implementation 'com.google.android.material:material:1.1.0'
+        implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+        implementation 'androidx.appcompat:appcompat:1.1.0'
+        implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+//        implementation 'androidx.preference:preference:1.1.0' // TODO migrate preferences
 
     }
 
     lintOptions {
-//        checkReleaseBuilds false
         abortOnError false
     }
 

mobile/src/main/AndroidManifest.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.scoutant.blokish" 
-	android:versionCode="22" android:versionName="3.4"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	package="org.scoutant.blokish"
 	>
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="28" />
-    
 	<uses-permission android:name="android.permission.VIBRATE"/>
 
 	<uses-feature android:name="android.hardware.screen.portrait" android:required="true"/> 
@@ -17,8 +16,8 @@
 		<activity android:name=".UI"
 			android:theme="@style/Theme.AppCompat.Light.NoActionBar"
 			android:exported="true"
-		    android:screenOrientation="portrait" 
-		    >
+		    android:screenOrientation="portrait"
+			tools:ignore="LockedOrientationActivity">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -28,11 +27,11 @@
 		    android:screenOrientation="portrait" 
 		    android:parentActivityName=".UI"
 				  android:theme="@style/Theme.Holo.Calendar"
-		    />
+			tools:ignore="LockedOrientationActivity" />
 		<activity android:name=".Help" android:label="Help" 
 		    android:screenOrientation="portrait" 
 		    android:parentActivityName=".UI"
-		    />
+			tools:ignore="LockedOrientationActivity" />
 	</application>
 </manifest>
 <!-- TODO issue #4 : when same score : last player wins : adapt the message. -->

mobile/src/main/java/org/scoutant/blokish/GameView.java

@@ -22,7 +22,6 @@
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceManager;
-import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.view.Display;
 import android.view.Gravity;
@@ -45,6 +44,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import androidx.core.content.ContextCompat;
+
 /**
  * For DnD approach, refer to http://blog.scoutant.org/index.php?post/2011/02/Approche-naturelle-de-Drag-and-Drop-en-Android
  */
@@ -131,18 +132,6 @@ public GameView(Context context) {
 			}
 		}
 
-//    View extraMenu = findViewById(R.id.extra_menu_button);
-//    if (extraMenu!=null && !ViewConfiguration.get(context).hasPermanentMenuKey()) {
-//      extraMenu.setVisibility(View.VISIBLE);
-//      extraMenu.setOnClickListener( new OnClickListener() {
-//          @Override
-//          public void onClick(View v) {
-//            ui.openOptionsMenu();
-//          }
-//        }
-//      );
-//    }
-
 		// progress indicator
 		View iView = new View(context);
 		iView.setLayoutParams(new FrameLayout.LayoutParams(150, 150, Gravity.CENTER_VERTICAL|Gravity.CENTER_HORIZONTAL));

mobile/src/main/java/org/scoutant/blokish/PieceUI.java

@@ -25,7 +25,6 @@
 import android.os.SystemClock;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
-import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.view.Display;
 import android.view.Gravity;
@@ -44,6 +43,8 @@
 
 import java.util.Calendar;
 
+import androidx.core.content.ContextCompat;
+
 public class PieceUI extends FrameLayout implements OnTouchListener, OnLongClickListener, Comparable<PieceUI> {
 
   public static final int PADDING = 4;

mobile/src/main/java/org/scoutant/blokish/Settings.java

@@ -18,7 +18,6 @@
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 
-// TODO refactor settings ! i18n and better layout
 /** Magaging app preferences following tutorial : http://jetpad.org/2011/01/creating-a-preference-activity-in-android */
 public class Settings extends PreferenceActivity {
 	@Override