Merge branch 'update-android-studio' into 'master'

Regenerate project with updated Android Studio, target SDK 27.

.gitignore

@@ -1,12 +1,11 @@
+*.iml
+.gradle
 /local.properties
-/.idea/workspace.xml
+/.idea/caches/build_file_checksums.ser
 /.idea/libraries
-*.iml
-
-*.gradle
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
 /build
-/app/build
 /captures
-
-.DS_Store
-Thumbs.db
+.externalNativeBuild

app/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle

@@ -0,0 +1,28 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 27
+    defaultConfig {
+        applicationId "fr.remram.taquindroid"
+        minSdkVersion 14
+        targetSdkVersion 27
+        versionCode 1004000
+        versionName "1.4"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}

app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app/src/main/AndroidManifest.xml

@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="fr.remram.taquindroid"
-        android:versionCode="1003000"
-        android:versionName="1.3">
-    <uses-sdk android:minSdkVersion="5"/>
+        package="fr.remram.taquindroid">
 
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
+    <application
+            android:allowBackup="true"
+            android:icon="@drawable/icon"
+            android:label="@string/app_name"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme">
         <activity android:name=".Menu"
                 android:configChanges="orientation"
                 android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".Options"
-                android:configChanges="orientation"/>
+            android:configChanges="orientation" />
         <activity android:name=".Game"
-                android:configChanges="orientation"/>
+            android:configChanges="orientation" />
         <activity android:name=".EndGame"
-                android:configChanges="orientation"/>
+            android:configChanges="orientation" />
     </application>
 </manifest>

app/src/main/res/layout/menu.xml

@@ -12,7 +12,8 @@
             android:layout_gravity="center_horizontal"
             android:text="@string/menu_play"
             android:textSize="20sp"
-            android:background="@drawable/play_button"/>
+            android:background="@drawable/play_button"
+            android:textColor="#000000"/>
     <FrameLayout android:layout_weight="2"
             android:layout_width="200dp"
             android:layout_height="10dp"/>
@@ -22,7 +23,8 @@
             android:layout_gravity="center_horizontal"
             android:text="@string/menu_options"
             android:textSize="20sp"
-            android:background="@drawable/other_button"/>
+            android:background="@drawable/other_button"
+            android:textColor="#000000"/>
     <FrameLayout android:layout_weight="2"
             android:layout_width="200dp"
             android:layout_height="10dp"/>
@@ -32,7 +34,8 @@
             android:layout_gravity="center_horizontal"
             android:text="@string/menu_quit"
             android:textSize="20sp"
-            android:background="@drawable/quit_button"/>
+            android:background="@drawable/quit_button"
+            android:textColor="#000000"/>
     <FrameLayout android:layout_weight="1"
             android:layout_width="200dp"
             android:layout_height="10dp"/>

app/src/main/res/values/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>

app/src/main/res/values/styles.xml

@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="ThemeOverlay.AppCompat.Dark">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>

build.gradle

@@ -0,0 +1,27 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

gradle.properties

@@ -0,0 +1,15 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# 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.
+org.gradle.jvmargs=-Xmx1536m
+# 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
+
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip