Reworking main KeyListPublicFragment to get progress indicator

1 files changed, 69 insertions, 16 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
index 3418fff85..3ee0202ef 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
@@ -57,6 +57,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.animation.AnimationUtils;
 import android.widget.AbsListView.MultiChoiceModeListener;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -73,6 +74,12 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
 
     private KeyListPublicAdapter mAdapter;
     private StickyListHeadersListView mStickyList;
+
+    // rebuild functionality of ListFragment, http://stackoverflow.com/a/12504097
+    boolean mListShown;
+    View mProgressContainer;
+    View mListContainer;
+
     private String mCurQuery;
     private SearchView mSearchView;
     // empty list layout
@@ -85,9 +92,14 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.key_list_public_fragment, container, false);
-        setHasOptionsMenu(true);
-        mButtonEmptyCreate = (BootstrapButton) view.findViewById(R.id.key_list_empty_button_create);
+        View root = inflater.inflate(R.layout.key_list_public_fragment, container, false);
+
+        mStickyList = (StickyListHeadersListView) root.findViewById(R.id.key_list_public_list);
+        mStickyList.setOnItemClickListener(this);
+
+
+        // empty view
+        mButtonEmptyCreate = (BootstrapButton) root.findViewById(R.id.key_list_empty_button_create);
         mButtonEmptyCreate.setOnClickListener(new OnClickListener() {
 
             @Override
@@ -99,8 +111,7 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
                 startActivityForResult(intent, 0);
             }
         });
-
-        mButtonEmptyImport = (BootstrapButton) view.findViewById(R.id.key_list_empty_button_import);
+        mButtonEmptyImport = (BootstrapButton) root.findViewById(R.id.key_list_empty_button_import);
         mButtonEmptyImport.setOnClickListener(new OnClickListener() {
 
             @Override
@@ -111,7 +122,12 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
             }
         });
 
-        return view;
+        // rebuild functionality of ListFragment, http://stackoverflow.com/a/12504097
+        mListContainer = root.findViewById(R.id.key_list_public_list_container);
+        mProgressContainer = root.findViewById(R.id.key_list_public_progress_container);
+        mListShown = true;
+
+        return root;
     }
 
     /**
@@ -122,9 +138,6 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mStickyList = (StickyListHeadersListView) getActivity().findViewById(R.id.list);
-
-        mStickyList.setOnItemClickListener(this);
         mStickyList.setAreHeadersSticky(true);
         mStickyList.setDrawingListUnderStickyHeader(false);
         mStickyList.setFastScrollEnabled(true);
@@ -134,7 +147,7 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
         }
 
         // this view is made visible if no data is available
-        mStickyList.setEmptyView(getActivity().findViewById(R.id.empty));
+        mStickyList.setEmptyView(getActivity().findViewById(R.id.key_list_public_empty));
 
         /*
          * ActionBarSherlock does not support MultiChoiceModeListener. Thus multi-selection is only
@@ -211,9 +224,12 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
             });
         }
 
+        // We have a menu item to show in action bar.
+        setHasOptionsMenu(true);
+
         // NOTE: Not supported by StickyListHeader, thus no indicator is shown while loading
         // Start out with a progress indicator.
-        // setListShown(false);
+        setListShown(false);
 
         // Create an empty adapter we will use to display the loaded data.
         mAdapter = new KeyListPublicAdapter(getActivity(), null, Id.type.public_key, USER_ID_INDEX);
@@ -262,11 +278,11 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
 
         // NOTE: Not supported by StickyListHeader, thus no indicator is shown while loading
         // The list should now be shown.
-        // if (isResumed()) {
-        // setListShown(true);
-        // } else {
-        // setListShownNoAnimation(true);
-        // }
+        if (isResumed()) {
+            setListShown(true);
+        } else {
+            setListShownNoAnimation(true);
+        }
     }
 
     @Override
@@ -376,4 +392,41 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
         getLoaderManager().restartLoader(0, null, this);
         return true;
     }
+
+    // rebuild functionality of ListFragment, http://stackoverflow.com/a/12504097
+    public void setListShown(boolean shown, boolean animate) {
+        if (mListShown == shown) {
+            return;
+        }
+        mListShown = shown;
+        if (shown) {
+            if (animate) {
+                mProgressContainer.startAnimation(AnimationUtils.loadAnimation(
+                        getActivity(), android.R.anim.fade_out));
+                mListContainer.startAnimation(AnimationUtils.loadAnimation(
+                        getActivity(), android.R.anim.fade_in));
+            }
+            mProgressContainer.setVisibility(View.GONE);
+            mListContainer.setVisibility(View.VISIBLE);
+        } else {
+            if (animate) {
+                mProgressContainer.startAnimation(AnimationUtils.loadAnimation(
+                        getActivity(), android.R.anim.fade_in));
+                mListContainer.startAnimation(AnimationUtils.loadAnimation(
+                        getActivity(), android.R.anim.fade_out));
+            }
+            mProgressContainer.setVisibility(View.VISIBLE);
+            mListContainer.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    // rebuild functionality of ListFragment, http://stackoverflow.com/a/12504097
+    public void setListShown(boolean shown) {
+        setListShown(shown, true);
+    }
+
+    // rebuild functionality of ListFragment, http://stackoverflow.com/a/12504097
+    public void setListShownNoAnimation(boolean shown) {
+        setListShown(shown, false);
+    }
 }