FINAL GAME SORRY

Author: A. Apesteguia

app/src/main/java/com/codebinars/a2048game/EditScoreActivity.java

@@ -190,7 +190,6 @@ private void saveImage(Bitmap finalBitmap) {
         try {
             FileOutputStream out = new FileOutputStream(file);
             finalBitmap.compress(Bitmap.CompressFormat.JPEG, 40, out);
-            System.out.println(imageroot);
             out.flush();
             out.close();
         } catch (Exception e) {

app/src/main/java/com/codebinars/a2048game/GameActivity.java

@@ -2,8 +2,8 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-
 import androidx.annotation.Nullable;
+
 public class GameActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {

app/src/main/java/com/codebinars/a2048game/database/DBHelper.java

@@ -57,7 +57,6 @@ private DBHelper(Context applicationContext) {
         super(applicationContext, DB_NAME, null, 2);
     }
 
-
     @Override
     public void onCreate(SQLiteDatabase db) {
         db.execSQL(CREATE_USER_TABLE_STATEMENT);
@@ -172,8 +171,8 @@ public List<ScoreDisplay> getTop10ByUser(String usertop) {
                         COLUMN_USERNAME+", "+COLUMN_IMAGE+", "+COLUMN_COUNTRY +
                         " FROM "+USER_TABLE +" USER"+
                         " INNER JOIN "+SCORE_TABLE+ " SCORE" + " ON "+ "USER."+COLUMN_ID +" = "+COLUMN_USERNAME_ID +
-                        " WHERE " + COLUMN_USERNAME + " = '" + usertop +
-                        "' ORDER BY " + COLUMN_SCORE + " DESC LIMIT 10";
+                        " WHERE " + COLUMN_USERNAME + " LIKE " + "'%" + usertop + "%'" +
+                        " ORDER BY " + COLUMN_SCORE + " DESC LIMIT 10";
 
         Cursor cursor = db.rawQuery(queryAllScores, null);
         if (cursor.moveToNext()) {

app/src/main/java/com/codebinars/a2048game/databaseRoom/ScoreDao.java

@@ -3,6 +3,7 @@
 import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
 import java.util.List;
@@ -16,20 +17,28 @@ public interface ScoreDao {
     @Insert(onConflict = REPLACE)
     void addScore(ScoreModel scoreModel);
 
+    //Check if user exists. In case it doesn't, create it
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    Long addUser(UserModel userModel); // 1 = Created, 0 = Ignored
+
     //Delete query
     @Delete
     void delete(ScoreModel scoreModel);
 
     //Delete by id query
     @Query("DELETE FROM scores WHERE score_id = :scoreId")
-    void deleteById(int scoreId);
+    void deleteScoreByID(int scoreId);
 
     //Delete all query
     @Delete
-    void deleteAllData(List<ScoreModel> scoreModelList);
+    void deleteAllData(List<ScoreModel> scoreModelList, List<UserModel> userModelList);
+
+    //Update user
+    @Query("UPDATE users SET user_name = :uName, user_avatar = :uAvatar, user_country = :uCountry WHERE user_id = :uID")
+    void updateUser(int uID, String uName, String uAvatar, String uCountry);
 
-    //Update query
-    @Query("UPDATE scores SET score_username = :sUsername, score_datetime = :sDateTime, score_duration = :sDuration WHERE score_id = :sID")
+    //Update score
+    @Query("UPDATE scores SET score_username_id = :sUsername, score_datetime = :sDateTime, score_duration = :sDuration WHERE score_id = :sID")
     void updateScore(int sID, String sUsername, String sDateTime, Float sDuration);
 
     //Select All
@@ -38,14 +47,13 @@ public interface ScoreDao {
 
     //Top 10
     @Query("SELECT * FROM scores ORDER BY score_value DESC LIMIT 10")
-    List<ScoreModel> getTop10();
+    List<ScoreModel> getTop10Scores();
 
     //Top 10 by User
-    @Query("SELECT * FROM scores WHERE score_value = :qUser ORDER BY score_value DESC LIMIT 10")
-    List<ScoreModel> getTop10ByUsername(String qUser);
+    @Query("SELECT * FROM scores WHERE score_username_id = :qUser ORDER BY score_value DESC")
+    List<ScoreModel> getTop10ByUser(String qUser);
 
     //Top by Score
     @Query("SELECT MAX (score_value) FROM scores")
     int getTopScore();
-
 }

app/src/main/java/com/codebinars/a2048game/databaseRoom/ScoreModel.java

@@ -3,12 +3,20 @@
 import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
+import androidx.room.ForeignKey;
 import androidx.room.Ignore;
 import androidx.room.PrimaryKey;
 
 import java.util.UUID;
 
-@Entity(tableName = "scores")
+import static androidx.room.ForeignKey.CASCADE;
+
+@Entity(
+        tableName = "scores",
+        foreignKeys = {
+                @ForeignKey(entity = UserModel.class,
+                            parentColumns = "user_id",
+                            childColumns = "score_username_id")})
 public class ScoreModel {
 
     @PrimaryKey
@@ -19,7 +27,7 @@ public class ScoreModel {
     @ColumnInfo(name = "score_value")
     protected Integer mScore;
 
-    @ColumnInfo(name = "score_username")
+    @ColumnInfo(name = "score_username_id")
     protected String mUsername;
 
     @ColumnInfo(name = "score_datetime")

app/src/main/java/com/codebinars/a2048game/databaseRoom/ScoreRoomDB.java

@@ -6,7 +6,7 @@
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
 
-@Database(entities = {ScoreModel.class}, version = 2, exportSchema = false)
+@Database(entities = {ScoreModel.class, UserModel.class}, version = 2, exportSchema = false)
 public abstract class ScoreRoomDB extends RoomDatabase {
     private static ScoreRoomDB database;
     public static String DATABASE_NAME = "scoreDB";

app/src/main/java/com/codebinars/a2048game/databaseRoom/UserModel.java

@@ -0,0 +1,87 @@
+package com.codebinars.a2048game.databaseRoom;
+
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.Ignore;
+import androidx.room.PrimaryKey;
+import com.codebinars.a2048game.databaseRoom.*;
+
+import java.util.UUID;
+
+@Entity(tableName = "users")
+public class UserModel {
+
+    @PrimaryKey
+    @NonNull
+    @ColumnInfo(name = "user_id")
+    protected String uId;
+
+    @ColumnInfo(name = "user_name")
+    protected String uName;
+
+    @ColumnInfo(name = "user_country")
+    protected String uCountry;
+
+    @ColumnInfo(name = "user_avatar")
+    protected String uAvatarpath;
+
+    @Ignore
+    public UserModel(@NonNull String uId, String uName, String uCountry, String uAvatarpath) {
+        this.uId = UUID.randomUUID().toString();
+        this.uName = uName;
+        this.uCountry = uCountry;
+        this.uAvatarpath = uAvatarpath;
+    }
+
+    public UserModel(String uName, String uCountry, String uAvatarpath) {
+        this.uName = uName;
+        this.uCountry = uCountry;
+        this.uAvatarpath = uAvatarpath;
+    }
+
+    @NonNull
+    public String getuId() {
+        return uId;
+    }
+
+    public void setuId(@NonNull String uId) {
+        this.uId = uId;
+    }
+
+    public String getuName() {
+        return uName;
+    }
+
+    public void setuName(String uName) {
+        this.uName = uName;
+    }
+
+    public String getuCountry() {
+        return uCountry;
+    }
+
+    public void setuCountry(String uCountry) {
+        this.uCountry = uCountry;
+    }
+
+    public String getuAvatarpath() {
+        return uAvatarpath;
+    }
+
+    public void setuAvatarpath(String uAvatarpath) {
+        this.uAvatarpath = uAvatarpath;
+    }
+
+    @Override
+    public String toString() {
+        return "UserModel{" +
+                "uId='" + uId + '\'' +
+                ", uName='" + uName + '\'' +
+                ", uCountry='" + uCountry + '\'' +
+                ", uAvatarpath='" + uAvatarpath + '\'' +
+                '}';
+    }
+}

app/src/main/java/com/codebinars/a2048game/engine/TileManager.java

@@ -347,7 +347,7 @@ public void finishedMoving(Tile t) {
      * First: Check if we can add more values to Tiles
      * Second: Check if there are value matches (Skip if First case is possible)
      */
-    private void checkEndgame() {
+    private synchronized void checkEndgame() {
         endGame = true;
         for (int i = 0; i < 4; i++) {
             for (int j = 0; j < 4; j++) {
@@ -429,6 +429,4 @@ public void updateScore(int delta) {
     public void reached2048() {
         callback.reached2048();
     }
-
-
 }

app/src/main/java/com/codebinars/a2048game/engine/sprites/Score.java

@@ -81,7 +81,6 @@ public void draw(Canvas canvas) {
 
     @Override
     public void update() {
-
     }
 
     public void updateScore(int delta) {

app/src/main/java/com/codebinars/a2048game/scoresView/ImageUtils.java

@@ -9,7 +9,7 @@
 
 public class ImageUtils {
     public static Bitmap loadImage(String imageRoot){
-        Bitmap bitmap = null;
+        Bitmap bitmap;
         try {
             File file = new File (imageRoot);
             FileInputStream inputStream = new FileInputStream(file);