feat: add invite code to UI.

4 files changed, 80 insertions, 27 deletions

diff --git a/app/src/main/res/drawable/qr_code_scanner.xml b/app/src/main/res/drawable/qr_code_scanner.xml
new file mode 100644
index 00000000..5ab50c71
--- /dev/null
+++ b/app/src/main/res/drawable/qr_code_scanner.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M9.5,6.5v3h-3v-3H9.5M11,5H5v6h6V5L11,5zM9.5,14.5v3h-3v-3H9.5M11,13H5v6h6V13L11,13zM17.5,6.5v3h-3v-3H17.5M19,5h-6v6h6V5L19,5zM13,13h1.5v1.5H13V13zM14.5,14.5H16V16h-1.5V14.5zM16,13h1.5v1.5H16V13zM13,16h1.5v1.5H13V16zM14.5,17.5H16V19h-1.5V17.5zM16,16h1.5v1.5H16V16zM17.5,14.5H19V16h-1.5V14.5zM17.5,17.5H19V19h-1.5V17.5zM22,7h-2V4h-3V2h5V7zM22,22v-5h-2v3h-3v2H22zM2,22h5v-2H4v-3H2V22zM2,2v5h2V4h3V2H2z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/f_provider_selection.xml b/app/src/main/res/layout/f_provider_selection.xml
index 48d5bdd3..e1b7fc64 100644
--- a/app/src/main/res/layout/f_provider_selection.xml
+++ b/app/src/main/res/layout/f_provider_selection.xml
@@ -61,35 +61,74 @@
                     android:layout_height="wrap_content"
                     >
                 </RadioGroup>
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:id="@+id/expandable_detail_container">
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:paddingTop="@dimen/stdpadding"
-                        android:id="@+id/provider_description"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        tools:text="@string/provider_description_riseup"/>
-                    <androidx.appcompat.widget.AppCompatEditText
-                        android:id="@+id/edit_customProvider"
-                        android:layout_marginVertical="@dimen/stdpadding"
-                        android:paddingHorizontal="@dimen/stdpadding"
-                        android:paddingVertical="@dimen/compact_padding"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@color/white"
-                        android:hint="https://example.org"
-                        android:inputType="textWebEditText"
-                        android:imeOptions="actionDone"
-                        android:maxLines="1"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                        android:textColorHint="@color/black800_transparent"
-                        />
-                </androidx.appcompat.widget.LinearLayoutCompat>
             </androidx.appcompat.widget.LinearLayoutCompat>
         </androidx.cardview.widget.CardView>
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/activity_margin"
+            android:paddingBottom="@dimen/list_view_margin_top"
+            android:background="@color/color_provider_description_background"
+            android:id="@+id/expandable_detail_container">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:paddingTop="@dimen/stdpadding"
+                android:id="@+id/provider_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="@string/provider_description_riseup"/>
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/edit_customProvider"
+                android:layout_marginVertical="@dimen/stdpadding"
+                android:paddingHorizontal="@dimen/stdpadding"
+                android:paddingVertical="@dimen/compact_padding"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                tools:hint="https://example.org"
+                android:imeOptions="actionDone"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textColorHint="@color/black800_transparent"
+                />
+            <LinearLayout
+                android:id="@+id/syntax_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:paddingTop="@dimen/stdpadding"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/syntax_check"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/syntax_check_result"
+                    android:paddingTop="@dimen/stdpadding"
+                    android:paddingStart="@dimen/stdpadding"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:text="Good"/>
+            </LinearLayout>
+            <LinearLayout
+                android:visibility="gone"
+                android:id="@+id/qr_scanner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="@dimen/stdpadding"
+                android:orientation="horizontal">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:paddingTop="@dimen/stdpadding"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@drawable/qr_code_scanner"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:paddingTop="@dimen/stdpadding"
+                    android:paddingStart="@dimen/stdpadding"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/qr_scanner_prompt"/>
+            </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.appcompat.widget.LinearLayoutCompat>
 
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 84a2d9f0..d81c4021 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
     <color name="colorPrimaryLight">#FF69B4</color>
     <color name="colorPrimaryDark">#ef0072</color>
     <color name="colorPrimary_transparent">#0D000000</color>
+    <color name="color_provider_description_background">#F6F6F6</color>
     <color name="colorPrimary_transparent_dark">#1F000000</color>
     <color name="colorBackground">#fffafafa</color>
     <color name="colorError">#ef9a9a</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b90c4e0f..c40f5819 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -212,6 +212,10 @@
     <string name="provider_description_riseup">Riseup provides online communication tools for people and groups working on liberatory social change. We are a project to create democratic alternatives and practice self-determination by controlling our own secure means of communications.</string>
     <string name="next">Next</string>
     <string name="add_provider_description">Bitmask connects to trusted providers that are not publicly listed. Enter your provider’s url below.</string>
+    <string name="add_provider_prompt">Enter the provider’s URL here.</string>
+    <string name="invite_code_provider_description">Bitmask allows you to connect to providers using a private Invite Code. </string>
+    <string name="invite_code_provider_prompt">Enter your trusted Invite Code here.</string>
+    <string name="qr_scanner_prompt">Click to Scan QR Code</string>
     <string name="provider_description_calyx">Calyx is a non-profit education and research organization devoted to studying, testing, developing and implementing privacy technology and tools to promote free speech, free expression, civic engagement and privacy rights on the internet and in the mobile communications industry.</string>
     <string name="title_circumvention_setup">Do You Require Censorship Circumvention?</string>
     <string name="circumvention_setup_description">If you live where the internet is censored you can use our censorship circumvention options to access all internet services. These options will slow down your connection!</string>
@@ -239,4 +243,8 @@
     <string name="permission_rejected">Permission request rejected.</string>
     <string name="login_not_supported">The current app version doesn\'t support logins, which you need to update your VPN certificate for this provider.</string>
     <string name="select_language">Select Language</string>
+    <string name="syntax_check">Syntax Check:</string>
+    <string name="validation_status_success">Good</string>
+    <string name="validation_status_failure">Bad</string>
+    <string name="enter_invite_code">Enter invite Code</string>
 </resources>