- add coffee1,2,3 click listener

- fix progress of login

- add coffee1,2,3 click listener
- fix progress of login
transpine
1 parent 46e2914b
Showing 4 changed files with 37 additions and 12 deletions
app/src/main/java/net/devfac/userstory/ActivityAbout.java
app/src/main/java/net/devfac/userstory/FSM/state/StateLoginRequested.java
app/src/main/java/net/devfac/userstory/FSM/state/StateLogoutRequested.java
app/src/main/java/net/devfac/userstory/MainActivity.java
@@ -81,6 +81,8 @@ public class ActivityAbout extends AppCompatActivity implements View.OnClickList
         mImageViewAboutCoffee3 = (ImageView)findViewById(R.id.imageview_about_coffee3);
  
         mImageViewAboutCoffee1.setOnClickListener(this);
+        mImageViewAboutCoffee2.setOnClickListener(this);
+        mImageViewAboutCoffee3.setOnClickListener(this);
  
         //PAYMENT_TARGET
         mSkuList = new ArrayList<>();
@@ -252,8 +254,10 @@ public class ActivityAbout extends AppCompatActivity implements View.OnClickList
                 buyCoffee(Constants.PAYMENT_SKU_COFFEE_1);
                 break;
             case R.id.imageview_about_coffee2:
+                buyCoffee(Constants.PAYMENT_SKU_COFFEE_2);
                 break;
             case R.id.imageview_about_coffee3:
+                buyCoffee(Constants.PAYMENT_SKU_COFFEE_3);
                 break;
         }
  
@@ -41,6 +41,11 @@ public class StateLoginRequested implements State {
                 mStateContext.mWebView.loadUrl(UrlGenerator.getInstance(mStateContext.mContext).getLogin());
             }
         });
+
+        for( StateEventListener listener:mStateContext.mStateEventListenerArray){
+            listener.onEntry(this.getClass(), input);
+        }
+
     }
  
     @Override
@@ -41,6 +41,11 @@ public class StateLogoutRequested implements State {
                 mStateContext.mWebView.loadUrl(UrlGenerator.getInstance(mStateContext.mContext).getLogout());
             }
         });
+
+        for( StateEventListener listener:mStateContext.mStateEventListenerArray){
+            listener.onEntry(this.getClass(), input);
+        }
+
     }
  
     @Override
@@ -26,6 +26,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.SearchView;
@@ -347,22 +348,32 @@ public class MainActivity extends AppCompatActivity
     public void onEntry(Class stateClass, Object input) {
         if( stateClass.equals(StateLoginRequested.class)){
 //            Toast.makeText(this, "로그인 중입니다...", Toast.LENGTH_LONG).show();
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    mProgressDialog = ProgressDialog.show(MainActivity.this, "로그인중입니다", "잠시만 기다려 주세요...");
-                }
-            });
+            try {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        mProgressDialog = ProgressDialog.show(MainActivity.this, "로그인중입니다", "잠시만 기다려 주세요...");
+                    }
+                });
+            }
+            catch(WindowManager.BadTokenException e){
+                Logger.i("Windows closed very shortly");
+            }
  
         }
         else if( stateClass.equals(StateLogoutRequested.class)){
 //            Toast.makeText(this, "로그아웃 중입니다...", Toast.LENGTH_LONG).show();
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    mProgressDialog = ProgressDialog.show(MainActivity.this, "로그아웃중입니다", "잠시만 기다려 주세요...");
-                }
-            });
+            try {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        mProgressDialog = ProgressDialog.show(MainActivity.this, "로그아웃중입니다", "잠시만 기다려 주세요...");
+                    }
+                });
+            }
+            catch(WindowManager.BadTokenException e){
+                Logger.i("Windows closed very shortly");
+            }
  
         }
     }