Browse Source

Design : messages to use more screen width.

Signed-off-by: Sofian Benissa <sofian.benissa@mubs.edu.lb>
Sofian Benissa 2 years ago
parent
commit
2b76760c9f

+ 22 - 16
app/src/main/res/layout/item_file_message_received.xml

@@ -22,6 +22,18 @@
         app:layout_constraintStart_toEndOf="@+id/frameLayout"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--    <TextView-->
+    <!--        android:id="@+id/textViewOptions"-->
+    <!--        android:layout_width="wrap_content"-->
+    <!--        android:layout_height="wrap_content"-->
+    <!--        android:layout_alignParentTop="true"-->
+    <!--        android:layout_alignParentRight="true"-->
+    <!--        android:paddingLeft="@dimen/margin_activity_horizontal"-->
+    <!--        android:text="&#8942;"-->
+    <!--        android:textAppearance="?android:textAppearanceLarge"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--        app:layout_constraintStart_toStartOf="parent" />-->
+
     <FrameLayout
         android:id="@+id/frameLayout"
         android:layout_width="wrap_content"
@@ -29,7 +41,10 @@
         android:layout_margin="2dp"
         android:background="@drawable/rounded_rectangle_steel"
         android:padding="8dp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/fab_pin"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -54,12 +69,14 @@
                 android:layout_marginStart="4dp"
                 android:background="@drawable/nickname_background"
                 android:ellipsize="end"
-                android:maxWidth="200dp"
                 android:padding="8dp"
                 android:singleLine="true"
                 android:text="@string/really_long_word"
                 android:textColor="#ffffff"
                 android:textSize="12sp"
+                app:layout_constrainedWidth="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toEndOf="@+id/image_message_profile"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -112,28 +129,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                android:layout_marginTop="12dp"
-                android:maxWidth="200dp"
                 android:text="@string/send_file"
+                app:layout_constrainedWidth="true"
+                app:layout_constraintBottom_toBottomOf="@+id/img_holder"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toEndOf="@+id/img_holder"
                 app:layout_constraintTop_toTopOf="@+id/img_holder" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 
-    <!--    <TextView-->
-    <!--        android:id="@+id/textViewOptions"-->
-    <!--        android:layout_width="wrap_content"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:layout_alignParentTop="true"-->
-    <!--        android:layout_alignParentRight="true"-->
-    <!--        android:paddingLeft="@dimen/margin_activity_horizontal"-->
-    <!--        android:text="&#8942;"-->
-    <!--        android:textAppearance="?android:textAppearanceLarge"-->
-    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--        app:layout_constraintStart_toStartOf="parent" />-->
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_pin"
         android:layout_width="wrap_content"
@@ -145,7 +151,7 @@
         android:tint="#FFA025"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/frameLayout"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_baseline_push_pin_24" />
 

+ 6 - 2
app/src/main/res/layout/item_file_message_sent_ok.xml

@@ -27,7 +27,10 @@
         android:layout_height="wrap_content"
         android:background="@drawable/rounded_rectangle_dark"
         android:padding="8dp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1"
+        app:layout_constraintStart_toEndOf="@+id/fab_pin"
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -94,8 +97,9 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:background="@drawable/rounded_rectangle_dark"
-                android:maxWidth="200dp"
                 android:text="@string/send_file"
+                app:layout_constrainedWidth="true"
+                app:layout_constraintBottom_toBottomOf="@+id/img_holder"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/img_holder"
                 app:layout_constraintTop_toTopOf="@+id/img_holder" />
@@ -114,7 +118,7 @@
         android:tint="#FFA025"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/frameLayout"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_baseline_push_pin_24" />
 

+ 21 - 16
app/src/main/res/layout/item_message_received.xml

@@ -21,6 +21,18 @@
         app:layout_constraintStart_toEndOf="@+id/frameLayout"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--    <TextView-->
