From f4aa9f7f231797aeb4e4cbd72afa6b0efc1ecaaf Mon Sep 17 00:00:00 2001
From: Emily Beckers <ebeckers@skillz.com>
Date: Mon, 7 Jan 2019 14:17:42 -0500
Subject: [PATCH] Install Skillz framework

Make changes necessary to import Skillz framework and compile with framework added. At this point, the app launches directly into the game and is not yet displaying the Skillz interface.
---
 2048/2048.iml                                 |  4 ++--
 2048/2048/build.gradle                        | 19 ++++++++++++++++++-
 2048/2048/proguard-rules.txt                  | 11 ++++++++++-
 2048/2048/src/main/AndroidManifest.xml        |  8 ++++++++
 .../com/tpcstld/twozerogame/MainActivity.java |  5 +++--
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/2048/2048.iml b/2048/2048.iml
index f99f9d5..3c86abb 100644
--- a/2048/2048.iml
+++ b/2048/2048.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
@@ -16,4 +16,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/2048/2048/build.gradle b/2048/2048/build.gradle
index 9a4ec87..eb49239 100644
--- a/2048/2048/build.gradle
+++ b/2048/2048/build.gradle
@@ -5,19 +5,36 @@ android {
     buildToolsVersion '27.0.3'
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 19
         targetSdkVersion 27
         versionCode 27
         versionName "1.1.11"
+
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    repositories {
+        maven {
+            url "http://nexus.skillz.com/content/groups/public/"
+        }
+    }
 }
 
 dependencies {
     compile 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.skillz.sdk:skillz-sdk-android:21.0.14'
 }
diff --git a/2048/2048/proguard-rules.txt b/2048/2048/proguard-rules.txt
index d0fc38b..428e283 100644
--- a/2048/2048/proguard-rules.txt
+++ b/2048/2048/proguard-rules.txt
@@ -14,4 +14,13 @@
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
-#}
\ No newline at end of file
+#}
+
+-keep public class com.dylanvann.fastimage.* { *; }
+-keep public class com.dylanvann.fastimage.** { *; }
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class com.scottyab.rootbeer.** { *; }
\ No newline at end of file
diff --git a/2048/2048/src/main/AndroidManifest.xml b/2048/2048/src/main/AndroidManifest.xml
index df002aa..a296df2 100644
--- a/2048/2048/src/main/AndroidManifest.xml
+++ b/2048/2048/src/main/AndroidManifest.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tpcstld.twozerogame">
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/logo_2048"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
+
+        <meta-data android:name="skillz_game_id" android:value="2112" />
+        <meta-data android:name="skillz_production" android:value="false" />
+        <meta-data android:name="skillz_game_activity" android:value="com.tpcstld.twozerogame.MainActivity" />
+        <meta-data android:name="skillz_allow_exit" android:value="false" />
+
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/2048/2048/src/main/java/com/tpcstld/twozerogame/MainActivity.java b/2048/2048/src/main/java/com/tpcstld/twozerogame/MainActivity.java
index b5ea46f..9995e52 100644
--- a/2048/2048/src/main/java/com/tpcstld/twozerogame/MainActivity.java
+++ b/2048/2048/src/main/java/com/tpcstld/twozerogame/MainActivity.java
@@ -3,10 +3,11 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 
-public class MainActivity extends AppCompatActivity {
+import com.skillz.SkillzActivity;
+
+public class MainActivity extends SkillzActivity {
 
     private static final String WIDTH = "width";
     private static final String HEIGHT = "height";