message view design | #77

Tom James Holub · Tom James Holub · commit 1fc62c841c5f · 2017-08-08T21:31:26.000-07:00
diff --git a/FlowCrypt/src/main/res/drawable/bg_message_part_other.xml b/FlowCrypt/src/main/res/drawable/bg_message_part_other.xml
@@ -6,22 +6,28 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:paddingBottom="2dp"
-    android:paddingLeft="12dp"
-    android:paddingRight="4dp"
+    android:paddingLeft="20dp"
+    android:paddingRight="2dp"
     android:paddingTop="2dp">
 
+    <item android:gravity="left">
+        <shape>
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+
     <item android:gravity="left">
         <shape xmlns:android="http://schemas.android.com/apk/res/android"
             android:shape="rectangle">
             <stroke
                 android:width="1dp"
-                android:color="@color/aluminum" />
+                android:color="@color/light" />
         </shape>
     </item>
 
     <item android:gravity="left">
         <shape>
-            <size android:width="4dp" />
+            <size android:width="8dp" />
             <solid android:color="@color/gray" />
         </shape>
     </item>
diff --git a/FlowCrypt/src/main/res/drawable/bg_message_part_pgp_message.xml b/FlowCrypt/src/main/res/drawable/bg_message_part_pgp_message.xml
@@ -6,12 +6,13 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:paddingBottom="2dp"
-    android:paddingLeft="12dp"
-    android:paddingRight="4dp"
+    android:paddingLeft="20dp"
+    android:paddingRight="2dp"
     android:paddingTop="2dp">
+
     <item>
         <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-            android:src="@drawable/lock_seamless_bg_alpha"
+            android:src="@drawable/lock_seamless_bg"
             android:tileMode="repeat" />
     </item>
 
@@ -20,13 +21,13 @@
             android:shape="rectangle">
             <stroke
                 android:width="1dp"
-                android:color="@color/aluminum" />
+                android:color="@color/light" />
         </shape>
     </item>
 
     <item android:gravity="left">
         <shape>
-            <size android:width="4dp" />
+            <size android:width="8dp" />
             <solid android:color="@color/colorPrimary" />
         </shape>
     </item>
diff --git a/FlowCrypt/src/main/res/drawable/lock_seamless_bg.png b/FlowCrypt/src/main/res/drawable/lock_seamless_bg.png
diff --git a/FlowCrypt/src/main/res/layout/fragment_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_message_details.xml
@@ -29,13 +29,14 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/dark"
+                android:textColor="@color/gray"
                 android:textSize="@dimen/default_text_size_big"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
                 app:layout_constraintRight_toLeftOf="@+id/textViewDate"
                 app:layout_constraintTop_toTopOf="@+id/guidelineTop"
-                tools:text="tom@cryptup.org" />
+                app:layout_goneMarginLeft="@dimen/default_margin_medium"
+                tools:text="sender@flowcrypt.com" />
 
             <ImageButton
                 android:id="@+id/imageViewReplyAll"
@@ -45,6 +46,7 @@
                 android:contentDescription="@string/reply_all"
                 app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
                 app:layout_constraintTop_toTopOf="@+id/guidelineTop"
+                app:layout_goneMarginRight="@dimen/default_margin_medium"
                 app:srcCompat="@mipmap/ic_action_name" />
 
             <TextView
@@ -55,32 +57,32 @@
                 android:layout_marginTop="@dimen/margin_top_message_subject"
                 android:ellipsize="end"
                 android:maxLines="2"
-                android:textColor="@color/dark"
+                android:textColor="@color/gray"
                 android:textSize="@dimen/default_text_size_medium"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
                 app:layout_constraintRight_toLeftOf="@+id/textViewDate"
                 app:layout_constraintTop_toBottomOf="@+id/textViewSenderAddress"
-                tools:text="What up man? How are you doing? Tell me please" />
+                app:layout_goneMarginLeft="@dimen/default_margin_medium"
+                tools:text="Lorem ipsum subject subject subject subject subject" />
 
             <TextView
                 android:id="@+id/textViewDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/dark"
+                android:textColor="@color/gray"
                 android:textSize="@dimen/default_text_size_medium"
+                android:layout_marginRight="@dimen/default_margin_medium"
                 app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
                 app:layout_constraintTop_toTopOf="@+id/textViewSubject"
                 tools:text="1:05 PM" />
 
             <View
                 android:id="@+id/layoutFooterOfHeader"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/height_silver_line"
+                android:layout_height="0dp"
                 android:layout_gravity="center"
                 android:layout_marginTop="@dimen/default_margin_medium"
-                android:layout_weight="1"
-                android:background="@color/silver"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textViewSubject" />
@@ -89,7 +91,7 @@
                 android:id="@+id/layoutMessageParts"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/default_margin_content"
+                android:layout_marginTop="@dimen/default_margin_content_small"
                 android:orientation="vertical"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
