Skip to content

Commit b759437

Browse files
author
Tom James Holub
committed
put back loading + consolidated colors + negative buttons | #77 
1 parent c2b52ed commit b759437

File tree

9 files changed

+39
-32
lines changed

9 files changed

+39
-32
lines changed

‎FlowCrypt/src/main/res/drawable/bg_message_part_other.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
android:shape="rectangle">
1616
<stroke
1717
android:width="1dp"
18-
android:color="@color/gallery" />
18+
android:color="@color/aluminum" />
1919
</shape>
2020
</item>
2121

‎FlowCrypt/src/main/res/drawable/bg_message_part_pgp_message.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:shape="rectangle">
2121
<stroke
2222
android:width="1dp"
23-
android:color="@color/gallery" />
23+
android:color="@color/aluminum" />
2424
</shape>
2525
</item>
2626

‎FlowCrypt/src/main/res/drawable/side_nav_bar.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
android:angle="135"
1111
android:centerColor="@color/colorPrimary"
1212
android:endColor="@color/colorPrimaryDark"
13-
android:startColor="@color/de_york"
13+
android:startColor="@color/colorPrimaryLight"
1414
android:type="linear" />
1515
</shape>

‎FlowCrypt/src/main/res/layout/fragment_splash.xml‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,11 @@
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"
1212
tools:context="com.flowcrypt.email.ui.activity.fragment.SplashActivityFragment"
13-
14-
>
15-
<!--tools:showIn="@layout/activity_splash"-->
13+
tools:showIn="@layout/activity_splash">
1614

1715
<Button
1816
android:id="@+id/buttonPrivacy"
1917
style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
20-
android:layout_width="wrap_content"
21-
android:layout_height="wrap_content"
22-
android:layout_marginTop="@dimen/margin_top_main_screen_button"
2318
android:text="@string/privacy"
2419
app:layout_constraintLeft_toLeftOf="parent"
2520
app:layout_constraintRight_toLeftOf="@+id/buttonTerms"
@@ -29,9 +24,6 @@
2924
<Button
3025
android:id="@+id/buttonTerms"
3126
style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
32-
android:layout_width="wrap_content"
33-
android:layout_height="wrap_content"
34-
android:layout_marginTop="@dimen/margin_top_main_screen_button"
3527
android:text="@string/terms"
3628
app:layout_constraintLeft_toRightOf="@+id/buttonPrivacy"
3729
app:layout_constraintRight_toLeftOf="@+id/buttonSecurity"
@@ -41,9 +33,6 @@
4133
<Button
4234
android:id="@+id/buttonSecurity"
4335
style="@style/AppWidget.Button.Transparent.MainScreenTopButton"
44-
android:layout_width="wrap_content"
45-
android:layout_height="wrap_content"
46-
android:layout_marginTop="@dimen/margin_top_main_screen_button"
4736
android:text="@string/security"
4837
app:layout_constraintLeft_toRightOf="@+id/buttonTerms"
4938
app:layout_constraintRight_toRightOf="parent"
@@ -68,8 +57,7 @@
6857
app:layout_constraintLeft_toLeftOf="parent"
6958
app:layout_constraintRight_toRightOf="parent"
7059
app:layout_constraintTop_toBottomOf="@+id/buttonTerms"
71-
app:srcCompat="@mipmap/logo_flowcrypt"
72-
tools:layout_editor_absoluteX="-153dp" />
60+
app:srcCompat="@mipmap/logo_flowcrypt" />
7361

7462
<TextView
7563
android:id="@+id/textViewConnectYourEmail"

‎FlowCrypt/src/main/res/layout/splash_after_auth.xml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,20 @@
2121
app:layout_constraintTop_toTopOf="parent"
2222
android:layout_marginTop="0dp"
2323
app:layout_constraintBottom_toBottomOf="parent"
24-
android:layout_marginBottom="0dp" />
25-
24+
android:layout_marginBottom="0dp"
25+
app:layout_constraintVertical_bias="0.367" />
26+
<!--app:layout_constraintVertical_bias="0.405"-->
27+
<TextView
28+
android:id="@+id/textViewLoading"
29+
android:layout_width="wrap_content"
30+
android:layout_height="wrap_content"
31+
android:layout_marginTop="@dimen/default_margin_huge"
32+
android:text="@string/loading"
33+
android:textSize="@dimen/default_text_size_big"
34+
android:textColor="@color/dark"
35+
android:fontFamily="sans-serif-light"
36+
app:layout_constraintLeft_toLeftOf="parent"
37+
app:layout_constraintRight_toRightOf="parent"
38+
app:layout_constraintTop_toBottomOf="@+id/imageViewAppLogo" />
2639

2740
</android.support.constraint.ConstraintLayout>

‎FlowCrypt/src/main/res/values/colors.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
<resources>
88
<color name="colorPrimary">#31a217</color>
99
<color name="colorPrimaryDark">#2E7D32</color>
10+
<color name="colorPrimaryLight">#81C784</color>
1011
<color name="colorAccent">#0a9fd3</color>
11-
<color name="transparent">@android:color/transparent</color>
12-
<color name="light_grey">#F2F2F2</color>
13-
<color name="de_york">#81C784</color>
14-
<color name="dark">#535353</color>
15-
<color name="gray">#989898</color>
16-
<color name="silver">#C6C6C6</color>
17-
<color name="white_transparent">#A0FFFFFF</color>
18-
<color name="gallery">#F0F0F0</color>
1912
<color name="red">#D14836</color>
13+
<color name="light">#F8F8F8</color>
14+
<color name="aluminum">#F0F0F0</color>
15+
<color name="silver">#C6C6C6</color>
16+
<color name="gray">#989898</color>
17+
<color name="dark">#535353</color>
18+
<color name="transparent_white">#A0FFFFFF</color>
2019
</resources>

‎FlowCrypt/src/main/res/values/dimens.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<dimen name="default_margin_medium">10dp</dimen>
2121
<dimen name="default_margin_big">15dp</dimen>
2222
<dimen name="default_margin_very_big">20dp</dimen>
23+
<dimen name="default_margin_huge">40dp</dimen>
2324

2425
<dimen name="default_text_size_big">18sp</dimen>
2526
<dimen name="default_text_size_medium">16sp</dimen>

‎FlowCrypt/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<string name="crypt">crypt</string>
3131
<string name="connect_your_email_account_to_start_sending_encrypted_messages">Connect your email account\n to send encrypted messages</string>
3232
<string name="continue_with_gmail">Continue with Gmail</string>
33-
<string name="loading">Loading…</string>
33+
<string name="loading">loading</string>
3434
<string name="navigation_drawer_open">Open navigation drawer</string>
3535
<string name="navigation_drawer_close">Close navigation drawer</string>
3636
<string name="log_out">Log out</string>

‎FlowCrypt/src/main/res/values/styles.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,22 @@
1919
</style>
2020

2121
<style name="AppWidget.Button.White">
22-
<item name="android:textColor">@color/dark</item>
23-
<item name="colorButtonNormal">@android:color/white</item>
22+
<item name="android:textColor">@color/gray</item>
23+
<item name="colorButtonNormal">@color/light</item>
2424
</style>
2525

2626
<style name="AppWidget.Button.Transparent">
2727
<item name="android:background">?android:attr/selectableItemBackground</item>
2828
</style>
2929

3030
<style name="AppWidget.Button.Transparent.MainScreenTopButton">
31-
<item name="android:textColor">@color/silver</item>
31+
<item name="android:textColor">@color/dark</item>
3232
<item name="android:textSize">@dimen/default_text_size_big</item>
33+
<item name="android:fontFamily">sans-serif-light</item>
34+
<item name="android:layout_width">wrap_content</item>
35+
<item name="android:layout_height">wrap_content</item>
36+
<item name="android:layout_marginTop">@dimen/margin_top_main_screen_button</item>
37+
3338
</style>
3439

3540
<style name="AppWidget.Button.White.ConnectAccount">
@@ -39,6 +44,7 @@
3944
<item name="android:drawablePadding">@dimen/drawable_padding_main_screen_sign_button</item>
4045
<item name="android:gravity">center</item>
4146
<item name="android:textSize">@dimen/default_text_size_medium</item>
47+
<item name="android:textColor">@color/dark</item>
4248
</style>
4349

4450
<style name="AppWidget.Button.Raised.White.ConnectAccount" parent="Widget.AppCompat.Button.Colored">
@@ -80,7 +86,7 @@
8086

8187
<style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
8288
<item name="android:textSize">14sp</item>
83-
<item name="android:textColor">@color/white_transparent</item>
89+
<item name="android:textColor">@color/transparent_white</item>
8490
<item name="textAllCaps">false</item>
8591
</style>
8692

0 commit comments

Comments
 (0)