Last change.

Let's Cook/app/build.gradle

@@ -40,6 +40,9 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'com.github.smarteist:autoimageslider:1.4.0'
+    // Glide
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
     // Material design
     implementation 'com.google.android.material:material:1.5.0-alpha01'
     implementation 'de.hdodenhof:circleimageview:3.1.0'

Let's Cook/app/src/main/java/com/example/letscook/adapter/Glide.java

@@ -0,0 +1,9 @@
+package com.example.letscook.adapter;
+
+import com.bumptech.glide.annotation.GlideModule;
+import com.bumptech.glide.module.AppGlideModule;
+
+@GlideModule
+public class Glide extends AppGlideModule {
+
+}

Let's Cook/app/src/main/java/com/example/letscook/adapter/RecycleViewAdapter.java

@@ -18,12 +18,15 @@
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.example.letscook.R;
 import com.example.letscook.database.recipe.Recipe;
 import com.example.letscook.database.RoomDB;
 import com.example.letscook.database.relationships.UserMarksRecipeCrossRef;
 import com.example.letscook.database.typeconverters.DataConverter;
 import com.example.letscook.controller.recipeDetails.RecipeActivity;
+import com.example.letscook.database.user.User;
 
 import java.util.List;
 
@@ -68,20 +71,24 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         database = RoomDB.getInstance(context);
         // Check for favourite recipe
         boolean isMarked = false;