+    <!--        android:id="@+id/textViewOptions"-->
+    <!--        android:layout_width="wrap_content"-->
+    <!--        android:layout_height="wrap_content"-->
+    <!--        android:layout_alignParentTop="true"-->
+    <!--        android:layout_alignParentRight="true"-->
+    <!--        android:paddingLeft="@dimen/margin_activity_horizontal"-->
+    <!--        android:text="&#8942;"-->
+    <!--        android:textAppearance="?android:textAppearanceLarge"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--        app:layout_constraintStart_toStartOf="parent" />-->
+
     <FrameLayout
         android:id="@+id/frameLayout"
         android:layout_width="wrap_content"
@@ -28,7 +40,10 @@
         android:layout_margin="2dp"
         android:background="@drawable/rounded_rectangle_steel"
         android:padding="10dp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/fab_pin"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -49,6 +64,8 @@
                 android:text="@string/really_long_word"
                 android:textColor="#ffffff"
                 android:textSize="12sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toEndOf="@+id/image_message_profile"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -77,16 +94,16 @@
 
             <TextView
                 android:id="@+id/text_message_body"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
                 android:background="@drawable/rounded_rectangle_steel"
-                android:maxWidth="240dp"
                 android:padding="8dp"
-                android:text="@string/msg_place_holder"
+                android:text="@string/text_msg_placeholder"
                 android:textColor="#ffffff"
                 android:textSize="20sp"
                 android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/text_message_name" />
 
@@ -104,18 +121,6 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 
-    <!--    <TextView-->
-    <!--        android:id="@+id/textViewOptions"-->
-    <!--        android:layout_width="wrap_content"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:layout_alignParentTop="true"-->
-    <!--        android:layout_alignParentRight="true"-->
-    <!--        android:paddingLeft="@dimen/margin_activity_horizontal"-->
-    <!--        android:text="&#8942;"-->
-    <!--        android:textAppearance="?android:textAppearanceLarge"-->
-    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--        app:layout_constraintStart_toStartOf="parent" />-->
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_pin"
         android:layout_width="wrap_content"
@@ -127,7 +132,7 @@
         android:tint="#FFA025"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/frameLayout"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_baseline_push_pin_24" />
 

+ 28 - 18
app/src/main/res/layout/item_message_received_quote.xml

@@ -21,13 +21,29 @@
         app:layout_constraintStart_toEndOf="@+id/frameLayout"
         app:layout_constraintTop_toTopOf="parent" />
 
+
+    <!--    <TextView-->
+    <!--        android:id="@+id/textViewOptions"-->
+    <!--        android:layout_width="wrap_content"-->
+    <!--        android:layout_height="wrap_content"-->
+    <!--        android:layout_alignParentTop="true"-->
+    <!--        android:layout_alignParentRight="true"-->
+    <!--        android:paddingLeft="@dimen/margin_activity_horizontal"-->
+    <!--        android:text="&#8942;"-->
+    <!--        android:textAppearance="?android:textAppearanceLarge"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--        app:layout_constraintStart_toStartOf="parent" />-->
+
     <FrameLayout
         android:id="@+id/frameLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/rounded_rectangle_steel"
         android:padding="12dp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/fab_pin"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -42,13 +58,14 @@
                 android:layout_margin="2dp"
                 android:alpha="@dimen/material_emphasis_disabled"
                 android:background="@drawable/rounded_rectangle_dark"
-                android:maxWidth="240dp"
                 android:maxLines="4"
 
                 android:padding="16dp"
                 android:text="@string/textview"
                 android:textColor="#ffffff"
                 android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/quote_sender" />
 
@@ -57,6 +74,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="6dp"
+                android:layout_marginTop="8dp"
                 android:alpha="@dimen/material_emphasis_disabled"
                 android:background="@drawable/nickname_background"
                 android:ellipsize="end"
@@ -65,6 +83,8 @@
                 android:singleLine="true"
                 android:text="@string/really_long_word"
                 android:textSize="12sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -81,8 +101,10 @@
                 android:text="@string/really_long_word"
                 android:textColor="#ffffff"
                 android:textSize="12sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toEndOf="@+id/image_message_profile"