@@ -101,7 +103,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                app:layout_constraintGuide_begin="@dimen/default_margin_content" />
+                app:layout_constraintGuide_begin="0dp" />
 
             <android.support.constraint.Guideline
                 android:id="@+id/guidelineTop"
@@ -115,7 +117,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                app:layout_constraintGuide_end="@dimen/default_margin_content" />
+                app:layout_constraintGuide_end="0dp" />
 
         </android.support.constraint.ConstraintLayout>
     </ScrollView>
diff --git a/FlowCrypt/src/main/res/layout/message_part_pgp_message.xml b/FlowCrypt/src/main/res/layout/message_part_pgp_message.xml
@@ -12,11 +12,9 @@
     android:layout_marginBottom="@dimen/default_margin_medium"
     android:autoLink="web"
     android:background="@drawable/bg_message_part_pgp_message"
-    android:textColor="@color/dark"
+    android:textColor="@android:color/black"
     android:textIsSelectable="true"
     android:textSize="@dimen/default_text_size_medium"
-    tools:text="This email contains a key backup. It will help you access your encrypted messages from other computers (along with your pass phrase). You can safely leave it in your inbox or archive it.
+    tools:text="At nihil sequi quo maiores molestiae consequatur. Id aut nam voluptate doloribus saepe consequatur molestias. Eos sunt est ipsam accusantium saepe doloribus veritatis.
 
-The key below is protected with pass phrase that only you know. You should make sure to note your pass phrase down.
-
-DO NOT DELETE THIS EMAIL. Write me at tom@cryptup.org so that I can help. I respond very promptly." />
+Recusandae velit sit veniam asperiores nisi. Eius tempore ab voluptatum dolorum nihil qui beatae. Et cum aut iusto deserunt. Doloremque laudantium laborum nobis enim est a. Totam at minima velit perspiciatis magnam libero ut voluptate. Rerum labore consectetur hic aliquid." />
diff --git a/FlowCrypt/src/main/res/layout/message_part_public_key.xml b/FlowCrypt/src/main/res/layout/message_part_public_key.xml
@@ -18,23 +18,23 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:textIsSelectable="true"
-        tools:text="This message includes a Public Key for tom@bitoasis.net." />
+        tools:text="Public Key for ..........................." />
 
     <TextView
         android:id="@+id/textViewKeyWordsTemplate"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content"
         android:textIsSelectable="true"
-        tools:text="KeyWords: ASK REFORM DEPEND TOWER ACTOR DIAGRAM " />
+        tools:text="KeyWords: TESTING TESTING TESTING TESTING TESTING TESTING" />
 
     <TextView
         android:id="@+id/textViewFingerprintTemplate"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:textIsSelectable="true"
-        tools:text="(Fingerprint: 8B8A 05A2 216E E6E4 C5EE 3D54 0D56 88EB F310 2BE7)" />
+        tools:text="Fingerprint: XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX" />
 
     <Switch
         android:id="@+id/switchShowPublicKey"
@@ -54,7 +54,7 @@
         android:textColor="#088447"
         android:textIsSelectable="true"
         android:visibility="gone"
-        tools:text="(Fingerprint: 8B8A 05A2 216E E6E4 C5EE 3D54 0D56 88EB F310 2BE7)"
+        tools:text="-----BEGIN PGP PUBLIC KEY-----\nxxxxx\nxxxxx\nxxxxx\nxxxxx\nxxxxx\nxxxxx\nxxxxx\n-----END PGP PUBLIC KEY-----"
         tools:visibility="visible" />
 
     <Button
diff --git a/FlowCrypt/src/main/res/layout/message_part_text.xml b/FlowCrypt/src/main/res/layout/message_part_text.xml
@@ -9,13 +9,14 @@
     android:id="@+id/textViewMessagePartText"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/default_margin_medium"
+    android:paddingBottom="@dimen/default_margin_medium"
+    android:paddingLeft="@dimen/default_margin_medium"
+    android:paddingRight="@dimen/default_margin_medium"
+    android:background="@android:color/white"
     android:autoLink="web"
-    android:textColor="@color/dark"
+    android:textColor="@android:color/black"
     android:textIsSelectable="true"
     android:textSize="@dimen/default_text_size_medium"
-    tools:text="This email contains a key backup. It will help you access your encrypted messages from other computers (along with your pass phrase). You can safely leave it in your inbox or archive it.
+    tools:text="At nihil sequi quo maiores molestiae consequatur. Id aut nam voluptate doloribus saepe consequatur molestias. Eos sunt est ipsam accusantium saepe doloribus veritatis.
 
-The key below is protected with pass phrase that only you know. You should make sure to note your pass phrase down.
-
-DO NOT DELETE THIS EMAIL. Write me at tom@cryptup.org so that I can help. I respond very promptly." />
+Recusandae velit sit veniam asperiores nisi. Eius tempore ab voluptatum dolorum nihil qui beatae. Et cum aut iusto deserunt. Doloremque laudantium laborum nobis enim est a. Totam at minima velit perspiciatis magnam libero ut voluptate. Rerum labore consectetur hic aliquid." />