-        List<UserMarksRecipeCrossRef> recipesMark = database.userMarksRecipeDao().getRecipes(userId, database.userDao().getUserByID(userId).getServerID());
-        for (UserMarksRecipeCrossRef userMarksRecipeCrossRef : recipesMark) {
-            Recipe recipeByLocalOrServerId = database.recipeDao().getRecipeByLocalOrServerId(userMarksRecipeCrossRef.getRecipe_id());
-            if (recipeByLocalOrServerId.getID() == recipe.getID() && !userMarksRecipeCrossRef.isDeleted()) {
-                holder.favourite.setImageResource(R.drawable.ic_favorite_after);
-                isMarked = true;
+        User user = database.userDao().getUserByID(userId);
+        if (user != null) {
+            List<UserMarksRecipeCrossRef> recipesMark = database.userMarksRecipeDao().getRecipes(userId, user.getServerID());
+            for (UserMarksRecipeCrossRef userMarksRecipeCrossRef : recipesMark) {
+                Recipe recipeByLocalOrServerId = database.recipeDao().getRecipeByLocalOrServerId(userMarksRecipeCrossRef.getRecipe_id());
+                if (recipeByLocalOrServerId.getID() == recipe.getID() && !userMarksRecipeCrossRef.isDeleted()) {
+                    holder.favourite.setImageResource(R.drawable.ic_favorite_after);
+                    isMarked = true;
+                }
             }
         }
         if (!isMarked) {
             holder.favourite.setImageResource(R.drawable.ic_favorite_before);
         }
         holder.textView.setTextColor(Color.parseColor("#4E4E4E"));
         holder.textView.setText(recipe.getName());
-        holder.imageView.setImageBitmap(DataConverter.byteArrayToImage(recipe.getImage()));
+        //holder.imageView.setImageBitmap(DataConverter.byteArrayToImage(recipe.getImage()));
+        Glide.with(context).load(recipe.getImage()).diskCacheStrategy(DiskCacheStrategy.ALL).into(holder.imageView);
         holder.imageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

Let's Cook/app/src/main/java/com/example/letscook/adapter/SliderAdp.java

@@ -1,19 +1,25 @@
 package com.example.letscook.adapter;
 
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.example.letscook.R;
+import com.example.letscook.controller.slider.SliderActivity;
 import com.smarteist.autoimageslider.SliderViewAdapter;
 
 public class SliderAdp extends SliderViewAdapter<SliderAdp.Holder> {
     //Initialize variables
     int[] images;
+    Context context;
 
-    public SliderAdp(int[] images) {
+    public SliderAdp(int[] images, Context context) {
         this.images = images;
+        this.context = context;
     }
 
     @Override
@@ -27,7 +33,7 @@ public Holder onCreateViewHolder(ViewGroup parent) {
     @Override
     public void onBindViewHolder(Holder viewHolder, int position) {
         //Set image on image view
-        viewHolder.imageView.setImageResource(images[position]);
+        Glide.with(context).load(images[position]).diskCacheStrategy(DiskCacheStrategy.ALL).into(viewHolder.imageView);
     }
 
     @Override

Let's Cook/app/src/main/java/com/example/letscook/controller/addRecipe/AddRecipeActivity.java

@@ -36,6 +36,8 @@
 import android.widget.TextView;
 
 import com.blogspot.atifsoftwares.animatoolib.Animatoo;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.example.letscook.R;
 import com.example.letscook.database.RoomDB;
 import com.example.letscook.database.photo.Photo;
@@ -586,15 +588,18 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
                     bmpImage = getResizedBitmap(bmpImage, 900, 1000);
                     switch (count) {
                         case 0:
-                            firstRecImg.setImageBitmap(bmpImage);
+                            //firstRecImg.setImageBitmap(bmpImage);
+                            Glide.with(this).load(bmpImage).diskCacheStrategy(DiskCacheStrategy.ALL).into(firstRecImg);
                             count++;
                             break;
                         case 1:
-                            secondRecImg.setImageBitmap(bmpImage);
+                            //secondRecImg.setImageBitmap(bmpImage);
+                            Glide.with(this).load(bmpImage).diskCacheStrategy(DiskCacheStrategy.ALL).into(secondRecImg);
                             count++;
                             break;
                         case 2:
-                            thirdRecImg.setImageBitmap(bmpImage);
+                            //thirdRecImg.setImageBitmap(bmpImage);
+                            Glide.with(this).load(bmpImage).diskCacheStrategy(DiskCacheStrategy.ALL).into(thirdRecImg);
                             count++;
                             break;
                     }
@@ -616,15 +621,18 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
                     final RecipeDao recipeDao = database.recipeDao();
                     switch (count) {
                         case 0:
-                            firstRecImg.setImageBitmap(selectedImage);
+                            //firstRecImg.setImageBitmap(selectedImage);
+                            Glide.with(this).load(selectedImage).diskCacheStrategy(DiskCacheStrategy.ALL).into(firstRecImg);
                             count++;
                             break;
                         case 1:
-                            secondRecImg.setImageBitmap(selectedImage);
+                            //secondRecImg.setImageBitmap(selectedImage);
+                            Glide.with(this).load(selectedImage).diskCacheStrategy(DiskCacheStrategy.ALL).into(secondRecImg);
                             count++;
                             break;
                         case 2:
-                            thirdRecImg.setImageBitmap(selectedImage);
+                            //thirdRecImg.setImageBitmap(selectedImage);
+                            Glide.with(this).load(selectedImage).diskCacheStrategy(DiskCacheStrategy.ALL).into(thirdRecImg);
                             count++;
                             break;
                     }

Let's Cook/app/src/main/java/com/example/letscook/controller/home/MainActivity.java

@@ -1,15 +1,18 @@
 package com.example.letscook.controller.home;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.cardview.widget.CardView;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.style.UnderlineSpan;
@@ -22,6 +25,7 @@
 import android.widget.TextView;
 
 import com.blogspot.atifsoftwares.animatoolib.Animatoo;
+import com.example.letscook.controller.AppController;
 import com.example.letscook.database.AESCrypt;
 import com.example.letscook.database.recipe.Recipe;
 import com.example.letscook.controller.addRecipe.AddRecipeActivity;
@@ -41,6 +45,7 @@
 import com.example.letscook.controller.products.ShoppingListActivity;
 import com.example.letscook.controller.info.TermsOfUseActivity;
 import com.example.letscook.controller.search.WhatToCookActivity;
+import com.example.letscook.server_database.NetworkMonitor;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationView;
 
@@ -59,6 +64,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private RoomDB database;
     private User user;
 
+    @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -70,6 +76,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Initialize db
         database = RoomDB.getInstance(this);
+        if(NetworkMonitor.checkNetworkConnection(MainActivity.this)) {
+            NetworkMonitor.MySQLToSQLiteSync(MainActivity.this, database, database.productDao(), database.recipeDao(), database.userDao(),
+                    database.photoDao(), database.userViewsRecipeDao(), database.userMarksRecipeDao());
+            NetworkMonitor.SQLiteToMySQLSync(MainActivity.this, database, database.productDao(), database.recipeDao(), database.userDao(),
+                    database.photoDao(), database.userViewsRecipeDao(), database.userMarksRecipeDao());
+        }
         // Set view according session storage
         String e = getSharedPreferences("PREFERENCE", MODE_PRIVATE).getString("email", null);
         if (e == null) {
@@ -467,8 +479,15 @@ public void onClick(View v) {
         });
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     protected void onStart() {
+        if(NetworkMonitor.checkNetworkConnection(MainActivity.this)) {
+            NetworkMonitor.MySQLToSQLiteSync(MainActivity.this, database, database.productDao(), database.recipeDao(), database.userDao(),
+                    database.photoDao(), database.userViewsRecipeDao(), database.userMarksRecipeDao());
+            NetworkMonitor.SQLiteToMySQLSync(MainActivity.this, database, database.productDao(), database.recipeDao(), database.userDao(),
+                    database.photoDao(), database.userViewsRecipeDao(), database.userMarksRecipeDao());
+        }
         profile.setBorderColor(Color.parseColor("#000000"));
         my_products.setColorFilter(Color.parseColor("#000000"));
         // Set view according session storage
@@ -493,8 +512,15 @@ protected void onStart() {
         super.onStart();
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     protected void onResume() {
+        if(NetworkMonitor.checkNetworkConnection(MainActivity.this)) {
+            NetworkMonitor.MySQLToSQLiteSync(MainActivity.this, database, database.productDao(), database.recipeDao(), database.userDao(),
+                    database.photoDao(), database.userViewsRecipeDao(), database.userMarksRecipeDao());
+            NetworkMonitor.SQLiteToMySQLSync(MainActivity.this, database, database.productDao(), database.recipeDao(), database.userDao(),
+                    database.photoDao(), database.userViewsRecipeDao(), database.userMarksRecipeDao());
+        }
         profile.setBorderColor(Color.parseColor("#000000"));
         my_products.setColorFilter(Color.parseColor("#000000"));
         // Set view according session storage

Let's Cook/app/src/main/java/com/example/letscook/controller/recipeDetails/RecipeActivity.java

@@ -24,6 +24,8 @@
 import android.widget.ViewFlipper;
 
 import com.blogspot.atifsoftwares.animatoolib.Animatoo;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.example.letscook.adapter.ProductsViewAdapter;
 import com.example.letscook.constants.Messages;
 import com.example.letscook.database.photo.Photo;
@@ -193,7 +195,8 @@ private void setLayout() {
         for (int i = 0; i < allPhotosFromRecipe.size(); i++) {
             ViewFlipper flip = findViewById(R.id.flipper);
             ImageView images = new ImageView(getApplicationContext());
-            images.setImageBitmap(DataConverter.byteArrayToImage(allPhotosFromRecipe.get(i).getPhoto()));
+            //images.setImageBitmap(DataConverter.byteArrayToImage(allPhotosFromRecipe.get(i).getPhoto()));
+            Glide.with(this).load(allPhotosFromRecipe.get(i).getPhoto()).diskCacheStrategy(DiskCacheStrategy.ALL).into(images);
             images.setScaleType(ImageView.ScaleType.FIT_XY);
             flip.setInAnimation(AnimationUtils.loadAnimation(this, android.R.anim.slide_in_left));
             flip.addView(images);

Let's Cook/app/src/main/java/com/example/letscook/controller/recipesDashboard/RecipesActivity.java

@@ -197,9 +197,9 @@ public void onClick(View v) {
                 case APPROPRIATE_MESS:
                     textView.setText(NO_REC_FOR_PRODUCTS);
                     if (veg < 0) {
-                        dataList = database.recipeDao().getAllRecipeByCategory(category);
+                        dataList = database.recipeDao().getAllRecipeByCategory(category.trim());
                     } else {
-                        dataList = database.recipeDao().getAllRecipeByCategoryAndVeg(category, veg);
+                        dataList = database.recipeDao().getAllRecipeByCategoryAndVeg(category.trim(), veg);
                     }
                     for (Recipe recipe : dataList) {
                         List<Product> products = database.productDao().getRecipeProducts("toRecipe", recipe.getID(), recipe.getServerID());