-                app:layout_constraintTop_toBottomOf="@+id/quote_text"/>
+                app:layout_constraintTop_toBottomOf="@+id/quote_text" />
 
             <com.alexvasilkov.gestures.commons.circle.CircleImageView
                 android:id="@+id/image_message_profile"
@@ -108,16 +130,17 @@
 
             <TextView
                 android:id="@+id/text_message_body"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
                 android:background="@drawable/rounded_rectangle_steel"
-                android:maxWidth="240dp"
+                android:gravity="start"
                 android:padding="8dp"
                 android:text="@string/hi_man_how_are_you"
                 android:textColor="#ffffff"
                 android:textSize="20sp"
                 android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/text_message_name" />
 
@@ -135,19 +158,6 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 
-
-    <!--    <TextView-->
-    <!--        android:id="@+id/textViewOptions"-->
-    <!--        android:layout_width="wrap_content"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:layout_alignParentTop="true"-->
-    <!--        android:layout_alignParentRight="true"-->
-    <!--        android:paddingLeft="@dimen/margin_activity_horizontal"-->
-    <!--        android:text="&#8942;"-->
-    <!--        android:textAppearance="?android:textAppearanceLarge"-->
-    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--        app:layout_constraintStart_toStartOf="parent" />-->
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_pin"
         android:layout_width="wrap_content"
@@ -159,7 +169,7 @@
         android:tint="#FFA025"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/frameLayout"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_baseline_push_pin_24" />
 

+ 7 - 4
app/src/main/res/layout/item_message_sent_ok.xml

@@ -27,7 +27,10 @@
         android:layout_height="wrap_content"
         android:background="@drawable/rounded_rectangle_dark"
         android:padding="8dp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toEndOf="@+id/fab_pin"
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -48,17 +51,17 @@
 
             <TextView
                 android:id="@+id/text_message_body"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
                 android:background="@drawable/rounded_rectangle_dark"
-                android:maxWidth="240dp"
                 android:padding="8dp"
-                android:text="@string/hello_hello"
+                android:text="@string/really_long_word"
                 android:textColor="#ffffff"
                 android:textSize="20sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
@@ -96,7 +99,7 @@
         android:tint="#FFA025"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/frameLayout"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_baseline_push_pin_24" />
 

+ 13 - 4
app/src/main/res/layout/item_message_sent_ok_quote.xml

@@ -28,7 +28,10 @@
         android:layout_height="wrap_content"
         android:background="@drawable/rounded_rectangle_dark"
         android:padding="10dp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1"
+        app:layout_constraintStart_toEndOf="@+id/fab_pin"
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -54,7 +57,6 @@
                 android:layout_margin="2dp"
                 android:alpha="@dimen/material_emphasis_disabled"
                 android:background="@drawable/rounded_rectangle_steel"
-                android:maxWidth="240dp"
                 android:maxLines="4"
 
                 android:padding="16dp"
@@ -62,15 +64,17 @@
                 android:textColor="#ffffff"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="1"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/quote_sender" />
 
             <TextView
                 android:id="@+id/text_message_body"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
                 android:background="@drawable/rounded_rectangle_dark"
-                android:maxWidth="240dp"
+                android:gravity="end"
                 android:padding="8dp"
                 android:text="@string/hello_hello"
                 android:textColor="#ffffff"
@@ -78,6 +82,7 @@
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/quote_text" />
 
             <TextView
@@ -106,6 +111,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="6dp"
+                android:layout_marginTop="8dp"
                 android:alpha="@dimen/material_emphasis_disabled"
                 android:background="@drawable/nickname_background"
                 android:ellipsize="end"
@@ -115,9 +121,12 @@
                 android:text="@string/really_long_word"
                 android:textSize="12sp"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="1.0"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_pin"
         android:layout_width="wrap_content"
@@ -129,7 +138,7 @@
         android:tint="#FFA025"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/frameLayout"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_baseline_push_pin_24" />
 </androidx.constraintlayout.widget.ConstraintLayout>