diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/res/layout/activity_scan.xml | 17 | ||||
-rw-r--r-- | src/main/res/values/colors.xml | 7 | ||||
-rw-r--r-- | src/main/res/values/dimens.xml | 4 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 8 |
5 files changed, 37 insertions, 0 deletions
diff --git a/src/main/res/layout/activity_scan.xml b/src/main/res/layout/activity_scan.xml new file mode 100644 index 000000000..0f3765b15 --- /dev/null +++ b/src/main/res/layout/activity_scan.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextureView + android:id="@+id/scan_activity_preview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:keepScreenOn="true" /> + + <eu.siacs.conversations.ui.widget.ScannerView + android:id="@+id/scan_activity_mask" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</merge>
\ No newline at end of file diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index d3b0e6a88..2442282e3 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -26,4 +26,11 @@ <color name="away">#ffff9800</color> <color name="notavailable">#fff44336</color> <color name="warning_button">#fff5d9d9</color> + + <!-- scanner --> + <color name="scan_mask">#60000000</color> + <color name="scan_laser">#cc0000</color> + <color name="scan_dot">#ff6600</color> + <color name="scan_result_view">#b0000000</color> + <color name="scan_result_dots">#c099cc00</color> </resources> diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 933c7daea..d6a9a5ede 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -10,4 +10,8 @@ <dimen name="fineprint_size">11sp</dimen> <dimen name="audio_player_width">224dp</dimen> <dimen name="avatar_item_distance">16dp</dimen> + + <!-- scanner --> + <dimen name="scan_laser_width">4dp</dimen> + <dimen name="scan_dot_size">8dp</dimen> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4f8554b0c..1fd306d37 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -770,4 +770,5 @@ <string name="mtm_notification">Certificate Verification</string> <string name="once">Once</string> <string name="theme">Theme</string> + <string name="qr_code_scanner_needs_access_to_camera">The QR code scanner needs access to the camera</string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index b70fe0bd7..4db3ae107 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -85,4 +85,12 @@ <item name="android:windowFullscreen">true</item> </style> + <style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light"> + <item name="android:windowNoTitle">true</item> + <item name="android:windowActionBar">false</item> + <item name="android:windowFullscreen">true</item> + <item name="android:windowContentOverlay">@null</item> + <item name="android:windowBackground">@android:color/black</item> + </style> + </resources>
\ No newline at end of file |