From 6d989c18c454d7041cfda9ad5536abfeb8d0e1f0 Mon Sep 17 00:00:00 2001 From: Krocks Date: Sat, 19 Aug 2017 15:29:46 +0300 Subject: [PATCH 1/5] welcome ui fix. Steel need fonts --- app/src/main/res/layout/activity_welcome.xml | 4 ++-- app/src/main/res/layout/fragment_welcome.xml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index 8da36d0937..59839f604c 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -21,10 +21,10 @@ android:layout_marginBottom="48dp" android:padding="6dp" app:fillColor="@color/colorAccent" - app:increasedMargin="2" + app:increasedMargin="1.2" app:pageColor="@android:color/transparent" app:radius="5dp" - app:selectedCircle="1.5" + app:selectedCircle="1.2" app:snap="true" android:orientation="horizontal" app:strokeColor="@android:color/darker_gray" diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml index 19c3a06891..965499d52c 100644 --- a/app/src/main/res/layout/fragment_welcome.xml +++ b/app/src/main/res/layout/fragment_welcome.xml @@ -15,6 +15,7 @@ android:gravity="center_horizontal" android:text="@string/welcome.but.welcome_to" app:layout_constraintLeft_toLeftOf="parent" + android:textColor="#666666" android:textSize="18sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -70,6 +71,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/f_welcome_view_1" + android:textColor="#f4f4f4" app:layout_constraintWidth_default="spread" /> Date: Sat, 19 Aug 2017 16:03:07 +0300 Subject: [PATCH 2/5] added avenir font --- app/build.gradle | 3 +++ app/src/main/res/layout/activity_welcome.xml | 1 + app/src/main/res/layout/fragment_welcome.xml | 7 +++++-- app/src/main/res/values/styles.xml | 4 ++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e4eb465b33..1d28260598 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -195,6 +195,9 @@ dependencies { compile 'com.github.chrisbanes:PhotoView:2.0.0' +// Fonts + compile 'uk.co.chrisjenx:calligraphy:2.3.0' + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index 59839f604c..5f1dc55e41 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -55,6 +55,7 @@ android:paddingEnd="16dp" android:paddingStart="16dp" android:text="@string/welcome.but.get_started" + android:textStyle="bold" android:textSize="18sp" tools:ignore="ContentDescription"/> diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml index 965499d52c..b2939b7505 100644 --- a/app/src/main/res/layout/fragment_welcome.xml +++ b/app/src/main/res/layout/fragment_welcome.xml @@ -4,19 +4,21 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + tools:ignore="MissingPrefix" tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteY="25dp"> @@ -58,6 +60,7 @@ @drawable/splash + + - - - -- GitLab