diff --git a/README.md b/README.md
index 5c27a94..d7e106b 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,46 @@
-## Android App for automatic Wifi connection using OCR
-This is a team repository for CS470 final project.
+# Android App for automatic Wifi connection using OCR
+>This is a team 12 repository for CS470 final project.
+
+
+
+## Application Overview
+When using the provided network in places like cafe, people have to search for the matching WIFI network ID in the available WIFI list and type the PW manually.
+**This Android application will enable user to connect to WIFI automatically by just simply scanning the picture that contains WIFI ID and PW**
+
+
+
+
+
+## Process Pipeline
+1. [Input] Picture that contains WIFI ID and PW. The picture can contain letters other than the ID and PW, and the letters can be hand-written.
+2. Detect the words and their positions using OCR pretrained model.
+3. From the detected information in step 2, extract WIFI ID and PW.
+4. Using Android network API, connect to WIFI automatically using retrieved ID and PW.
+
+
+
+## Use Flow
+
+
+
+
+## Considerations for Implementation
+### Evaluation
+Though we use pretrained model for OCR, we have to post process the ID and PW information from the OCR model output. We will evaluate out application by measuring the success rate of "Extracting both correct ID and PW from arbitrary WIFI information picture".
+
+### Input data
+Though we use pretrained model, we need input data for making a good post processing strategy and evaluation.
+We will first collect some real WIFI information picture data by Hand collecting and crawl from Google image search.
+Since the images we require are very specific, the amount of data that can be collected by above ways might not be large. However, the reason we need input data is not for training but for evaluation and deciding post processing strategy. If the collected data is too small even for above objectives, we will search for other ways to enlarge the data. (e.g. generation based on collected real data)
+
+### OCR model
+We will modularize here, and first use OCR cloud API.
+This will require network connection, so we will try applying an on-device model if time allows.
+Model output will be collection of
+{Detected characters, Bounding box position and size}s
+
+### Post processing for ID and PW extraction
+We will first try deterministic way for this, using approaches listed below. If it is too unsuccessful, we should search for other approaches.
+- Word position and size. (Centered, Big, SSID is usually followed by Password, etc)
+- Field tag. (ID, PW, etc)
+- Match with retrieved available Wi-fi SSIDs.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 3687b05..01a93c1 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme.NoActionBar">
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/rectangle_opaque.xml b/android/app/src/main/res/drawable/rectangle_opaque.xml
new file mode 100644
index 0000000..0851e5b
--- /dev/null
+++ b/android/app/src/main/res/drawable/rectangle_opaque.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/activity_camera.xml b/android/app/src/main/res/layout/activity_camera.xml
index 5c8ee38..9a66fbe 100644
--- a/android/app/src/main/res/layout/activity_camera.xml
+++ b/android/app/src/main/res/layout/activity_camera.xml
@@ -2,6 +2,7 @@
@@ -10,32 +11,42 @@
android:id="@+id/cameraSurfaceView"
android:layout_width="match_parent"
android:layout_height="0dp"
- app:layout_constraintBottom_toBottomOf="@id/cameraMenusLayout"
app:layout_constraintDimensionRatio="3:4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0" />
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+
+
+ app:layout_constraintBottom_toBottomOf="@id/rectangleView4">
-
+ app:layout_constraintStart_toStartOf="parent"
+ app:srcCompat="@drawable/icon_camera_btn" />
+
+
diff --git a/android/app/src/main/res/layout/activity_fail.xml b/android/app/src/main/res/layout/activity_fail.xml
index 7cddd67..1866314 100644
--- a/android/app/src/main/res/layout/activity_fail.xml
+++ b/android/app/src/main/res/layout/activity_fail.xml
@@ -2,41 +2,117 @@
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -46,48 +122,82 @@
android:id="@+id/pwConstraintLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginStart="16dp"
- android:layout_marginTop="16dp"
+ android:layout_marginBottom="12dp"
+ android:layout_marginTop="12dp"
+ app:layout_constraintBottom_toTopOf="@id/buttonsConstraintLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/idContraintLayout">
+
+
-
+
+
+
+
+
+
+
+
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index ce38ba0..130a4b4 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -2,20 +2,58 @@
-
+
+
+
+
+
+
diff --git a/android/app/src/main/res/layout/activity_processing.xml b/android/app/src/main/res/layout/activity_processing.xml
index c2de254..fe0a407 100644
--- a/android/app/src/main/res/layout/activity_processing.xml
+++ b/android/app/src/main/res/layout/activity_processing.xml
@@ -2,66 +2,33 @@
-
+
-
-
-
-
-
-
-
+
diff --git a/android/app/src/main/res/layout/activity_select_id.xml b/android/app/src/main/res/layout/activity_select_id.xml
index bca873c..ff0a1ab 100644
--- a/android/app/src/main/res/layout/activity_select_id.xml
+++ b/android/app/src/main/res/layout/activity_select_id.xml
@@ -2,16 +2,62 @@
+
+
+
+
+
+
+
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.6" />
+
diff --git a/android/app/src/main/res/layout/activity_success.xml b/android/app/src/main/res/layout/activity_success.xml
index f1a92f2..8191f90 100644
--- a/android/app/src/main/res/layout/activity_success.xml
+++ b/android/app/src/main/res/layout/activity_success.xml
@@ -2,21 +2,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/rectangleView" />
+
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 3ab3e9c..30b0e48 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,6 +1,7 @@
- #3F51B5
- #303F9F
- #FF4081
+ #6078f4
+ #6078f4
+ #FFFFFF
+ #363A3C
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 545b9c6..455c5f4 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
diff --git a/image_readme/Page1.png b/image_readme/Page1.png
new file mode 100644
index 0000000..bd7c157
Binary files /dev/null and b/image_readme/Page1.png differ
diff --git a/image_readme/Page2.png b/image_readme/Page2.png
new file mode 100644
index 0000000..93be8c7
Binary files /dev/null and b/image_readme/Page2.png differ
diff --git a/image_readme/Page3.png b/image_readme/Page3.png
new file mode 100644
index 0000000..c9583c4
Binary files /dev/null and b/image_readme/Page3.png differ
diff --git a/image_readme/Page4.png b/image_readme/Page4.png
new file mode 100644
index 0000000..94b7f0a
Binary files /dev/null and b/image_readme/Page4.png differ
diff --git a/image_readme/Page5.png b/image_readme/Page5.png
new file mode 100644
index 0000000..668e159
Binary files /dev/null and b/image_readme/Page5.png differ
diff --git a/image_readme/Page6.png b/image_readme/Page6.png
new file mode 100644
index 0000000..02d2ca2
Binary files /dev/null and b/image_readme/Page6.png differ
diff --git a/image_readme/Use Flow.png b/image_readme/Use Flow.png
new file mode 100644
index 0000000..da505ad
Binary files /dev/null and b/image_readme/Use Flow.png differ
diff --git a/image_readme/User Flow.png b/image_readme/User Flow.png
new file mode 100644
index 0000000..534625f
Binary files /dev/null and b/image_readme/User Flow.png differ
diff --git a/image_readme/wifi.jpg b/image_readme/wifi.jpg
new file mode 100644
index 0000000..911bf03
Binary files /dev/null and b/image_readme/wifi.jpg differ