Merge remote-tracking branch 'origin/master'

Prasanna Anbazhagan · Prasanna Anbazhagan · commit 840fd1029244 · 2017-09-20T19:27:10.000+05:30
# Conflicts:
#	droidwizardlib/src/main/java/com/prasilabs/droidwizardlib/core/views/CoreFragmentView.java
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ Step 1. Add the JitPack repository to your build file Build.gradle (app)
 Step 2. Add the dependency
 ```
 dependencies {
-	 compile 'com.github.praslnx8:DroidWizard:1.1'
+	 compile 'com.github.praslnx8:DroidWizard:1.3'
 }
 ```
 Check us at [![Medium]](https://medium.com/@praslnx8/droidwizard-framework-for-android-45cabd1d7d5c)
diff --git a/droidwizardlib/build.gradle b/droidwizardlib/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
 
@@ -26,7 +26,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:26+'
     compile 'com.google.code.gson:gson:2.7'
 
     testCompile 'junit:junit:4.12'
diff --git a/droidwizardlib/src/main/java/com/prasilabs/droidwizardlib/core/viewModels/CoreViewModel.java b/droidwizardlib/src/main/java/com/prasilabs/droidwizardlib/core/viewModels/CoreViewModel.java
@@ -30,7 +30,7 @@
 public abstract class CoreViewModel<T extends CoreCallBack> implements Observer
 {
     private Context context;
-    private T coreCallBack;
+    private T vmCallBAck;
 
     /**
      * Public default constructor
@@ -73,7 +73,7 @@ public void onCreate(Context context)
      */
     public void onDestroy()
     {
-        coreCallBack = null;
+        vmCallBAck = null;
     }
 
     /**
@@ -88,16 +88,16 @@ public Context getContext() {
      * Method for getting the view model callback to communicate back to view
      * @return return {@link CoreCallBack}
      */
-    public T getCoreCallBack() {
-        return coreCallBack;
+    public T getVMCallBack() {
+        return vmCallBAck;
     }
 
     /**
      * for registering the view model callback interface
      * @param t callback interface
      */
-    public void setCoreCallBack(T t) {
-        this.coreCallBack = t;
+    public void setVMCallBack(T t) {
+        this.vmCallBAck = t;
     }
 
     @Override
diff --git a/droidwizardlib/src/main/java/com/prasilabs/droidwizardlib/core/views/CoreActivityView.java b/droidwizardlib/src/main/java/com/prasilabs/droidwizardlib/core/views/CoreActivityView.java
@@ -39,7 +39,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState)
         if(coreViewModel != null)
         {
             coreViewModel.onCreate(this);
-            coreViewModel.setCoreCallBack(getCoreCallBack());
+            coreViewModel.setVMCallBack(getCoreCallBack());
         }
     }
 
diff --git a/droidwizardlib/src/main/java/com/prasilabs/droidwizardlib/core/views/CoreFragmentView.java b/droidwizardlib/src/main/java/com/prasilabs/droidwizardlib/core/views/CoreFragmentView.java
@@ -23,6 +23,7 @@ public abstract class CoreFragmentView<T extends CoreViewModel> extends Fragment
     private CoreActivityView coreActivityView;
     private T coreViewModel;
     private boolean isViewCreatedFresh;
+    private boolean isViewDestroyed;
 
 
     public View getFragmentView()
@@ -59,7 +60,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 
         if (coreViewModel != null) {
             coreViewModel.onCreate(context);
-            coreViewModel.setCoreCallBack(getCoreCallBack());
+            coreViewModel.setVMCallBack(getCoreCallBack());
         }
 
 
@@ -70,6 +71,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        isViewDestroyed = false;
         initializeView(savedInstanceState, isViewCreatedFresh);
     }
 
@@ -86,6 +88,8 @@ public void onDestroyView() {
         if (coreViewModel != null) {
             coreViewModel.onDestroy();
         }
+
+        isViewDestroyed = true;
     }
 
     @Override
@@ -115,12 +119,6 @@ public void onResume() {
 
     }
 
-    @Override
-    public void onStop() {
-        super.onStop();
-
-    }
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -144,10 +142,12 @@ protected T getViewModel()
         return coreViewModel;
     }
 
-
-
     public boolean onBackPressed()
     {
         return true;
     }
+
+    public boolean isViewDestroyed() {
+        return isViewDestroyed;
+    }
 }
