Merge pull request #149 from concaveNP/deal-with-saving-info-out-when-screen-is-rotated

Deal with saving info out when screen is rotated

Author: concaveNP

ArtistryMuse/.idea/inspectionProfiles/Project_Default.xml

@@ -20,11 +20,6 @@
 
 apply plugin: 'com.android.application'
 
-// Load keystore from a properties file in the root of the project directory
-def keystorePropertiesFile = rootProject.file("keystore.properties");
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
 android {
     signingConfigs {
         release {
@@ -34,16 +29,9 @@ android {
             storePassword '6tS4m6WzyTBQdmyQ9Jbj'
         }
     }
-//    signingConfigs {
-//        release {
-//            keyAlias keystoreProperties['keyAlias']
-//            keyPassword keystoreProperties['keyPassword']
-//            storeFile file(keystoreProperties['storeFile'])
-//            storePassword keystoreProperties['storePassword']
-//        }
-//    }
+
     compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "com.concavenp.artistrymuse"
         minSdkVersion 17
@@ -83,8 +71,6 @@ dependencies {
     compile 'com.google.firebase:firebase-database:11.2.0'
     compile 'com.google.firebase:firebase-crash:11.2.0'
     compile 'com.google.android.gms:play-services-auth:11.2.0'
-    compile 'com.google.android.gms:play-services:11.2.0'
-    compile 'com.google.gms:google-services:3.1.0'
     compile 'com.firebaseui:firebase-ui-database:2.3.0'
     compile 'com.firebaseui:firebase-ui-auth:2.3.0'
     compile 'com.firebaseui:firebase-ui-storage:2.3.0'
@@ -93,12 +79,12 @@ dependencies {
     compile 'pub.devrel:easypermissions:0.2.0'
     compile 'com.android.support:multidex:1.0.1'
     compile 'com.android.support:mediarouter-v7:26.0.1'
-    compile 'com.android.support:design:26.0.0-alpha1'
-    compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
-    compile 'com.android.support:support-v4:26.0.0-alpha1'
-    compile 'com.android.support:support-vector-drawable:26.0.0-alpha1'
+    compile 'com.android.support:design:26.0.1'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.android.support:support-v4:26.0.1'
+    compile 'com.android.support:support-vector-drawable:26.0.1'
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:gridlayout-v7:26.0.0-alpha1'
+    compile 'com.android.support:gridlayout-v7:26.0.1'
 }
 
 // ADD THIS AT THE BOTTOM

ArtistryMuse/.idea/misc.xml

@@ -89,6 +89,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mainView = inflater.inflate(R.layout.fragment_favorites, container, false);
 
         return mainView;
+
     }
 
     @Override

ArtistryMuse/app/build.gradle

@@ -97,8 +97,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         // Inflate the layout for this fragment
         mainView = inflater.inflate(R.layout.fragment_gallery, container, false);
 
-
         return mainView;
+
     }
 
     @Override

ArtistryMuse/app/src/main/java/com/concavenp/artistrymuse/fragments/FavoritesFragment.java

@@ -73,11 +73,12 @@ public class SearchFragment extends BaseFragment {
      * results or a informative message stating that a search needs to be performed to find results.
      */
     private ViewFlipper mFlipper;
+
     /**
      * The Shared Preferences key lookup value for identifying the last used tab position.
      */
     private static final String SEARCH_STRING = "SEARCH_STRING";
-    private String mSearchString = "";
+    private static final String FLIP_ACTIVE_SEARCH_STRING = "FLIP_ACTIVE_SEARCH_STRING";
 
     /**
      * Use this factory method to create a new instance of
@@ -230,6 +231,7 @@ public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
         outState.putString(SEARCH_STRING,mSearchEditText.getText().toString());
+        outState.putInt(FLIP_ACTIVE_SEARCH_STRING, mFlipper.getDisplayedChild());
 
     }
 
@@ -246,6 +248,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         if (savedInstanceState != null) {
 
             mSearchEditText.setText(savedInstanceState.getString(SEARCH_STRING, ""));
+            mFlipper.setDisplayedChild(savedInstanceState.getInt(FLIP_ACTIVE_SEARCH_STRING, 0));
 
         }
 

ArtistryMuse/app/src/main/java/com/concavenp/artistrymuse/fragments/GalleryFragment.java

@@ -21,6 +21,7 @@
 package com.concavenp.artistrymuse.fragments;
 
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
@@ -50,6 +51,12 @@
 import com.google.firebase.database.Query;
 import com.google.firebase.database.ValueEventListener;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -81,6 +88,12 @@ public class SearchResultFragment extends BaseFragment implements SearchFragment
 
     private String mSearchText;
 
+    /**
+     * The Shared Preferences key lookup value for identifying the last used tab position.
+     */
+    private static final String SEARCH_STRING = "SEARCH_STRING_";
+    private static final String FLIP_ACTIVE_SEARCH_STRING = "FLIP_ACTIVE_SEARCH_STRING";
+
     // This flipper allows the content of the fragment to show the user either the list search
     // results or a informative message stating that a search needs to be performed to find
     // results.
@@ -397,6 +410,86 @@ private Query getResponseQuery(DatabaseReference databaseReference, UUID uuid) {
 
     }
 
+    /**
+     * Save off the User entered search string.
+     *
+     * @param outState - The bundle that will be presented to this fragment upon re-creation
+     */
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(FLIP_ACTIVE_SEARCH_STRING + getDatabaseNameFromType(), mFlipper.getDisplayedChild());
+
+        try {
+            switch (mType) {
+                case USERS: {
+                    List<UserResponseHit> list = mUsersAdapter.getData();
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    ObjectOutputStream oos = new ObjectOutputStream(baos);
+                    oos.writeObject(list);
+                    outState.putByteArray(SEARCH_STRING + getDatabaseNameFromType(), baos.toByteArray());
+                    break;
+                }
+                case PROJECTS: {
+                    List<ProjectResponseHit> list = mProjectsAdapter.getData();
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    ObjectOutputStream oos = new ObjectOutputStream(baos);
+                    oos.writeObject(list);
+                    outState.putByteArray(SEARCH_STRING + getDatabaseNameFromType(), baos.toByteArray());
+                    break;
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * Restore the instance data saved.  This includes the User entered search string.
+     *
+     * @param savedInstanceState - The bundle of instance data saved
+     */
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+
+        super.onActivityCreated(savedInstanceState);
+
+        if (savedInstanceState != null) {
+
+            mFlipper.setDisplayedChild(savedInstanceState.getInt(FLIP_ACTIVE_SEARCH_STRING + getDatabaseNameFromType(), 0));
+
+            try {
+                switch (mType) {
+                    case USERS: {
+                        ByteArrayInputStream bais = new ByteArrayInputStream(savedInstanceState.getByteArray(SEARCH_STRING + getDatabaseNameFromType()));
+                        ObjectInputStream ois = new ObjectInputStream(bais);
+                        List<UserResponseHit> list = (List<UserResponseHit>) ois.readObject();
+                        mUsersAdapter.clearData();
+                        mUsersAdapter.add(list);
+                        break;
+                    }
+                    case PROJECTS: {
+                        ByteArrayInputStream bais = new ByteArrayInputStream(savedInstanceState.getByteArray(SEARCH_STRING + getDatabaseNameFromType()));
+                        ObjectInputStream ois = new ObjectInputStream(bais);
+                        List<ProjectResponseHit> list = (List<ProjectResponseHit>) ois.readObject();
+                        mProjectsAdapter.clearData();
+                        mProjectsAdapter.add(list);
+                        break;
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            }
+
+        }
+
+    }
+
     @Override
     public void onSearchInteraction(String searchString) {
 

ArtistryMuse/app/src/main/java/com/concavenp/artistrymuse/fragments/SearchFragment.java

@@ -114,6 +114,12 @@ public int getItemCount() {
 
     }
 
+    public List<E> getData() {
+
+        return mResultItems;
+
+    }
+
     public void add(List<E> results) {
 
         mResultItems.addAll(results);

ArtistryMuse/app/src/main/java/com/concavenp/artistrymuse/fragments/SearchResultFragment.java

@@ -24,6 +24,6 @@
     <item
         android:id="@+id/action_save"
         android:orderInCategory="100"
-        android:title="Save"
+        android:title="@string/save"
         app:showAsAction="always"/>
 </menu>

ArtistryMuse/app/src/main/java/com/concavenp/artistrymuse/fragments/adapter/SearchResultAdapter.java

@@ -24,6 +24,6 @@
     <item
         android:id="@+id/action_save"
         android:orderInCategory="100"
-        android:title="Save"
+        android:title="@string/save"
         app:showAsAction="always"/>
 </menu>