update to android sdk25

souliss · Jan 16, 2017 · faf5a0b · faf5a0b
1 parent be6c277
commit faf5a0b
Show file tree

Hide file tree

Showing 9 changed files with 169 additions and 60 deletions.
diff --git a/AndroidCharts/build.gradle b/AndroidCharts/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 apply plugin: 'com.android.library'

diff --git a/SoulissApp/SoulissApp.iml b/SoulissApp/SoulissApp.iml
@@ -32,12 +32,14 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -64,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,15 +74,25 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.3.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.rtugeek/ColorSeekBar/1.0.2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/8.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/jars" />
@@ -100,11 +104,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -115,9 +118,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
     <orderEntry type="library" exported="" name="play-services-wearable-8.4.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-base-8.4.0" level="project" />
     <orderEntry type="library" exported="" name="floatingactionbutton-1.3.0" level="project" />
@@ -136,6 +140,9 @@
     <orderEntry type="module" module-name="soulissLib" exported="" />
     <orderEntry type="module" module-name="ecoGallery" exported="" />
     <orderEntry type="module" module-name="AndroidCharts" exported="" />
+    <orderEntry type="library" exported="" name="android-android-24" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">

diff --git a/SoulissApp/build.gradle b/SoulissApp/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     compile 'com.google.android.gms:play-services-wearable:8.4.0'
     compile 'it.angelic:tagView:1.2.2'
     compile 'com.github.rtugeek:ColorSeekBar:1.0.2'
+    compile 'com.google.code.gson:gson:2.6.2'
     compile project(':soulissLib')
     wearApp project(":soulisswear")
     compile project(':taskerapi')

diff --git a/SoulissApp/src/main/java/it/angelic/soulissclient/adapters/StaggeredAdapter.java b/SoulissApp/src/main/java/it/angelic/soulissclient/adapters/StaggeredAdapter.java
@@ -62,6 +62,7 @@ public int getItemViewType(int position) {
         return launcherElements[position].getComponentEnum().ordinal();
     }
 
+
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
         final LauncherElement item = launcherElements[position];

diff --git a/SoulissApp/src/main/java/it/angelic/soulissclient/db/SoulissDBLauncherHelper.java b/SoulissApp/src/main/java/it/angelic/soulissclient/db/SoulissDBLauncherHelper.java
@@ -1,12 +1,24 @@
 package it.angelic.soulissclient.db;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Type;
 import java.sql.SQLDataException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import it.angelic.soulissclient.SoulissApp;
 import it.angelic.soulissclient.model.LauncherElement;
