Add adaptive icon, and new SDK version.

tpcstld · May 27, 2018 · 346a0ee · 346a0ee
1 parent 40f1f36
commit 346a0ee
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 17 deletions.
diff --git a/2048/2048.iml b/2048/2048.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="2048" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="2048" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

diff --git a/2048/2048/build.gradle b/2048/2048/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.0'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
-        minSdkVersion 7
-        targetSdkVersion 22
-        versionCode 25
-        versionName "1.1.9"
+        minSdkVersion 14
+        targetSdkVersion 27
+        versionCode 26
+        versionName "1.1.10"
     }
     buildTypes {
         release {
@@ -19,5 +19,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:appcompat-v7:27.1.1'
 }
diff --git a/2048/2048/src/main/java/com/tpcstld/twozerogame/MainActivity.java b/2048/2048/src/main/java/com/tpcstld/twozerogame/MainActivity.java
@@ -3,11 +3,10 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
-import android.view.Window;
 
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
     private static final String WIDTH = "width";
     private static final String HEIGHT = "height";
@@ -59,6 +58,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 
     @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
         savedInstanceState.putBoolean("hasState", true);
         save();
     }

diff --git a/2048/2048/src/main/res/drawable-anydpi/logo_2048.xml b/2048/2048/src/main/res/drawable-anydpi/logo_2048.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_background" />
+    <foreground android:drawable="@mipmap/icon_foreground" />
+</adaptive-icon>
diff --git a/2048/2048/src/main/res/mipmap-hdpi/icon_foreground.png b/2048/2048/src/main/res/mipmap-hdpi/icon_foreground.png
diff --git a/2048/2048/src/main/res/mipmap-mdpi/icon_foreground.png b/2048/2048/src/main/res/mipmap-mdpi/icon_foreground.png
diff --git a/2048/2048/src/main/res/mipmap-xhdpi/icon_foreground.png b/2048/2048/src/main/res/mipmap-xhdpi/icon_foreground.png
diff --git a/2048/2048/src/main/res/mipmap-xxhdpi/icon_foreground.png b/2048/2048/src/main/res/mipmap-xxhdpi/icon_foreground.png
diff --git a/2048/2048/src/main/res/mipmap-xxxhdpi/icon_foreground.png b/2048/2048/src/main/res/mipmap-xxxhdpi/icon_foreground.png
diff --git a/2048/2048/src/main/res/values-v21/styles.xml b/2048/2048/src/main/res/values-v21/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:colorPrimaryDark">@color/status_background</item>
+    </style>
+</resources>
diff --git a/2048/2048/src/main/res/values/colors.xml b/2048/2048/src/main/res/values/colors.xml
@@ -4,4 +4,7 @@
     <color name="text_black">#776e65</color>
     <color name="text_brown">#d6cdc4</color>
     <color name="background">#faf8ef</color>
+    <color name="icon_background">#e8ba2e</color>
+
+    <color name="status_background">#bbada0</color>
 </resources>
diff --git a/2048/2048/src/main/res/values/styles.xml b/2048/2048/src/main/res/values/styles.xml
@@ -1,8 +1,5 @@
 <resources>
-
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
     </style>
-
 </resources>
diff --git a/2048/build.gradle b/2048/build.gradle
@@ -3,14 +3,20 @@
 buildscript {
     repositories {
         mavenCentral()
+        google()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
 allprojects {
     repositories {
         mavenCentral()
+        google()
     }
 }
diff --git a/2048/gradle/wrapper/gradle-wrapper.properties b/2048/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Dec 27 02:40:31 EST 2016
+#Sun May 27 16:41:23 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip