updated colors + buttons + headings | #77

Tom James Holub · Tom James Holub · commit c2b52edd6982 · 2017-08-08T17:48:49.000-07:00
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseSendingMessageActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseSendingMessageActivity.java
@@ -189,7 +189,7 @@ public void onChangeMessageEncryptedType(MessageEncryptionType messageEncryption
                 break;
 
             case STANDARD:
-                getAppBarLayout().setBackgroundColor(UIUtil.getColor(this, R.color.valencia));
+                getAppBarLayout().setBackgroundColor(UIUtil.getColor(this, R.color.red));
                 if (getSupportActionBar() != null) {
                     getSupportActionBar().setTitle(getStandardTitle());
                 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureComposeFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureComposeFragment.java
@@ -296,7 +296,7 @@ private void initChipsView(View view) {
                         SingleCharacterSpanChipTokenizer.CHIP_SEPARATOR_WHITESPACE));
         recipientEditTextView.setOnFocusChangeListener(this);
         recipientEditTextView.setChipBackground(
-                ColorStateList.valueOf(UIUtil.getColor(getContext(), R.color.dusty_gray)));
+                ColorStateList.valueOf(UIUtil.getColor(getContext(), R.color.gray)));
     }
 
     /**
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageListAdapter.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageListAdapter.java
@@ -107,7 +107,7 @@ private void updateItem(Context context, GeneralMessageDetails generalMessageDet
                 changeViewsTypeface(viewHolder, Typeface.NORMAL);
 
                 viewHolder.textViewSenderAddress.setTextColor(UIUtil.getColor(context, R.color
-                        .scorpion));
+                        .dark));
                 viewHolder.textViewSubject.setTextColor(UIUtil.getColor(context, R.color.gray));
                 viewHolder.textViewDate.setTextColor(UIUtil.getColor(context, R.color.gray));
             } else {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/widget/CustomChipSpanChipCreator.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/widget/CustomChipSpanChipCreator.java
@@ -47,9 +47,9 @@ public static void updateChipSpanBackground(Context context, @NonNull ChipSpan c
                                                 boolean isHasPgp) {
         int color;
         if (isHasPgp) {
-            color = UIUtil.getColor(context, R.color.la_palma);
+            color = UIUtil.getColor(context, R.color.colorPrimary);
         } else {
-            color = UIUtil.getColor(context, R.color.dusty_gray);
+            color = UIUtil.getColor(context, R.color.gray);
         }
         chipSpan.setBackgroundColor(ColorStateList.valueOf(color));
     }
diff --git a/FlowCrypt/src/main/res/drawable/bg_message_part_other.xml b/FlowCrypt/src/main/res/drawable/bg_message_part_other.xml
@@ -22,7 +22,7 @@
     <item android:gravity="left">
         <shape>
             <size android:width="4dp" />
-            <solid android:color="@color/dusty_gray" />
+            <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
@@ -27,7 +27,7 @@
     <item android:gravity="left">
         <shape>
             <size android:width="4dp" />
-            <solid android:color="@color/la_palma" />
+            <solid android:color="@color/colorPrimary" />
         </shape>
     </item>
 
diff --git a/FlowCrypt/src/main/res/drawable/side_nav_bar.xml b/FlowCrypt/src/main/res/drawable/side_nav_bar.xml
@@ -8,8 +8,8 @@
     android:shape="rectangle">
     <gradient
         android:angle="135"
-        android:centerColor="@color/fruit_salad"
-        android:endColor="@color/sea_green"
+        android:centerColor="@color/colorPrimary"
+        android:endColor="@color/colorPrimaryDark"
         android:startColor="@color/de_york"
         android:type="linear" />
 </shape>
diff --git a/FlowCrypt/src/main/res/layout/activity_check_keys.xml b/FlowCrypt/src/main/res/layout/activity_check_keys.xml
@@ -13,13 +13,8 @@
 
     <TextView
         android:id="@+id/textViewSetupFlowCrypt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_top_setup_flow_crypt"
         android:text="@string/set_up_flow_crypt"
-        android:textColor="@color/gray"
-        android:textSize="@dimen/text_size_setup_flow_crypt"
-        android:textStyle="bold"
+        style="@style/ScreenHeading"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -77,7 +72,7 @@
         style="@style/AppWidget.Button"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_top_load_account"
-        android:theme="@style/AppWidget.Button.Raised.Green"
+        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
         app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
@@ -89,7 +84,7 @@
         style="@style/AppWidget.Button"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_top_button_select_another_account"
-        android:theme="@style/AppWidget.Button.Raised.Grey"
+        android:theme="@style/AppWidget.Button.White"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
         app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
diff --git a/FlowCrypt/src/main/res/layout/activity_create_or_import_key.xml b/FlowCrypt/src/main/res/layout/activity_create_or_import_key.xml
@@ -11,37 +11,33 @@
 
     <TextView
         android:id="@+id/textViewSetupFlowCrypt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_top_setup_flow_crypt"
         android:text="@string/set_up_flow_crypt"
-        android:textColor="@color/gray"
-        android:textSize="@dimen/text_size_setup_flow_crypt"
-        android:textStyle="bold"
+        style="@style/ScreenHeading"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/buttonCreateNewKey"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Green"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_top_first_button"
+        android:alpha="0.5"
         android:enabled="false"
         android:text="@string/create_a_new_key"
-        android:theme="@style/AppWidget.Button.Raised.Green"
+        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
         app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
         app:layout_constraintTop_toBottomOf="@+id/textViewSetupFlowCrypt" />
 
     <Button
         android:id="@+id/buttonImportMyKey"
-        style="@style/AppWidget.Button"
+        style="@style/AppWidget.Button.Green"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/import_my_key"
-        android:theme="@style/AppWidget.Button.Raised.Green"
+        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
         app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
@@ -53,7 +49,7 @@
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/margin_between_buttons"
         android:text="@string/use_another_account"
-        android:theme="@style/AppWidget.Button.Raised.Grey"
+        android:theme="@style/AppWidget.Button.White"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
         app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
diff --git a/FlowCrypt/src/main/res/layout/activity_import_private_key.xml b/FlowCrypt/src/main/res/layout/activity_import_private_key.xml
@@ -17,24 +17,19 @@
 
         <TextView
             android:id="@+id/textViewImportKeyTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_top_setup_flow_crypt"
             android:text="@string/import_private_key"
-            android:textColor="@color/gray"
-            android:textSize="@dimen/text_size_setup_flow_crypt"
-            android:textStyle="bold"
+            style="@style/ScreenHeading"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
 
         <Button
             android:id="@+id/buttonLoadFromFile"
             style="@style/AppWidget.Button"
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_top_first_button"
             android:text="@string/load_from_a_file"
-            android:theme="@style/AppWidget.Button.Raised.Green"
+            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
             app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
@@ -46,7 +41,7 @@
             android:layout_width="0dp"
             android:layout_marginTop="@dimen/margin_between_buttons"
             android:text="@string/load_from_clipboard"
-            android:theme="@style/AppWidget.Button.Raised.Green"
+            android:theme="@style/AppWidget.Button.Green"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
             app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
diff --git a/FlowCrypt/src/main/res/layout/activity_keys_settings.xml b/FlowCrypt/src/main/res/layout/activity_keys_settings.xml
@@ -35,7 +35,7 @@
                 android:id="@+id/listViewKeys"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:divider="@color/silver_chalice"
+                android:divider="@color/silver"
                 android:dividerHeight="1dp"
                 tools:listitem="@layout/key_item" />
 
diff --git a/FlowCrypt/src/main/res/layout/backup_found.xml b/FlowCrypt/src/main/res/layout/backup_found.xml
@@ -26,11 +26,11 @@
 
     <Button
         android:id="@+id/buttonSeeMoreBackupOptions"
-        style="@style/AppWidget.Button.WhiteText"
+        style="@style/AppWidget.Button.Green"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/default_margin_content"
         android:text="@string/see_more_backup_options"
-        android:theme="@style/AppWidget.Button.Raised.Green"
+        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textViewBackupFound" />
diff --git a/FlowCrypt/src/main/res/layout/backup_options.xml b/FlowCrypt/src/main/res/layout/backup_options.xml
@@ -40,12 +40,12 @@
 
     <Button
         android:id="@+id/buttonBackupAction"
-        style="@style/AppWidget.Button.WhiteText"
+        style="@style/AppWidget.Button.Green"
         android:layout_width="0dp"
         android:layout_marginTop="@dimen/default_margin_content"
         android:text="@string/backup_as_email"
         android:textAllCaps="true"
-        android:theme="@style/AppWidget.Button.Raised.Green"
+        android:theme="@style/AppWidget.Button.Green"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/radioGroupBackupsVariants" />
diff --git a/FlowCrypt/src/main/res/layout/fragment_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_message_details.xml
@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/mine_shaft"
+                android:textColor="@color/dark"
                 android:textSize="@dimen/default_text_size_big"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
@@ -55,7 +55,7 @@
                 android:layout_marginTop="@dimen/margin_top_message_subject"
                 android:ellipsize="end"
                 android:maxLines="2"
-                android:textColor="@color/mine_shaft"
+                android:textColor="@color/dark"
                 android:textSize="@dimen/default_text_size_medium"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
@@ -67,7 +67,7 @@
                 android:id="@+id/textViewDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/mine_shaft"
+                android:textColor="@color/dark"
                 android:textSize="@dimen/default_text_size_medium"
                 app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
                 app:layout_constraintTop_toTopOf="@+id/textViewSubject"
diff --git a/FlowCrypt/src/main/res/layout/fragment_splash.xml b/FlowCrypt/src/main/res/layout/fragment_splash.xml
@@ -10,7 +10,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.flowcrypt.email.ui.activity.fragment.SplashActivityFragment"
-    tools:showIn="@layout/activity_splash">
+
+    >
+    <!--tools:showIn="@layout/activity_splash"-->
 
     <Button
         android:id="@+id/buttonPrivacy"
@@ -61,6 +63,7 @@
         android:textAlignment="center"
         android:textAllCaps="false"
         android:textSize="@dimen/text_size_logo_crypt"
+        android:contentDescription="@string/app_name"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -89,11 +92,11 @@
 
     <Button
         android:id="@+id/buttonSignInWithGmail"
-        style="@style/AppWidget.Button.MainScreenSignButton"
+        style="@style/AppWidget.Button.White.ConnectAccount"
         android:layout_marginTop="@dimen/margin_top_main_screen_button_sign_via_gmail"
         android:drawableStart="@mipmap/ic_gmail"
         android:text="@string/continue_with_gmail"
-        android:theme="@style/AppWidget.Button.MainScreenSignButton"
+        android:theme="@style/AppWidget.Button.White.ConnectAccount"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textViewConnectYourEmail"
diff --git a/FlowCrypt/src/main/res/layout/key_item.xml b/FlowCrypt/src/main/res/layout/key_item.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="@color/scorpion"
+        android:textColor="@color/dark"
         android:textSize="@dimen/default_text_size_big"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="@+id/guidelineLeft"
@@ -35,7 +35,7 @@
         android:layout_marginTop="@dimen/margin_top_message_subject"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textColor="@color/la_palma"
+        android:textColor="@color/colorPrimary"
         android:textSize="@dimen/default_text_size_medium"
         app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
         app:layout_constraintHorizontal_bias="0.0"
@@ -50,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="0dp"
-        android:textColor="@color/scorpion"
+        android:textColor="@color/dark"
         android:textSize="@dimen/default_text_size_medium"
         app:layout_constraintRight_toLeftOf="@+id/guidelineRight"
         app:layout_constraintTop_toTopOf="@+id/guidelineTop"
diff --git a/FlowCrypt/src/main/res/layout/message_part_other.xml b/FlowCrypt/src/main/res/layout/message_part_other.xml
@@ -12,7 +12,7 @@
     android:layout_marginBottom="@dimen/default_margin_medium"
     android:autoLink="web"
     android:background="@drawable/bg_message_part_other"
-    android:textColor="@color/mine_shaft"
+    android:textColor="@color/dark"
     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.
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,7 +12,7 @@
     android:layout_marginBottom="@dimen/default_margin_medium"
     android:autoLink="web"
     android:background="@drawable/bg_message_part_pgp_message"
-    android:textColor="@color/mine_shaft"
+    android:textColor="@color/dark"
     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.
diff --git a/FlowCrypt/src/main/res/layout/message_part_public_key.xml b/FlowCrypt/src/main/res/layout/message_part_public_key.xml
@@ -65,7 +65,7 @@
         android:layout_marginBottom="@dimen/default_margin_content_small"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:text="@string/save_contact"
-        android:theme="@style/AppWidget.Button.Raised.Green"
+        android:theme="@style/AppWidget.Button.Green"
         android:visibility="gone"
         tools:visibility="visible" />
 
@@ -77,7 +77,7 @@
         android:layout_marginBottom="@dimen/default_margin_content_small"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:text="@string/update_contact"
-        android:theme="@style/AppWidget.Button.Raised.Green"
+        android:theme="@style/AppWidget.Button.Green"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/FlowCrypt/src/main/res/layout/message_part_text.xml b/FlowCrypt/src/main/res/layout/message_part_text.xml
@@ -11,7 +11,7 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/default_margin_medium"
     android:autoLink="web"
-    android:textColor="@color/mine_shaft"
+    android:textColor="@color/dark"
     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.
diff --git a/FlowCrypt/src/main/res/layout/messages_list_item.xml b/FlowCrypt/src/main/res/layout/messages_list_item.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="@color/scorpion"
+        android:textColor="@color/dark"
         android:textSize="@dimen/default_text_size_big"
         app:layout_constraintBottom_toBottomOf="@+id/textViewDate"
         app:layout_constraintHorizontal_bias="0.0"
diff --git a/FlowCrypt/src/main/res/layout/under_toolbar_line_with_text.xml b/FlowCrypt/src/main/res/layout/under_toolbar_line_with_text.xml
@@ -9,7 +9,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:background="@color/valencia">
+    tools:background="@color/red">
 
     <TextView
         android:id="@+id/underToolbarTextTextView"
diff --git a/FlowCrypt/src/main/res/values/colors.xml b/FlowCrypt/src/main/res/values/colors.xml
diff --git a/FlowCrypt/src/main/res/values/dimens.xml b/FlowCrypt/src/main/res/values/dimens.xml
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
diff --git a/FlowCrypt/src/main/res/values/styles.xml b/FlowCrypt/src/main/res/values/styles.xml
diff --git a/design/app/screens/2.1-initial-loader.png b/design/app/screens/2.1-initial-loader.png

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public void onChangeMessageEncryptedType(MessageEncryptionType messageEncryption`
`189`	`189`	`break;`
`190`	`190`
`191`	`191`	`case STANDARD:`
`192`		`- getAppBarLayout().setBackgroundColor(UIUtil.getColor(this, R.color.valencia));`
	`192`	`+ getAppBarLayout().setBackgroundColor(UIUtil.getColor(this, R.color.red));`
`193`	`193`	`if (getSupportActionBar() != null) {`
`194`	`194`	`getSupportActionBar().setTitle(getStandardTitle());`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ private void initChipsView(View view) {`
`296`	`296`	`SingleCharacterSpanChipTokenizer.CHIP_SEPARATOR_WHITESPACE));`
`297`	`297`	`recipientEditTextView.setOnFocusChangeListener(this);`
`298`	`298`	`recipientEditTextView.setChipBackground(`
`299`		`- ColorStateList.valueOf(UIUtil.getColor(getContext(), R.color.dusty_gray)));`
	`299`	`+ ColorStateList.valueOf(UIUtil.getColor(getContext(), R.color.gray)));`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ public static void updateChipSpanBackground(Context context, @NonNull ChipSpan c`
`47`	`47`	`boolean isHasPgp) {`
`48`	`48`	`int color;`
`49`	`49`	`if (isHasPgp) {`
`50`		`- color = UIUtil.getColor(context, R.color.la_palma);`
	`50`	`+ color = UIUtil.getColor(context, R.color.colorPrimary);`
`51`	`51`	`} else {`
`52`		`- color = UIUtil.getColor(context, R.color.dusty_gray);`
	`52`	`+ color = UIUtil.getColor(context, R.color.gray);`
`53`	`53`	`}`
`54`	`54`	`chipSpan.setBackgroundColor(ColorStateList.valueOf(color));`
`55`	`55`	`}`