@@ -18,43 +30,68 @@
  * @author Ale
  */
 public class SoulissDBLauncherHelper extends SoulissDBHelper {
+    private static final String MAP = "map";
+    private static final Type MAP_TYPE = new TypeToken<Map<Integer, LauncherElement>>() {
+    }.getType();
+
+    // private static SharedPreferences prefs = MyApplication.getContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+    private static Map<Integer, LauncherElement> myMap;
+    private final SharedPreferences customCachedPrefs;
+    private final File file;
 
     public SoulissDBLauncherHelper(Context context) {
         super(context);
-    }
+        // Database fields
+        customCachedPrefs = context.getSharedPreferences("SoulissHome", Activity.MODE_PRIVATE);
 
-    // Database fields
+        //    file = new File( context.getFilesDir(), "SoulissHome");
+        File path = context.getFilesDir();
+        file = new File(path, "SoulissHome");
 
-
-    public static synchronized SQLiteDatabase getDatabase() {
-        return database;
+        createFakedMap();
+        saveMap(myMap);
     }
 
-
-    public List<LauncherElement> getLauncherItems(Context context) {
-        List<LauncherElement> comments = new ArrayList<LauncherElement>();
+    public int countTags() {
         if (!database.isOpen())
             open();
+        Cursor mCount = database.rawQuery("select count(*) from " + SoulissDB.TABLE_TAGS, null);
+        mCount.moveToFirst();
+        int count = mCount.getInt(0);
+        mCount.close();
+        return count;
+    }
+
+    private void createFakedMap() {
+        myMap = new HashMap<Integer, LauncherElement>();
+        //Map<> comments = new ArrayList<LauncherElement>();
+        open();
 
         SoulissDBTagHelper dbt = new SoulissDBTagHelper(SoulissApp.getAppContext());
 
         //create FAKED Launcher array
         LauncherElement scenari = new LauncherElement(LauncherElementEnum.SCENE);
-        comments.add(scenari);
+        scenari.setId(0);
+        myMap.put(scenari.getId(), scenari);
 
         LauncherElement man = new LauncherElement(LauncherElementEnum.MANUAL);
-        comments.add(man);
+        man.setId(1);
+        myMap.put(man.getId(), man);
 
         LauncherElement pro = new LauncherElement(LauncherElementEnum.PROGRAMS);
-        comments.add(pro);
+        pro.setId(2);
+        myMap.put(pro.getId(), pro);
 
         LauncherElement prop = new LauncherElement(LauncherElementEnum.STATO);
         prop.setIsFullSpan(true);
-        comments.add(prop);
+        prop.setId(3);
+        myMap.put(prop.getId(), prop);
 
         LauncherElement prot = new LauncherElement(LauncherElementEnum.TYPICAL);
         prot.setLinkedObject(super.getTypical(0, (short) 0));
-        comments.add(prot);
+        prot.setId(4);
+        myMap.put(prot.getId(), prot);
 
         //TAG example
         LauncherElement tag = new LauncherElement(LauncherElementEnum.TAG);
@@ -63,24 +100,81 @@ public List<LauncherElement> getLauncherItems(Context context) {
         } catch (SQLDataException e) {
             e.printStackTrace();
         }
-        comments.add(tag);
+        tag.setId(5);
+        myMap.put(tag.getId(), tag);
+
+    }
+   /* public void saveLauncherItems( List<LauncherElement> in){
 
+        SharedPreferences.Editor editor = customCachedPrefs.edit();
+        JSONArray array = new JSONArray();
+        if (customCachedPrefs.contains("launcherItems"))
+            editor.remove("launcherItems");
+            // Add your objects to the array
 
-        return comments;
+        try {
+            array.put(in);
+            editor.putString("launcherItems", array.toString());
+        } catch ( Exception e) {
+            e.printStackTrace();
+        }
+
+
+
+        editor.apply();
     }
 
+    public List<LauncherElement>  loadLauncherItems(){
+        String deMarshall = customCachedPrefs.getString("launcherItems","");
 
-    public int countTags() {
-        if (!database.isOpen())
-            open();
-        Cursor mCount = database.rawQuery("select count(*) from " + SoulissDB.TABLE_TAGS, null);
-        mCount.moveToFirst();
-        int count = mCount.getInt(0);
-        mCount.close();
-        return count;
+        JSONArray array = new JSONArray();
     }
+*/
 
+    public List<LauncherElement> getLauncherItems(Context context) {
+        //Set chiavi= myMap.keySet();
 
+        //TODO sorting by order
+        return new ArrayList<LauncherElement>(myMap.values());
+    }
+
+    public Map<Integer, LauncherElement> loadMap() {
+        int length = (int) file.length();
+
+        byte[] bytes = new byte[length];
+        try {
+            FileInputStream in = new FileInputStream(file);
+
+            in.read(bytes);
+            in.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        String contents = new String(bytes);
+        if (myMap == null) {
+            myMap = new Gson().fromJson(contents, MAP_TYPE);
+        }
+        return myMap;
+    }
+
+    public void saveMap(Map<Integer, LauncherElement> map) {
+
+        FileOutputStream stream = null;
+        try {
+            stream = new FileOutputStream(file);
+            stream.write((new Gson().toJson(map)).getBytes());
+            stream.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        myMap = map;
+    }
 
 
 }
diff --git a/SoulissApp/src/main/java/it/angelic/soulissclient/model/LauncherElement.java b/SoulissApp/src/main/java/it/angelic/soulissclient/model/LauncherElement.java
@@ -3,12 +3,14 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import java.io.Serializable;
+
 /**
  * Created by shine@angelic.it on 06/10/2015.
  */
-public class LauncherElement implements ILauncherTile {
+public class LauncherElement implements ILauncherTile, Serializable {
     private LauncherElementEnum componentEnum;
-    private short id;
+    private int id;
     private boolean isFullSpan;
     private ISoulissObject linkedObject;
     private short order;
@@ -26,11 +28,11 @@ public void setComponentEnum(LauncherElementEnum componentEnum) {
         this.componentEnum = componentEnum;
     }
 
-    public short getId() {
+    public int getId() {
         return id;
     }
 
-    public void setId(@NonNull short id) {
+    public void setId(@NonNull int id) {
         this.id = id;
     }
 

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
@@ -22,10 +22,10 @@ allprojects {
 }
 
 project.ext {
-    global_buildToolsVersion = "23.0.3"
+    global_buildToolsVersion = "25.0.2"
     global_supportLibVersion = "23.3.0"
-    VERSION_NAME = "2.0"
-    VERSION_CODE = 200
-    compileSdkVersion = 23
-    targetSdkVersion = 23
+    VERSION_NAME = "2.0.1"
+    VERSION_CODE = 201
+    compileSdkVersion = 25
+    targetSdkVersion = 25
 }