refactoring(capture-sdk) Change align for tablets. Add string resources

PP-143
gini · Aug 26, 2024 · 8a2d2e2 · 8a2d2e2
1 parent 1c86500
commit 8a2d2e2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 29 deletions.
diff --git a/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_camera.xml b/capture-sdk/sdk/src/main/res/layout-sw600dp-land/gc_fragment_camera.xml
@@ -357,20 +357,20 @@
             app:layout_constraintStart_toStartOf="@+id/gc_injected_loading_indicator"
             app:layout_constraintTop_toBottomOf="@+id/gc_injected_loading_indicator" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <include
+            layout="@layout/gc_detection_error_layout"
+            android:id="@+id/gc_detection_error_layout"
+            android:layout_width="@dimen/gc_photo_disabled_detection_width"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="@+id/gc_camera_frame_wrapper"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginHorizontal="@dimen/gc_large_32"
+            app:layout_constraintTop_toTopOf="parent"
+            android:visibility="gone"
+            app:layout_constraintVertical_bias="0.85" />
 
-    <include
-        layout="@layout/gc_detection_error_layout"
-        android:id="@+id/gc_detection_error_layout"
-        android:layout_width="@dimen/gc_photo_disabled_detection_width"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@+id/gc_camera_frame_wrapper"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginHorizontal="@dimen/gc_large_32"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"
-        app:layout_constraintVertical_bias="0.85" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <net.gini.android.capture.view.InjectedViewContainer
         android:id="@+id/gc_injected_navigation_bar_container_bottom"

diff --git a/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_camera.xml b/capture-sdk/sdk/src/main/res/layout-sw600dp/gc_fragment_camera.xml
@@ -359,21 +359,20 @@
             app:layout_constraintStart_toStartOf="@+id/gc_injected_loading_indicator"
             app:layout_constraintTop_toBottomOf="@+id/gc_injected_loading_indicator" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <include
-        layout="@layout/gc_detection_error_layout"
-        android:id="@+id/gc_detection_error_layout"
-        android:layout_width="@dimen/gc_photo_disabled_detection_width"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@+id/gc_camera_frame_wrapper"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginHorizontal="@dimen/gc_large_32"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"
-        app:layout_constraintVertical_bias="0.9" />
+        <include
+            layout="@layout/gc_detection_error_layout"
+            android:id="@+id/gc_detection_error_layout"
+            android:layout_width="@dimen/gc_photo_disabled_detection_width"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="@+id/gc_camera_frame_wrapper"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginHorizontal="@dimen/gc_large_32"
+            android:visibility="gone"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.9" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <net.gini.android.capture.view.InjectedViewContainer
         android:id="@+id/gc_injected_navigation_bar_container_bottom"

diff --git a/capture-sdk/sdk/src/main/res/layout/gc_detection_error_layout.xml b/capture-sdk/sdk/src/main/res/layout/gc_detection_error_layout.xml
@@ -14,7 +14,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="parent"
         android:textColor="@color/gc_dark_02"
-        android:text="QR code scanning is currently unavailable. Please take a picture of your invoice instead."/>
+        android:text="@string/gc_detection_error_layout_description"/>
 
 
     <TextView
@@ -26,5 +26,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:textColor="@color/gc_accent_01"
         android:padding="@dimen/gc_large"
-        android:text="Dismiss"/>
+        android:text="@string/gc_snackbar_dismiss"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/capture-sdk/sdk/src/main/res/values-en/strings.xml b/capture-sdk/sdk/src/main/res/values-en/strings.xml
@@ -159,4 +159,5 @@
     <string name="gc_date_picker_select">Select</string>
     <string name="gc_date_picker_cancel">Cancel</string>
     <!--   endregion -->
+    <string name="gc_detection_error_layout_description">QR code scanning is currently unavailable. Please take a picture of your invoice instead.</string>
 </resources>
diff --git a/capture-sdk/sdk/src/main/res/values/strings.xml b/capture-sdk/sdk/src/main/res/values/strings.xml
@@ -177,4 +177,5 @@
     <string name="gc_date_picker_select">Auswählen</string>
     <string name="gc_date_picker_cancel">Abbrechen</string>
     <!--   endregion -->
+    <string name="gc_detection_error_layout_description">QR-Code scannen ist derzeit nicht verfügbar. Bitte fotografieren Sie stattdessen Ihre Rechnung.</string>
 </resources>