Merge pull request #6029 from nextcloud/style/noid/unifyMetaContainers

Unify meta info containers

Author: AndyScherzinger

app/src/main/res/layout/activity_chat.xml

@@ -115,8 +115,10 @@
             android:layout_height="wrap_content"
             android:visibility="gone"
             tools:visibility="visible"
-            android:layout_margin="8dp"
-            app:cardCornerRadius="12dp">
+            android:layout_marginStart="@dimen/standard_quarter_margin"
+            android:layout_marginEnd="@dimen/standard_quarter_margin"
+            android:layout_marginTop="@dimen/standard_quarter_margin"
+            app:cardCornerRadius="@dimen/meta_info_corner_radius">
 
             <include layout="@layout/remainder_to_delete_conversation" />
         </com.google.android.material.card.MaterialCardView>
@@ -143,7 +145,9 @@
                 android:id="@+id/upcoming_event_card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/standard_quarter_margin"
+                android:layout_marginStart="@dimen/standard_quarter_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
+                android:layout_marginTop="@dimen/standard_quarter_margin"
                 android:visibility="gone"
                 app:cardCornerRadius="@dimen/meta_info_corner_radius"
                 tools:visibility="visible">
@@ -158,7 +162,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="@dimen/standard_half_padding"
+                android:padding="@dimen/standard_quarter_padding"
                 android:visibility="gone"
                 android:background="@color/transparent"
                 tools:visibility="visible">
@@ -174,16 +178,18 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_margin="8dp"
                 android:background="@color/bg_default">
 
                 <com.google.android.material.card.MaterialCardView
                     android:id="@+id/out_of_office_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
                     tools:visibility="visible"
-                    app:cardCornerRadius="12dp">
+                    android:layout_marginStart="@dimen/standard_quarter_margin"
+                    android:layout_marginEnd="@dimen/standard_quarter_margin"
+                    android:layout_marginTop="@dimen/standard_quarter_margin"
+                    android:visibility="gone"
+                    app:cardCornerRadius="@dimen/meta_info_corner_radius">
 
                     <include layout="@layout/out_of_office_view" />
                 </com.google.android.material.card.MaterialCardView>

app/src/main/res/layout/remainder_to_delete_conversation.xml

@@ -1,34 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Nextcloud Talk - Android Client
   ~
   ~ SPDX-FileCopyrightText: 2025 Sowjanya Kota <sowjanya.kch@gmail.com>
   ~ SPDX-License-Identifier: GPL-3.0-or-later
-  -->
-
-
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/deletion_warning_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:gravity="center_horizontal"
-    android:padding="12dp">
+    android:orientation="vertical"
+    android:padding="@dimen/standard_half_padding">
 
     <TextView
         android:id="@+id/deletion_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:lineSpacingExtra="4dp"
         android:gravity="center"
-        android:layout_marginBottom="12dp" />
+        android:lineSpacingExtra="4dp"
+        android:textSize="14sp" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_horizontal">
+        android:layout_marginTop="@dimen/standard_half_margin"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/delete_now_button"
@@ -53,4 +52,4 @@
             app:iconGravity="textStart" />
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/values/dimens.xml

@@ -56,6 +56,7 @@
     <dimen name="zero">0dp</dimen>
 
     <dimen name="standard_quarter_margin">4dp</dimen>
+    <dimen name="standard_quarter_padding">4dp</dimen>
     <dimen name="activity_row_layout_height">48dp</dimen>
     <dimen name="reaction_bottom_sheet_layout_size">40dp</dimen>
     <dimen name="standard_eighth_margin">2dp</dimen>