diff --git a/exampleApp/build.gradle b/exampleApp/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "25.0.3"
     defaultConfig {
         applicationId "com.prasilabs.droidwizard"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,10 +24,9 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:recyclerview-v7:26+'
     compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support:cardview-v7:26+'
 
     testCompile 'junit:junit:4.12'
     compile project(path: ':droidwizardlib')
diff --git a/exampleApp/src/main/java/com/prasilabs/droidwizard/modules/simpleActivity/viewModels/SimpleActivityViewModel.java b/exampleApp/src/main/java/com/prasilabs/droidwizard/modules/simpleActivity/viewModels/SimpleActivityViewModel.java
@@ -1,12 +1,7 @@
 package com.prasilabs.droidwizard.modules.simpleActivity.viewModels;
 
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
 import com.prasilabs.droidwizard.modelEngines.QuestionsModelEngine;
 import com.prasilabs.droidwizard.pojos.QuestionsPojo;
-import com.prasilabs.droidwizard.utils.KeyConstants;
 import com.prasilabs.droidwizard.utils.NetworkManager;
 import com.prasilabs.droidwizardlib.core.modelEngines.CoreModelEngine;
 import com.prasilabs.droidwizardlib.core.viewModels.CoreViewModel;
@@ -21,9 +16,9 @@ public class SimpleActivityViewModel extends CoreViewModel<SimpleActivityCallBac
 {
     public void getQuestions()
     {
-        if(getCoreCallBack() != null)
+        if(getVMCallBack() != null)
         {
-            getCoreCallBack().showProgress();
+            getVMCallBack().showProgress();
         }
         if(NetworkManager.isConnected(getContext()))
         {
@@ -33,26 +28,26 @@ public void getQuestions(List<QuestionsPojo> questions)
                 {
                     if(questions != null && !questions.isEmpty())
                     {
-                        if(getCoreCallBack() != null)
+                        if(getVMCallBack() != null)
                         {
-                            getCoreCallBack().showQuestions(questions);
+                            getVMCallBack().showQuestions(questions);
                         }
                     }
                     else
                     {
-                        if(getCoreCallBack() != null)
+                        if(getVMCallBack() != null)
                         {
-                            getCoreCallBack().showEmpty();
+                            getVMCallBack().showEmpty();
                         }
                     }
                 }
             });
         }
         else
         {
-            if(getCoreCallBack() != null)
+            if(getVMCallBack() != null)
             {
-                getCoreCallBack().showNoInternet();
+                getVMCallBack().showNoInternet();
             }
         }
 
diff --git a/exampleApp/src/main/java/com/prasilabs/droidwizard/modules/simpleFragment/viewModels/SimpleFragmentViewModel.java b/exampleApp/src/main/java/com/prasilabs/droidwizard/modules/simpleFragment/viewModels/SimpleFragmentViewModel.java
@@ -36,13 +36,13 @@ public void getQuestions(List<QuestionsPojo> questions)
             {
                 if(questions != null && !questions.isEmpty())
                 {
-                    if(getCoreCallBack() != null)
+                    if(getVMCallBack() != null)
                     {
-                        getCoreCallBack().showQuestions(questions);
+                        getVMCallBack().showQuestions(questions);
                     }
                     else
                     {
-                        getCoreCallBack().showEmpty();
+                        getVMCallBack().showEmpty();
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ Step 1. Add the JitPack repository to your build file Build.gradle (app)`
`43`	`43`	`Step 2. Add the dependency`
`44`	`44`	```
`45`	`45`	`dependencies {`
`46`		`- compile 'com.github.praslnx8:DroidWizard:1.1'`
	`46`	`+ compile 'com.github.praslnx8:DroidWizard:1.3'`
`47`	`47`	`}`
`48`	`48`	```
`49`	`49`	`Check us at [![Medium]](https://medium.com/@praslnx8/droidwizard-framework-for-android-45cabd1d7d5c)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState)`
`39`	`39`	`if(coreViewModel != null)`
`40`	`40`	`{`
`41`	`41`	`coreViewModel.onCreate(this);`
`42`		`- coreViewModel.setCoreCallBack(getCoreCallBack());`
	`42`	`+ coreViewModel.setVMCallBack(getCoreCallBack());`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public abstract class CoreFragmentView<T extends CoreViewModel> extends Fragment`
`23`	`23`	`private CoreActivityView coreActivityView;`
`24`	`24`	`private T coreViewModel;`
`25`	`25`	`private boolean isViewCreatedFresh;`
	`26`	`+ private boolean isViewDestroyed;`
`26`	`27`
`27`	`28`
`28`	`29`	`public View getFragmentView()`
`@@ -59,7 +60,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,`
`59`	`60`
`60`	`61`	`if (coreViewModel != null) {`
`61`	`62`	`coreViewModel.onCreate(context);`
`62`		`- coreViewModel.setCoreCallBack(getCoreCallBack());`
	`63`	`+ coreViewModel.setVMCallBack(getCoreCallBack());`
`63`	`64`	`}`
`64`	`65`
`65`	`66`
`@@ -70,6 +71,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,`
`70`	`71`	`public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {`
`71`	`72`	`super.onViewCreated(view, savedInstanceState);`
`72`	`73`
	`74`	`+ isViewDestroyed = false;`
`73`	`75`	`initializeView(savedInstanceState, isViewCreatedFresh);`
`74`	`76`	`}`
`75`	`77`
`@@ -86,6 +88,8 @@ public void onDestroyView() {`
`86`	`88`	`if (coreViewModel != null) {`
`87`	`89`	`coreViewModel.onDestroy();`
`88`	`90`	`}`
	`91`	`+`
	`92`	`+ isViewDestroyed = true;`
`89`	`93`	`}`
`90`	`94`
`91`	`95`	`@Override`
`@@ -115,12 +119,6 @@ public void onResume() {`
`115`	`119`
`116`	`120`	`}`
`117`	`121`
`118`		`- @Override`
`119`		`- public void onStop() {`
`120`		`- super.onStop();`
`121`		`-`
`122`		`- }`
`123`		`-`
`124`	`122`	`@Override`
`125`	`123`	`public void onAttach(Context context) {`
`126`	`124`	`super.onAttach(context);`
`@@ -144,10 +142,12 @@ protected T getViewModel()`
`144`	`142`	`return coreViewModel;`
`145`	`143`	`}`
`146`	`144`
`147`		`-`
`148`		`-`
`149`	`145`	`public boolean onBackPressed()`
`150`	`146`	`{`
`151`	`147`	`return true;`
`152`	`148`	`}`
	`149`	`+`
	`150`	`+ public boolean isViewDestroyed() {`
	`151`	`+ return isViewDestroyed;`
	`152`	`+ }`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,7 @@`
`1`	`1`	`package com.prasilabs.droidwizard.modules.simpleActivity.viewModels;`
`2`	`2`
`3`		`-import android.content.Context;`
`4`		`-import android.content.Intent;`
`5`		`-import android.content.IntentFilter;`
`6`		`-`
`7`	`3`	`import com.prasilabs.droidwizard.modelEngines.QuestionsModelEngine;`
`8`	`4`	`import com.prasilabs.droidwizard.pojos.QuestionsPojo;`
`9`		`-import com.prasilabs.droidwizard.utils.KeyConstants;`
`10`	`5`	`import com.prasilabs.droidwizard.utils.NetworkManager;`
`11`	`6`	`import com.prasilabs.droidwizardlib.core.modelEngines.CoreModelEngine;`
`12`	`7`	`import com.prasilabs.droidwizardlib.core.viewModels.CoreViewModel;`
`@@ -21,9 +16,9 @@ public class SimpleActivityViewModel extends CoreViewModel<SimpleActivityCallBac`
`21`	`16`	`{`
`22`	`17`	`public void getQuestions()`
`23`	`18`	`{`
`24`		`- if(getCoreCallBack() != null)`
	`19`	`+ if(getVMCallBack() != null)`
`25`	`20`	`{`
`26`		`- getCoreCallBack().showProgress();`
	`21`	`+ getVMCallBack().showProgress();`
`27`	`22`	`}`
`28`	`23`	`if(NetworkManager.isConnected(getContext()))`
`29`	`24`	`{`
`@@ -33,26 +28,26 @@ public void getQuestions(List<QuestionsPojo> questions)`
`33`	`28`	`{`
`34`	`29`	`if(questions != null && !questions.isEmpty())`
`35`	`30`	`{`
`36`		`- if(getCoreCallBack() != null)`
	`31`	`+ if(getVMCallBack() != null)`
`37`	`32`	`{`
`38`		`- getCoreCallBack().showQuestions(questions);`
	`33`	`+ getVMCallBack().showQuestions(questions);`
`39`	`34`	`}`
`40`	`35`	`}`
`41`	`36`	`else`
`42`	`37`	`{`
`43`		`- if(getCoreCallBack() != null)`
	`38`	`+ if(getVMCallBack() != null)`
`44`	`39`	`{`
`45`		`- getCoreCallBack().showEmpty();`
	`40`	`+ getVMCallBack().showEmpty();`
`46`	`41`	`}`
`47`	`42`	`}`
`48`	`43`	`}`
`49`	`44`	`});`
`50`	`45`	`}`
`51`	`46`	`else`
`52`	`47`	`{`
`53`		`- if(getCoreCallBack() != null)`
	`48`	`+ if(getVMCallBack() != null)`
`54`	`49`	`{`
`55`		`- getCoreCallBack().showNoInternet();`
	`50`	`+ getVMCallBack().showNoInternet();`
`56`	`51`	`}`
`57`	`52`	`}`
`58`	`53`
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,13 @@ public void getQuestions(List<QuestionsPojo> questions)`
`36`	`36`	`{`
`37`	`37`	`if(questions != null && !questions.isEmpty())`
`38`	`38`	`{`
`39`		`- if(getCoreCallBack() != null)`
	`39`	`+ if(getVMCallBack() != null)`
`40`	`40`	`{`
`41`		`- getCoreCallBack().showQuestions(questions);`
	`41`	`+ getVMCallBack().showQuestions(questions);`
`42`	`42`	`}`
`43`	`43`	`else`
`44`	`44`	`{`
`45`		`- getCoreCallBack().showEmpty();`
	`45`	`+ getVMCallBack().showEmpty();`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`