Pretty significant changes for a small app that were inevitably coming

.gitignore

@@ -1,12 +1,3 @@
-# built application files
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
 # generated files
 bin/
 gen/
@@ -32,3 +23,5 @@ build
 .project
 .settings/
 project.properties
+
+assets/2048/*

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "2048"]
-	path = 2048
+[submodule "assets/2048"]
+	path = assets/2048
 	url = https://github.com/uberspot/2048.git

.travis.yml

@@ -1,17 +1,23 @@
 language: android
 
 jdk:
-    - oraclejdk8
+  - oraclejdk8
 
 android:
-    components:
-        - tools
-        - platform-tools
-        - build-tools-28.0.3
-        - android-28
+  components:
+    - tools
+    - platform-tools
+    - tools
+    - build-tools-28.0.3
+    - android-28
 
-        - extra-android-support
-        - extra-android-m2repository
+    - extra-android-support
+    - extra-android-m2repository
+
+  licenses:
+    - 'android-sdk-license-.+'
+    - 'android-sdk-preview-license-.+'
+    - '-.+'
 
 script:
-    - ./gradlew build
+  - ./gradlew build

app/src/main/AndroidManifest.xml → AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name="com.uberspot.a2048.MainActivity"
+            android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:screenOrientation="portrait">

README.md

@@ -11,10 +11,14 @@ a quick access icon for my smartphone.
 Feel free to contribute with pull requests to the original project by Gabriele, or to this one
 if you have any Android-specific improvements in mind.
 
-<a href="https://f-droid.org/packages/com.uberspot.a2048/" target="_blank">
-<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="100"/></a>
-<a href="https://play.google.com/store/apps/details?id=com.uberspot.a2048" target="_blank">
-<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Google Play" height="100"/></a>
+<a href="https://play.google.com/store/apps/details?id=com.uberspot.a2048">
+    <img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+        alt="Get it on Google Play" height="80"/>
+</a>
+<a href="https://f-droid.org/packages/com.uberspot.a2048/">
+    <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+        alt="Get it on F-Droid" height="80"/>
+</a>
 
 ## Building
 

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     repositories {
-        jcenter()
         google()
-        // maven { "https://oss.sonatype.org/content/repositories/snapshots/" }
+        jcenter()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 
     dependencies {
@@ -12,12 +12,56 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
-        // maven { "https://oss.sonatype.org/content/repositories/snapshots/" }
+        jcenter()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    }
+}
+
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
+
+    defaultConfig {
+        applicationId "com.uberspot.a2048"
+        minSdkVersion 14
+        targetSdkVersion 28
+        versionCode 25
+        versionName "2.2"
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    lintOptions {
+        disable 'GoogleAppIndexingWarning'
+    }
+
+    compileOptions {
+        encoding = 'UTF-8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+dependencies {
+    implementation 'de.cketti.library.changelog:ckchangelog-legacy-dialog:2.0.0-SNAPSHOT'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

metadata/en-US/full_description.txt

@@ -5,8 +5,9 @@
 This is the Android port of the 2048 game made by Gabriele Cirulli https://github.com/gabrielecirulli/2048
 It's just a WebView that loads the locally stored HTML files of the original game.
 No ads, and no permissions required. Just open-source. :)
+
 I just wanted to make it instantly playable without internet, and with a quick access icon for my smartphone.
-It is a bit slower than native code since everything runs in an android webview.
+It is a bit slower than native code since everything runs in a WebView.
 If you want, you can contribute fixes/speedups here: https://github.com/uberspot/2048
 
 Long touch for 3+ seconds anywhere on the game if you want to toggle the fullscreen mode.

res/raw/changelog_master.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<changelog xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingDefaultResource">
+    <release
+        version="2.2"
+        versioncode="25">
+        <change>(2.2) Bumped minSdkVersion from 8 (Froyo) to 14 (ICS)</change>
+        <change>(2.2) Update changelog library that had breaking changes</change>
+        <change>(2.1) Detect and utilise the phone's system language (thank you BValeo)</change>
+        <change>(2.1) Added Slovenian translation (thank you urmatej)</change>
+        <change>(2.1) Added Czech translation (thank you Mongata)</change>
+        <change>(2.1) Added Italian translation (thank you RyuzakiKK)</change>
+    </release>
+    <release
+        version="2.1"
+        versioncode="24">
+        <change>~~Bad build. This version of the app crashed on startup due to a user-made (*cough*
+            Taco *cough*) error that occurred when rearranging the project. Changes introduced in
+            2.1 will be mentioned in the 2.2 changelog.~~
+        </change>
+    </release>
+    <release
+        version="2.08"
+        versioncode="23">
+        <change>Added Esperanto and Dutch (thx Robin van der Vliet)</change>
+        <change>Fix bug with floating windows (thx diogopereira)</change>
+    </release>
+    <release
+        version="2.06"
+        versioncode="22">
+        <change>Limit undo button to last 50 moves to avoid using too much memory</change>
+    </release>
+    <release
+        version="2.05"
+        versioncode="21">
+        <change>Added changelog in app</change>
+    </release>
+    <release
+        version="2.0"
+        versioncode="20">
+        <change>Added undo button (thx to fraggerfox on GitHub)</change>
+    </release>
+    <release
+        version="1.96"
+        versioncode="19">
+        <change>Rebuilt APK with new buildTools</change>
+    </release>
+    <release
+        version="1.95"
+        versioncode="18">
+        <change>Added German, Spanish, Polish, Serbian translations (thx to contributors on GitHub)
+        </change>
+        <change>Added experimental night mode button</change>
+        <change>Minor optimizations to responsiveness</change>
+    </release>
+    <release
+        version="1.91"
+        versioncode="18">
+        <change>Added Greek and French app translation; minor build improvements</change>
+    </release>
+</changelog>