Skip to content

Commit 346a0ee

Browse files
tpcstldtpcstld
committed
Add adaptive icon, and new SDK version.
1 parent 40f1f36 commit 346a0ee

File tree

14 files changed

+35
-17
lines changed

14 files changed

+35
-17
lines changed

‎2048/2048.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>

‎2048/2048/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion '22.0.0'
4+
compileSdkVersion 27
5+
buildToolsVersion '27.0.3'
66

77
defaultConfig {
8-
minSdkVersion 7
9-
targetSdkVersion 22
10-
versionCode 25
11-
versionName "1.1.9"
8+
minSdkVersion 14
9+
targetSdkVersion 27
10+
versionCode 26
11+
versionName "1.1.10"
1212
}
1313
buildTypes {
1414
release {
@@ -19,5 +19,5 @@ android {
1919
}
2020

2121
dependencies {
22-
compile 'com.android.support:appcompat-v7:22.0.0'
22+
compile 'com.android.support:appcompat-v7:27.1.1'
2323
}

‎2048/2048/src/main/java/com/tpcstld/twozerogame/MainActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import android.content.SharedPreferences;
44
import android.os.Bundle;
55
import android.preference.PreferenceManager;
6-
import android.support.v7.app.ActionBarActivity;
6+
import android.support.v7.app.AppCompatActivity;
77
import android.view.KeyEvent;
8-
import android.view.Window;
98

10-
public class MainActivity extends ActionBarActivity {
9+
public class MainActivity extends AppCompatActivity {
1110

1211
private static final String WIDTH = "width";
1312
private static final String HEIGHT = "height";
@@ -59,6 +58,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
5958

6059
@Override
6160
public void onSaveInstanceState(Bundle savedInstanceState) {
61+
super.onSaveInstanceState(savedInstanceState);
6262
savedInstanceState.putBoolean("hasState", true);
6363
save();
6464
}

‎2048/2048/src/main/res/drawable-anydpi/logo_2048.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/icon_background" />
4+
<foreground android:drawable="@mipmap/icon_foreground" />
5+
</adaptive-icon>

‎2048/2048/src/main/res/mipmap-hdpi/icon_foreground.png

1.77 KB
Loading

‎2048/2048/src/main/res/mipmap-mdpi/icon_foreground.png

1.16 KB
Loading

‎2048/2048/src/main/res/mipmap-xhdpi/icon_foreground.png

2.4 KB
Loading

‎2048/2048/src/main/res/mipmap-xxhdpi/icon_foreground.png

3.92 KB
Loading

‎2048/2048/src/main/res/mipmap-xxxhdpi/icon_foreground.png

5.67 KB
Loading

‎2048/2048/src/main/res/values-v21/styles.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
5+
<item name="android:colorPrimaryDark">@color/status_background</item>
6+
</style>
7+
</resources>

‎2048/2048/src/main/res/values/colors.xml

+3
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<color name="text_black">#776e65</color>
55
<color name="text_brown">#d6cdc4</color>
66
<color name="background">#faf8ef</color>
7+
<color name="icon_background">#e8ba2e</color>
8+
9+
<color name="status_background">#bbada0</color>
710
</resources>

‎2048/2048/src/main/res/values/styles.xml

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<resources>
2-
32
<!-- Base application theme. -->
43
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
5-
<!-- Customize your theme here. -->
64
</style>
7-
85
</resources>

‎2048/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@
33
buildscript {
44
repositories {
55
mavenCentral()
6+
google()
7+
maven {
8+
url 'https://maven.google.com/'
9+
name 'Google'
10+
}
611
}
712
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.1'
13+
classpath 'com.android.tools.build:gradle:3.1.2'
914
}
1015
}
1116

1217
allprojects {
1318
repositories {
1419
mavenCentral()
20+
google()
1521
}
1622
}

‎2048/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Dec 27 02:40:31 EST 2016
1+
#Sun May 27 16:41:23 EDT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 commit comments

Comments
 (0)