- add sync dialog

transpine
1 parent 226d8cd7
Showing 3 changed files with 60 additions and 40 deletions
app/src/main/java/net/devfac/userstory/ActivityLogin.java
app/src/main/java/net/devfac/userstory/FragmentBookShelf.java
app/src/main/java/net/devfac/userstory/MainActivity.java
 package net.devfac.userstory;
  
-import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -10,7 +10,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -23,8 +22,6 @@ import net.devfac.userstory.FSM.state.StateLoginRequested;
 import net.devfac.userstory.Utils.Logger;
 import net.devfac.userstory.Utils.PreferenceUtil;
  
-import org.w3c.dom.Text;
-
 /**
  * Created by Onether on 15. 11. 10..
  */
@@ -35,7 +32,7 @@ public class ActivityLogin extends AppCompatActivity implements View.OnClickList
     private ImageButton mImgBtnLogin;
     private TextView mTextHomepageLink;
  
-    private AlertDialog mAlertDialog;
+    private ProgressDialog mProgressDialog;
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -65,8 +62,6 @@ public class ActivityLogin extends AppCompatActivity implements View.OnClickList
         mTextHomepageLink.setOnClickListener(this);
  
         StateContext.getInstance(this).setStateEventListener(this);
-
-        mAlertDialog = new AlertDialog.Builder(this).create();
     }
  
     @Override
@@ -121,16 +116,27 @@ public class ActivityLogin extends AppCompatActivity implements View.OnClickList
     public void onEntry(Class stateClass, Object input) {
         if( stateClass.equals(StateLoginRequested.class)){
 //            Toast.makeText(this, "로그인 중입니다...", Toast.LENGTH_LONG).show();
-            mAlertDialog.setTitle("로그인 중입니다...");
-            mAlertDialog.setMessage("잠시만 기다려 주세요.");
-            mAlertDialog.show();
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    mProgressDialog = ProgressDialog.show(ActivityLogin.this, "로그인 중입니다", "잠시만 기다려주세요..");
+                }
+            });
         }
     }
  
     @Override
     public void onExit(Class stateClass, Object output, StateContext.STATE_RESULT stateResult) {
         if( stateClass.equals(StateLoginRequested.class)){
-            mAlertDialog.dismiss();
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if( mProgressDialog != null){
+                        mProgressDialog.dismiss();
+                    }
+                }
+            });
+
             switch( stateResult ){
                 case LOGIN_FAIL:
                     PreferenceUtil.getInstance(this).putIsLoggedInState(false);
 package net.devfac.userstory;
  
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
@@ -28,14 +29,10 @@ public class FragmentBookShelf extends Fragment implements StateEventListener {
     private BookShelfCursorAdapter mBookShelfCursorAdapter;
     private ListView mBookshelf;
     private WebView wv;
-
-    public final static String ITEMS_COUNT_KEY = "PartThreeFragment$ItemsCount";
+    private ProgressDialog mProgressDialog;
  
     public static FragmentBookShelf getInstance(int itemCount){
         FragmentBookShelf fragmentBookShelf = new FragmentBookShelf();
-        Bundle bundle = new Bundle();
-        bundle.putInt(ITEMS_COUNT_KEY, itemCount);
-        fragmentBookShelf.setArguments(bundle);
         return fragmentBookShelf;
     }
  
@@ -62,45 +59,35 @@ public class FragmentBookShelf extends Fragment implements StateEventListener {
  
     private void setupRecyclerView(RecyclerView recyclerView) {
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-//        RecyclerAdapterBookShelfItem recyclerAdapter = new RecyclerAdapterBookShelfItem(createItemList());
         RecyclerAdapterBookShelfItem recyclerAdapter = new RecyclerAdapterBookShelfItem(getActivity(), mBookShelfCursorAdapter);
         recyclerView.setAdapter(recyclerAdapter);
     }
  
-    private List<String> createItemList() {
-        List<String> itemList = new ArrayList<>();
-
-        int itemsCount = 50;
-        for (int i = 0; i < itemsCount; i++) {
-            itemList.add("Item " + i);
-        }
-        return itemList;
-    }
-
-    @Override
-    public void onResume() {
-        //TODO: error display when userid is none
-        StateContext.getInstance(getActivity()).processEvent(Action.REQ_SYNC, null);
-
-        super.onResume();
-    }
-
     @Override
     public void onEntry(Class stateClass, Object input) {
         if( stateClass.equals(StateSync.class)){
-            Toast.makeText(getActivity(), "SYNC STARTED", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(), "SYNC STARTED", Toast.LENGTH_LONG).show();
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    mProgressDialog = ProgressDialog.show(getActivity(), "SYNC", "SYNC START");
+                }
+            });
         }
-
     }
  
     @Override
     public void onExit(Class stateClass, Object output, StateContext.STATE_RESULT stateResult) {
         if( stateClass.equals(StateSync.class)){
-            Toast.makeText(getActivity(), "SYNC END", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(), "SYNC END", Toast.LENGTH_LONG).show();
             getActivity().runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     mBookShelfCursorAdapter.changeCursor(StateContext.getInstance(getActivity()).getDbOpenHelper().getCursor());
+
+                    if( mProgressDialog != null){
+                        mProgressDialog.dismiss();
+                    }
                 }
             });
         }
 package net.devfac.userstory;
  
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -47,6 +48,8 @@ public class MainActivity extends AppCompatActivity
     private AppBarLayout mAppBarMain;
     private CoordinatorLayout mCoordinateMain;
  
+    private ProgressDialog mProgressDialog;
+
     FloatingActionButton mFab;
  
     @Override
@@ -101,6 +104,7 @@ public class MainActivity extends AppCompatActivity
             @Override
             public void onPageSelected(int position) {
                 if (mViewPagerAdapter.getPosition(Constants.FRAGMENT_TITLE_BOOK_SHELF) == position) {
+                    StateContext.getInstance(MainActivity.this).processEvent(Action.REQ_SYNC, null);
                 } else if (mViewPagerAdapter.getPosition(Constants.FRAGMENT_TITLE_ADD_BOOK) == position) {
                     //Expand toolbar
                     CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) mAppBarMain.getLayoutParams();
@@ -315,15 +319,38 @@ public class MainActivity extends AppCompatActivity
     @Override
     public void onEntry(Class stateClass, Object input) {
         if( stateClass.equals(StateLoginRequested.class)){
-            Toast.makeText(this, "로그인 중입니다...", Toast.LENGTH_LONG).show();
+//            Toast.makeText(this, "로그인 중입니다...", Toast.LENGTH_LONG).show();
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    mProgressDialog = ProgressDialog.show(MainActivity.this, "로그인중입니다", "잠시만 기다려 주세요...");
+                }
+            });
+
         }
         else if( stateClass.equals(StateLogoutRequested.class)){
-            Toast.makeText(this, "로그아웃 중입니다...", Toast.LENGTH_LONG).show();
+//            Toast.makeText(this, "로그아웃 중입니다...", Toast.LENGTH_LONG).show();
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    mProgressDialog = ProgressDialog.show(MainActivity.this, "로그아웃중입니다", "잠시만 기다려 주세요...");
+                }
+            });
+
         }
     }
  
     @Override
     public void onExit(Class stateClass, Object output, StateContext.STATE_RESULT stateResult) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if( mProgressDialog != null){
+                    mProgressDialog.dismiss();
+                }
+            }
+        });
+
         if( stateClass.equals(StateLoginRequested.class)){
             switch(stateResult){
                 case LOGIN_SUCCESS: