Moved project to androidx, updated readme, fixed typos.

README.md

@@ -8,7 +8,7 @@ In this demo, I have covered **Mediator Live data, Mutable live data, Observable
 
 ## Room and Retrofit using same Model
 
-I have used same models for Room and Retrofit2 library as both are configured using annotaions.
+I have used same models for Room and Retrofit2 library as both are configured using annotations.
 
 ```
 @Entity
@@ -277,4 +277,4 @@ public class APIClient {
 This is the overall project structure of this project.
 
 
-![Project Structure](https://github.com/martinraj/MVVM-architecture-lifecycle-components-and-Room-database-project/blob/master/screenshots%20and%20demo/Screenshot%20(114).png)
+![Project Structure](https://github.com/AyushGupta0202/Food-ordering-app-like-swiggy-uber-eats-MVVM-and-Room-database-/blob/issue-4/screenshots%20and%20demo/Screenshot%20(115).png)

app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.marty.yummy"
-        minSdkVersion 17
-        targetSdkVersion 28
+        minSdkVersion 22
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -21,28 +21,28 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     //retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.1.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
     //room
-    implementation "android.arch.persistence.room:runtime:1.1.1"
-    annotationProcessor "android.arch.persistence.room:compiler:1.1.1"
+    implementation 'androidx.room:room-runtime:2.0.0'
+    annotationProcessor 'androidx.room:room-compiler:2.0.0'
 
     //live data and view modals
-    implementation 'android.arch.lifecycle:livedata:1.1.1'
-    implementation "android.arch.lifecycle:extensions:1.1.1"
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     //Glide
     implementation 'com.github.bumptech.glide:glide:4.6.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
 
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     testImplementation 'org.mockito:mockito-core:1.10.19'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }

app/src/androidTest/java/com/marty/yummy/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.marty.yummy;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.marty.yummy">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 
     <application
         android:allowBackup="true"

app/src/main/java/com/marty/yummy/dbutilities/AppDatabase.java

@@ -1,9 +1,9 @@
 package com.marty.yummy.dbutilities;
 
 
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
 import android.content.Context;
 
 import com.marty.yummy.model.CartItem;
@@ -14,6 +14,8 @@
 /**
  * Created by Marty on 12/29/2017.
  */
+
+//Database singleton class.
 @Database(entities = {FoodDetails.class, CartItem.class}, version = 2,exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
     private static AppDatabase INSTANCE;

app/src/main/java/com/marty/yummy/dbutilities/CartItemDao.java

@@ -1,15 +1,15 @@
 package com.marty.yummy.dbutilities;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.Query;
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
 
 import com.marty.yummy.model.CartItem;
 
 import java.util.List;
 
-import static android.arch.persistence.room.OnConflictStrategy.REPLACE;
+import static androidx.room.OnConflictStrategy.REPLACE;
 
 
 @Dao

app/src/main/java/com/marty/yummy/dbutilities/FoodDetailsDao.java

@@ -1,16 +1,16 @@
 package com.marty.yummy.dbutilities;
 
 
-import android.arch.lifecycle.LiveData;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.Query;
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
 
 import com.marty.yummy.model.FoodDetails;
 
 import java.util.List;
 
-import static android.arch.persistence.room.OnConflictStrategy.REPLACE;
+import static androidx.room.OnConflictStrategy.REPLACE;
 
 
 @Dao

app/src/main/java/com/marty/yummy/model/CartItem.java

@@ -1,11 +1,11 @@
 package com.marty.yummy.model;
 
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.ForeignKey;
-import android.arch.persistence.room.PrimaryKey;
-import android.support.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.PrimaryKey;
+import androidx.annotation.NonNull;
 
 @Entity
 public class CartItem {

app/src/main/java/com/marty/yummy/model/FoodDetails.java

@@ -1,8 +1,8 @@
 package com.marty.yummy.model;
 
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.PrimaryKey;
-import android.support.annotation.NonNull;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+import androidx.annotation.NonNull;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
@@ -29,7 +29,7 @@ public class FoodDetails {
 
     @SerializedName("item_quantity")
     @Expose
-    private Integer quantity = 0;
+    private Integer quantity;
 
     public FoodDetails(@NonNull String name, Double price, Double rating, String imageUrl,Integer quantity) {
         this.name = name;

app/src/main/java/com/marty/yummy/network/NetworkConnection.java

@@ -0,0 +1,16 @@
+package com.marty.yummy.network;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+//Check for internet connectivity.
+public class NetworkConnection {
+   public static boolean isConnected(Context context) {
+      ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+      NetworkInfo wifiCon = cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+      NetworkInfo mobCon = cm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
+
+      return (wifiCon != null && wifiCon.isConnected()) || (mobCon != null && mobCon.isConnected());
+   }
+}

app/src/main/java/com/marty/yummy/services/APIClient.java

@@ -3,8 +3,10 @@
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
+//API client class setting up retrofit client.
 public class APIClient {
 
+    //Address of the network api service.
     private static final String BASE_URL = "https://android-full-time-task.firebaseio.com";
     private static Retrofit retrofit = null;
 

app/src/main/java/com/marty/yummy/services/YummyAPIServices.java

@@ -9,6 +9,7 @@
 
 public interface YummyAPIServices {
 
+    //Method to get the JSON response from the API.
     @GET("/data.json")
     Call<List<FoodDetails>> getFoodData();
 }

app/src/main/java/com/marty/yummy/services/repository/FoodRepository.java

@@ -1,6 +1,6 @@
 package com.marty.yummy.services.repository;
 
-import android.arch.lifecycle.MutableLiveData;
+import androidx.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.util.Log;
 
@@ -17,13 +17,16 @@
 import retrofit2.Callback;
 import retrofit2.Response;
 
+//Singleton Repository instance.
 public class FoodRepository {
 
     private static FoodRepository instance;
     private static final String TAG = "FoodRepository";
 
-    private YummyAPIServices yummyAPIServices = APIClient.getClient().create(YummyAPIServices.class);
+    //API service for transactions over network.
+    private final YummyAPIServices yummyAPIServices = APIClient.getClient().create(YummyAPIServices.class);
 
+    //Method to get network response.
     public MutableLiveData<Boolean> getFoodMenu(final Context context){
 
         final MutableLiveData<Boolean> isFoodCallOngoing = new MutableLiveData<>();
@@ -48,6 +51,7 @@ public void onFailure(Call<List<FoodDetails>> call, Throwable t) {
         return isFoodCallOngoing;
     }
 
+    //Singleton implementation getInstance method.
     public static FoodRepository getInstance() {
         if(instance == null){
             synchronized (FoodRepository.class){
@@ -59,6 +63,7 @@ public static FoodRepository getInstance() {
         return instance;
     }
 
+    //Populate the database.
     public void updateCart(final AppDatabase db, FoodDetails foodDetails) {
         new UpdateCart(db).execute(foodDetails);
     }