diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/f_provider_selection.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/app/src/main/res/layout/f_provider_selection.xml b/app/src/main/res/layout/f_provider_selection.xml index e1b7fc64..8ec7e7c0 100644 --- a/app/src/main/res/layout/f_provider_selection.xml +++ b/app/src/main/res/layout/f_provider_selection.xml @@ -97,36 +97,31 @@ 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" + <androidx.appcompat.widget.AppCompatButton + android:id="@+id/btn_qr_scanner" + android:padding="@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"/> + android:drawableStart="@drawable/qr_code_scanner" + android:text="@string/qr_scanner_prompt" + android:background="?attr/selectableItemBackground" + android:gravity="center_vertical"/> </LinearLayout> </androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0f284ddc..c9818d28 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -215,7 +215,7 @@ <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="qr_scanner_prompt">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> |