- webView delay 3 -> 1sec

- display BookSearchResult at DialogAddBook

- webView delay 3 -> 1sec
- display BookSearchResult at DialogAddBook
transpine
1 parent 6102c27f
Showing 5 changed files with 48 additions and 38 deletions
app/src/main/java/net/devfac/userstory/DialogAddBook.java
app/src/main/java/net/devfac/userstory/FSM/StateContext.java
app/src/main/java/net/devfac/userstory/FragmentAddBook.java
app/src/main/java/net/devfac/userstory/MainActivity.java
app/src/main/res/layout/dialog_add_book.xml
@@ -3,19 +3,41 @@ package net.devfac.userstory;
 import android.app.Dialog;
 import android.content.Context;
 import android.view.WindowManager;
+import android.widget.TextView;
  
 /**
  * Created by Onether on 15. 11. 7..
  */
 public class DialogAddBook extends Dialog {
+    private TextView mTextBookAddTitle;
+    private TextView mTextBookAddDetails;
+
     public DialogAddBook(Context context) {
         super(context);
+        windowDimBehind();
+
+        setContentView(R.layout.dialog_add_book);
+    }
+
+    public DialogAddBook(Context context, FragmentAddBook.BookSearchResult selectedBook) {
+        super(context);
+        windowDimBehind();
+
+        setContentView(R.layout.dialog_add_book);
+
+        mTextBookAddTitle = (TextView)findViewById(R.id.text_book_add_title);
+        mTextBookAddDetails = (TextView)findViewById(R.id.text_book_add_details);
+
+        mTextBookAddTitle.setText(selectedBook.title);
+        String details = selectedBook.desc + "|" + selectedBook.genre.replace("&gt;", ">");
+        mTextBookAddDetails.setText(details);
+    }
  
+    private void windowDimBehind(){
         WindowManager.LayoutParams lpWindow = new WindowManager.LayoutParams();
         lpWindow.flags = WindowManager.LayoutParams.FLAG_DIM_BEHIND;
         lpWindow.dimAmount = 0.8f;
         getWindow().setAttributes(lpWindow);
-
-        setContentView(R.layout.dialog_add_book);
     }
+
 }
@@ -223,20 +223,6 @@ public class StateContext {
                 String submit = "javascript:go_find();";
                 runJavaScript(view, submit);
  
-//                view.loadUrl("javascript:$(document).ajaxStart(go_find);");
-//                view.loadUrl("javascript:$(document).ajaxComplete(function (event, request, settings) { " +
-////                        "ajaxHandler.ajaxDone(); " + // Event called when an AJAX call ends
-//                        "window.UserstoryScripter.parseBookSearchResult"
-//                        + "('<html>'+document.getElementsByTagName('html')[0].innerHTML+'</html>');"+
-//                        "});");
-
-//                view.loadUrl("javascript:$(document).ajaxStart(go_find(){ " +
-//                        "ajaxHandler.ajaxBegin(); " + // Event called when an AJAX call begins
-//                        "});");
-//                view.loadUrl("javascript:$(document).ajaxComplete(function (event, request, settings) { " +
-//                        "ajaxHandler.ajaxDone(); " + // Event called when an AJAX call ends
-//                        "});");
-
                 final WebView finalWebView = view;
  
                 Handler mHandler = new Handler();
@@ -245,14 +231,7 @@ public class StateContext {
                     public void run() {
                         getDelayedWebViewContents();
                     }
-                }, 3000);
-
-
-
-//                view.loadUrl("javascript:window.UserstoryScripter.parseBookSearchResult"
-//                        + "('<html>'+document.getElementsByTagName('html')[0].innerHTML+'</html>');");
-
-//                view.loadUrl("javascript:window.UserstoryScripter.showHTML" + "('<html>'+document.getElementsByTagName('html')[0].innerHTML+'</html>');");
+                }, 1000);
  
             }
  
@@ -279,6 +279,10 @@ public class FragmentAddBook extends Fragment implements View.OnClickListener, S
             StateContext.getInstance(getActivity()).processEvent(Action.REQ_INPUT_INFO_TO_ADD,
                     parent.getItemAtPosition(position));
  
+            DialogAddBook mDialogAddBook = new DialogAddBook(getActivity(), (BookSearchResult)parent.getItemAtPosition(position));
+            mDialogAddBook.setTitle("책 추가하기");
+            mDialogAddBook.show();
+
             return false;
         }
     }
 package net.devfac.userstory;
  
+import android.app.Dialog;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.os.Bundle;
@@ -67,9 +68,7 @@ public class MainActivity extends AppCompatActivity
                 Snackbar.make(view, "ADD BOOKS", Snackbar.LENGTH_LONG)
                         .setAction("Action", null).show();
  
-//                fragmentReplace(Constants.FRAGMENT_SELECT.FRAG_ADD_BOOK);
-                new DialogAddBook(MainActivity.this).show();
-
+                fragmentReplace(Constants.FRAGMENT_SELECT.FRAG_ADD_BOOK);
             }
         });
  
@@ -32,13 +32,13 @@
                         android:layout_height="wrap_content"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:text="글쓰기 달인이 되려면 잘못된 문장부터 고쳐라"
-                        android:id="@+id/textView5" />
+                        android:id="@+id/text_book_add_title" />
  
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="박찬영 지음 | 리베르 | 20151031 국내도서>인문학>책읽기/글쓰기>글쓰기"
-                        android:id="@+id/textView"
+                        android:id="@+id/text_book_add_details"
                         android:singleLine="false"
                         android:autoText="false"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -75,19 +75,19 @@
                 <RadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="New RadioButton"
+                    android:text="읽고 있는 책"
                     android:id="@+id/radioButton" />
  
                 <RadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="New RadioButton"
+                    android:text="읽은 책"
                     android:id="@+id/radioButton2" />
  
                 <RadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="New RadioButton"
+                    android:text="읽을 책"
                     android:id="@+id/radioButton3" />
  
             </RadioGroup>
@@ -106,21 +106,27 @@
                 <RadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="New RadioButton"
+                    android:text="가지고 있는 책"
                     android:id="@+id/radioButton4" />
  
                 <RadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="New RadioButton"
+                    android:text="빌린 책"
                     android:id="@+id/radioButton5" />
  
                 <RadioButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="New RadioButton"
+                    android:text="갖고 싶은 책"
                     android:id="@+id/radioButton6" />
  
+                <RadioButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="빌려준 책"
+                    android:id="@+id/radioButton7" />
+
             </RadioGroup>
  
             <LinearLayout
@@ -211,7 +217,7 @@
                     android:ems="10"
                     android:id="@+id/editText2"
                     android:layout_weight="1"
-                    android:text="2010.1.1" />
+                    android:text="" />
  
             </LinearLayout>
  
@@ -235,7 +241,7 @@
                     android:ems="10"
                     android:id="@+id/editText3"
                     android:layout_weight="1"
-                    android:text="2010.1.1" />
+                    android:text="" />
  
                 <TextView
                     android:layout_width="wrap_content"
@@ -252,7 +258,7 @@
                     android:ems="10"
                     android:id="@+id/editText4"
                     android:layout_weight="1"
-                    android:text="2010.1.1" />
+                    android:text="" />
             </LinearLayout>
  
             <Button