photo, orange label

skaut · Sep 23, 2023 · 3ed2c02 · 3ed2c02
1 parent 78c7e43
commit 3ed2c02
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 43 deletions.
diff --git a/app/src/main/java/cz/skaut/srs/ticketsreader/processor/TicketQrProcessor.kt b/app/src/main/java/cz/skaut/srs/ticketsreader/processor/TicketQrProcessor.kt
@@ -74,7 +74,7 @@ class TicketQrProcessor(context: FragmentActivity) : QrProcessor(context) {
             tvMessage.text = context.getString(R.string.dialog_ticket_message_missing_subevent)
         } else if (ticketInfo.subeventChecks.isNotEmpty()) {
             tvStatus.text = context.getString(R.string.dialog_ticket_status_used)
-            tvStatus.setTextColor(Color.RED)
+            tvStatus.setTextColor(Color.rgb(255, 165, 0))
             tvMessage.text = context.getString(R.string.dialog_ticket_message_used)
         } else {
             tvStatus.text = context.getString(R.string.dialog_ticket_status_valid)

diff --git a/app/src/main/res/layout/dialog_ticket.xml b/app/src/main/res/layout/dialog_ticket.xml
@@ -30,54 +30,50 @@
         android:layout_marginTop="8dp"
         android:orientation="vertical">
 
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" android:gravity="center_horizontal">
+
+            <ImageView
+                android:id="@+id/dialog_ticket_iv_photo"
+                android:layout_width="120dp"
+                android:layout_height="160dp"
+                android:importantForAccessibility="no"
+                android:scaleType="fitXY" />
+        </TableRow>
+
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <TableLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/dialog_ticket_tv_name_label"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:orientation="vertical">
-
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <TextView
-                        android:id="@+id/dialog_ticket_tv_name_label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:text="@string/dialog_ticket_tv_name_label" />
-
-                    <TextView
-                        android:id="@+id/dialog_ticket_tv_name_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-                </TableRow>
-
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <TextView
-                        android:id="@+id/dialog_ticket_tv_age_label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:text="@string/dialog_ticket_tv_age_label" />
-
-                    <TextView
-                        android:id="@+id/dialog_ticket_tv_age_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-                </TableRow>
-            </TableLayout>
+                android:layout_marginEnd="8dp"
+                android:text="@string/dialog_ticket_tv_name_label" />
 
-            <ImageView
-                android:id="@+id/dialog_ticket_iv_photo"
-                android:importantForAccessibility="no" />
+            <TextView
+                android:id="@+id/dialog_ticket_tv_name_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </TableRow>
+
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/dialog_ticket_tv_age_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:text="@string/dialog_ticket_tv_age_label" />
+
+            <TextView
+                android:id="@+id/dialog_ticket_tv_age_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
         </TableRow>
 
         <TableRow