Added Multi-User and progress tracking functionality

kitkitschoollogger/kitkitlogger/src/main/java/com/maq/kitkitProvider/KitkitDBHandler.java

@@ -15,6 +15,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import static android.content.ContentValues.TAG;
+
 /**
  * Created by ingtellect on 9/1/17.
  */
@@ -33,6 +35,8 @@ public class KitkitDBHandler extends SQLiteOpenHelper {
 
     public static final String COLUMN_ID = "_id";
     public static final String COLUMN_USERNAME = "username";
+    public static final String COLUMN_AGE = "_age";
+    public static final String COLUMN_IMAGE = "_image";
     public static final String COLUMN_STARS = "stars";
     public static final String COLUMN_FINISH_TUTORIAL = "finish_tutorial";
     public static final String COLUMN_UNLOCK_DRUM = "unlock_drum";
@@ -63,6 +67,8 @@ public class KitkitDBHandler extends SQLiteOpenHelper {
             + "("
             + COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
             + COLUMN_USERNAME + " TEXT,"
+            + COLUMN_AGE + " TEXT,"
+            + COLUMN_IMAGE + " BLOB,"
             + COLUMN_STARS + " INTEGER,"
             + COLUMN_FINISH_TUTORIAL + " BOOLEAN,"
             + COLUMN_UNLOCK_DRUM + " BOOLEAN,"
@@ -83,7 +89,8 @@ public class KitkitDBHandler extends SQLiteOpenHelper {
             + TABLE_CURRENT_USER
             + "("
             + COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
-            + COLUMN_USERNAME + " TEXT"
+            + COLUMN_USERNAME + " TEXT,"
+            + COLUMN_AGE + " TEXT"
             + ")";
 
     final String CREATE_SNTP_RESULT_TABLE = "CREATE TABLE "
@@ -160,6 +167,8 @@ private void execRawQuery(SQLiteDatabase db, String[] arr_sql) {
     public void addUser(User user) {
         ContentValues values = new ContentValues();
         values.put(COLUMN_USERNAME, user.getUserName());
+        values.put(COLUMN_AGE, user.getAge());
+        values.put(COLUMN_IMAGE, user.getImage());
         values.put(COLUMN_STARS, user.getNumStars());
         values.put(COLUMN_FINISH_TUTORIAL, user.isFinishTutorial());
         values.put(COLUMN_UNLOCK_DRUM, user.isUnlockDrum());
@@ -168,6 +177,7 @@ public void addUser(User user) {
         values.put(COLUMN_UNLOCK_COLORING, user.isUnlockColoring());
         values.put(COLUMN_UNLOCK_BLACKBOARD, user.isUnlockBlackboard());
         values.put(COLUMN_FINISH_LAUNCHER_TUTORIAL, user.isFinishLauncherTutorial());
+        values.put(COLUMN_DISPLAY_NAME,user.getDisplayName());
         values.put(COLUMN_OPEN_LIBRARY, user.isOpenLibrary());
         values.put(COLUMN_OPEN_TOOLS, user.isOpenTools());
         values.put(COLUMN_UNLOCK_FISH_BOWL, user.isUnlockFishBowl());
@@ -180,6 +190,8 @@ public void addUser(User user) {
     public User findUser(String username) {
         String[] projection = {COLUMN_ID,
                 COLUMN_USERNAME,
+                COLUMN_AGE,
+                COLUMN_IMAGE,
                 COLUMN_STARS,
                 COLUMN_FINISH_TUTORIAL,
                 COLUMN_UNLOCK_DRUM,
@@ -208,20 +220,22 @@ public User findUser(String username) {
             cursor.moveToFirst();
             user.setID(Integer.parseInt(cursor.getString(0)));
             user.setUserName(cursor.getString(1));
-            user.setNumStars(Integer.parseInt(cursor.getString(2)));
-            user.setFinishTutorial("1".equals(cursor.getString(3)));
-            user.setUnlockDrum("1".equals(cursor.getString(4)));
-            user.setUnlockMarimba("1".equals(cursor.getString(5)));
-            user.setUnlockDrawing("1".equals(cursor.getString(6)));
-            user.setUnlockColoring("1".equals(cursor.getString(7)));
-            user.setUnlockBlackboard("1".equals(cursor.getString(8)));
-            user.setFinishLauncherTutorial("1".equals(cursor.getString(9)));
-            user.setDisplayName(cursor.getString(10));
-            user.setOpenLibrary("1".equals(cursor.getString(11)));
-            user.setOpenTools("1".equals(cursor.getString(12)));
-            user.setUnlockFishBowl("1".equals(cursor.getString(13)));
-            user.setUnlockWritingBoard("1".equals(cursor.getString(14)));
-            user.setFinishWritingBoardTutorial("1".equals(cursor.getString(15)));
+            user.setAge((cursor.getString(2)));
+            user.setImage(cursor.getBlob(3));
+            user.setNumStars(Integer.parseInt(cursor.getString(4)));
+            user.setFinishTutorial("1".equals(cursor.getString(5)));
+            user.setUnlockDrum("1".equals(cursor.getString(6)));
+            user.setUnlockMarimba("1".equals(cursor.getString(7)));
+            user.setUnlockDrawing("1".equals(cursor.getString(8)));
+            user.setUnlockColoring("1".equals(cursor.getString(9)));
+            user.setUnlockBlackboard("1".equals(cursor.getString(10)));
+            user.setFinishLauncherTutorial("1".equals(cursor.getString(11)));
+            user.setDisplayName(cursor.getString(12));
+            user.setOpenLibrary("1".equals(cursor.getString(13)));
+            user.setOpenTools("1".equals(cursor.getString(14)));
+            user.setUnlockFishBowl("1".equals(cursor.getString(15)));
+            user.setUnlockWritingBoard("1".equals(cursor.getString(16)));
+            user.setFinishWritingBoardTutorial("1".equals(cursor.getString(17)));
             cursor.close();
         } else {
             user = null;
@@ -233,6 +247,8 @@ public User findUser(String username) {
     public ArrayList<User> getUserList() {
         String[] projection = {COLUMN_ID,
                 COLUMN_USERNAME,
+                COLUMN_AGE,
+                COLUMN_IMAGE,
                 COLUMN_STARS,
                 COLUMN_FINISH_TUTORIAL,
                 COLUMN_UNLOCK_DRUM,
@@ -259,20 +275,22 @@ public ArrayList<User> getUserList() {
                 User user = new User();
                 user.setID(Integer.parseInt(cursor.getString(0)));
                 user.setUserName(cursor.getString(1));
-                user.setNumStars(Integer.parseInt(cursor.getString(2)));
-                user.setFinishTutorial("1".equals(cursor.getString(3)));
-                user.setUnlockDrum("1".equals(cursor.getString(4)));
-                user.setUnlockMarimba("1".equals(cursor.getString(5)));
-                user.setUnlockDrawing("1".equals(cursor.getString(6)));
-                user.setUnlockColoring("1".equals(cursor.getString(7)));
-                user.setUnlockBlackboard("1".equals(cursor.getString(8)));
-                user.setFinishLauncherTutorial("1".equals(cursor.getString(9)));
-                user.setDisplayName(cursor.getString(10));
-                user.setOpenLibrary("1".equals(cursor.getString(11)));
-                user.setOpenTools("1".equals(cursor.getString(12)));
-                user.setUnlockFishBowl("1".equals(cursor.getString(13)));
-                user.setUnlockWritingBoard("1".equals(cursor.getString(14)));
-                user.setFinishWritingBoardTutorial("1".equals(cursor.getString(15)));
+                user.setAge((cursor.getString(2)));
+                user.setImage(cursor.getBlob(3));
+                user.setNumStars(Integer.parseInt(cursor.getString(4)));
+                user.setFinishTutorial("1".equals(cursor.getString(5)));
+                user.setUnlockDrum("1".equals(cursor.getString(6)));
+                user.setUnlockMarimba("1".equals(cursor.getString(7)));
+                user.setUnlockDrawing("1".equals(cursor.getString(8)));
+                user.setUnlockColoring("1".equals(cursor.getString(9)));
+                user.setUnlockBlackboard("1".equals(cursor.getString(10)));
+                user.setFinishLauncherTutorial("1".equals(cursor.getString(11)));
+                user.setDisplayName(cursor.getString(12));
+                user.setOpenLibrary("1".equals(cursor.getString(13)));
+                user.setOpenTools("1".equals(cursor.getString(14)));
+                user.setUnlockFishBowl("1".equals(cursor.getString(15)));
+                user.setUnlockWritingBoard("1".equals(cursor.getString(16)));
+                user.setFinishWritingBoardTutorial("1".equals(cursor.getString(17)));
                 result.add(user);
 
             } while(cursor.moveToNext());
@@ -370,6 +388,7 @@ public User getCurrentUser() {
         }
 
         String currentUserName = cursor.getString(0);
+        Log.d(TAG,"HelloWord"+currentUserName);
         User user = findUser(currentUserName);
         cursor.close();
         return user;
@@ -387,15 +406,18 @@ public String getCurrentUsername() {
         }
         String result = cursor.getString(0);
         cursor.close();
+        Log.d(TAG,"HelloWord1"+result);
         return result;
     }
 
     public void updateUser(User user) {
 
         String selection = "username = \"" + user.getUserName() + "\"";
-
+        try{
         ContentValues values = new ContentValues();
         values.put(COLUMN_USERNAME, user.getUserName());
+        values.put(COLUMN_AGE, user.getAge());
+        values.put(COLUMN_IMAGE, user.getImage());
         values.put(COLUMN_STARS, user.getNumStars());
         values.put(COLUMN_FINISH_TUTORIAL, user.isFinishTutorial());
         values.put(COLUMN_UNLOCK_DRUM, user.isUnlockDrum());
@@ -412,6 +434,10 @@ public void updateUser(User user) {
         values.put(COLUMN_FINISH_WRITING_BOARD_TUTORIAL, user.isFinishWritingBoardTutorial());
         Log.i("myLog", "value : " + values.toString());
         myCR.update(KitkitProvider.CONTENT_URI, values, selection, null);
+        }
+        catch (Exception e){
+            Log.e(TAG,"error updating coin:-"+e.getMessage());
+        }
     }
 
     public void uniqueInsertSntpResult(SntpResult sntpResult) {

kitkitschoollogger/kitkitlogger/src/main/java/com/maq/kitkitProvider/User.java

@@ -5,12 +5,14 @@
  */
 
 
-public class User {
+public class User<string> {
     public static boolean DEFAULT_OPEN_LIBRARY = true;
     public static boolean DEFAULT_OPEN_TOOLS = true;
 
     private int _id;
     private String _username;
+    private String _age;
+    byte[] _image;
     private int _numStars;
     private boolean _finishTutorial;
     private boolean _unlockDrum;
@@ -25,10 +27,14 @@ public class User {
     private boolean _unlockFishBowl;
     private boolean _unlockWritingBoard;
     private boolean _finishWritingBoardTutorial;
+    private int _gamesClearedInTotal_L;
+    private int _gamesClearedInTotal_M;
 
     public User() {
         this._id = 0;
         this._username = "user";
+        this._image = new byte[]{(byte) 204};
+        this._age = "0";
         this._numStars = 0;
         this._finishTutorial = false;
         this._unlockDrum = true;
@@ -43,11 +49,38 @@ public User() {
         this._unlockFishBowl = false;
         this._unlockWritingBoard = false;
         this._finishWritingBoardTutorial = false;
+        this._gamesClearedInTotal_L = 0;
+        this._gamesClearedInTotal_M = 0;
+    }
+
+    public User(String displayname, String age, byte[] image) {
+        this._id = 0;
+        this._username = displayname;
+        this._age = age;
+        this._image = image;
+        this._numStars = 0;
+        this._finishTutorial = false;
+        this._unlockDrum = true;
+        this._unlockMarimba = true;
+        this._unlockDrawing = true;
+        this._unlockColoring = true;
+        this._unlockBlackboard = true;
+        this._finishLauncherTutorial = false;
+        this._displayName = displayname;
+        this._openLibrary = DEFAULT_OPEN_LIBRARY;
+        this._openTools = DEFAULT_OPEN_TOOLS;
+        this._unlockFishBowl = false;
+        this._unlockWritingBoard = false;
+        this._finishWritingBoardTutorial = false;
+        this._gamesClearedInTotal_L = 0;
+        this._gamesClearedInTotal_M = 0;
     }
 
     public User(int id, String username, int stars) {
         this._id = id;
         this._username = username;
+        this._age = "0";
+        this._image = new byte[]{(byte) 204};
         this._numStars = stars;
         this._finishTutorial = false;
         this._unlockDrum = true;
@@ -62,10 +95,14 @@ public User(int id, String username, int stars) {
         this._unlockFishBowl = false;
         this._unlockWritingBoard = false;
         this._finishWritingBoardTutorial = false;
+        this._gamesClearedInTotal_L = 0;
+        this._gamesClearedInTotal_M = 0;
     }
 
     public User(String productname, int stars) {
         this._username = productname;
+        this._age = "0";
+        this._image = new byte[]{(byte) 204};
         this._numStars = stars;
         this._finishTutorial = false;
         this._unlockDrum = true;
@@ -80,6 +117,8 @@ public User(String productname, int stars) {
         this._unlockFishBowl = false;
         this._unlockWritingBoard = false;
         this._finishWritingBoardTutorial = false;
+        this._gamesClearedInTotal_L = 0;
+        this._gamesClearedInTotal_M = 0;
     }
 
     public void setID(int id) {
@@ -98,6 +137,23 @@ public String getUserName() {
         return this._username;
     }
 
+    public void setAge(String age) {
+        this._age = age;
+    }
+
+    public String getAge() {
+        return this._age;
+    }
+
+    public void setImage(byte[] image){
+        this._image = image;
+    }
+
+    public byte[] getImage() {
+        return this._image;
+    }
+
+
     public void setNumStars(int stars) {
         this._numStars = stars;
     }
@@ -136,11 +192,11 @@ public int getNumStars() {
     public boolean isFinishLauncherTutorial() {return this._finishLauncherTutorial;}
 
     public void setDisplayName(String name) {
-        _displayName = name;
+        this._displayName = name;
     }
 
     public String getDisplayName() {
-        return _displayName;
+        return this._displayName;
     }
 
     public void setOpenLibrary(boolean open) {
@@ -171,4 +227,11 @@ public boolean isOpenTools() {
 
     public boolean isFinishWritingBoardTutorial() {return this._finishWritingBoardTutorial;}
 
+    public void setGamesClearedInTotal_L(int gamesClearedInTotal_L) {this._gamesClearedInTotal_L = gamesClearedInTotal_L; }
+
+    public int getGamesClearedInTotal_L() {return this._gamesClearedInTotal_L; }
+
+    public void setGamesClearedInTotal_M(int gamesClearedInTotal_M) {this._gamesClearedInTotal_M = gamesClearedInTotal_M; }
+
+    public int getGamesClearedInTotal_M() {return this._gamesClearedInTotal_M; }
 }

kitkitschoollogger/kitkitlogger/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="blueShade">#5067C0</color>
+    <color name="redShade">#D7145B</color>
+</resources>

launcher/app/build.gradle

@@ -12,15 +12,15 @@ android {
         versionName "3.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-    
+
     lintOptions {
         checkReleaseBuilds false
         // Or, if you prefer, you can continue to check for errors in release builds,
         // but continue the build even when errors are found:
         abortOnError false
     }
-    
-	signingConfigs {
+
+    signingConfigs {
         debug {
             storeFile file('../debug.keystore')
             storePassword "android"
@@ -37,7 +37,7 @@ android {
         }
     }
 
-	productFlavors {
+    productFlavors {
 
         englishUS {
 
@@ -47,7 +47,7 @@ android {
 
         }
     }
-	
+
     buildTypes {
         release {
             minifyEnabled false