varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2 from medici/sk-login

Browse Source 
[AA-2] Login Screen - Add styling, theme, fonts and logo to login
This commit is contained in:
Shashidhara Gopal
2019-11-07 11:46:25 +05:30
committed by GitHub Enterprise
parent 532f437b6e f8bc9c1417
commit fa98fdb65d
16 changed files with 99 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable/navi_logo_unit_cmyk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 KiB

BIN
app/src/main/res/font/roboto_black.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_black_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_bold.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_bold_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_light.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_light_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_medium.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_medium_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_regular.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_thin.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/roboto_thin_italic.ttf Normal file
View File

Binary file not shown.

91
app/src/main/res/layout/activity_login.xml
View File

@@ -1,32 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_margin="30sp"
android:padding="20sp"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/logo_mark_image"
android:layout_width="300dp"
android:layout_height="168dp"
app:layout_constraintBottom_toTopOf="@+id/create_account_label_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0"
app:srcCompat="@drawable/navi_logo_unit_cmyk" />
<TextView
android:id="@+id/country_code_text"
android:id="@+id/create_account_label_text"
style="@style/largeCustomFontStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="40dp"
android:text="@string/create_new_account"
app:layout_constraintBottom_toTopOf="@+id/phone_label_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/phone_label_text"
style="@style/mediumCustomFontStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="96dp"
android:text="@string/phone_number_label"
app:layout_constraintBottom_toTopOf="@+id/phone_edit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/country_code_text"
style="@style/largeLightCustomFontStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:text="@string/country_code"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="@+id/phone_edit"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/phone_edit" />
<EditText
android:id="@+id/phone_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="32dp"
style="@style/largeCustomFontStyle"
android:layout_width="240dp"
android:layout_height="58dp"
android:backgroundTint="@android:color/darker_gray"
android:ems="10"
android:importantForAutofill="no"
@@ -34,42 +69,22 @@
android:maxLength="10"
android:textColorHighlight="@android:color/darker_gray"
android:textColorLink="@android:color/darker_gray"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/country_code_text"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/phone_label_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="32dp"
android:layout_marginBottom="40dp"
android:text="@string/phone_number_label"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@+id/phone_edit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/country_code_text" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="56dp"
android:text="@string/create_new_account"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/phone_label_text"
app:layout_constraintStart_toStartOf="@+id/phone_label_text" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.713" />
<TextView
android:id="@+id/terms_conditions_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:layout_marginEnd="32dp"
style="@style/agreementCustomFontStyle"
android:layout_width="238dp"
android:layout_height="93dp"
android:layout_marginTop="52dp"
android:text="@string/terms_and_conditions"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/country_code_text"
app:layout_constraintTop_toBottomOf="@+id/phone_edit" />

4
app/src/main/res/values/colors.xml
View File

@@ -3,4 +3,8 @@
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
<color name="colorRed">#FF3333</color>
<color name="colorWhite">#FFFFFF</color>
<color name="colorGray">#B3000000</color>
<color name="colorDeepBlueGray">#4B4968</color>
</resources>

44
app/src/main/res/values/styles.xml
View File

@@ -1,11 +1,51 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimary">@color/colorGray</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorButtonNormal">@color/colorRed</item>
<item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Button.Custom</item>
</style>
<style name="TextAppearance.AppCompat.Button.Custom">
<item name="android:textColor">@color/colorWhite</item>
<item name="android:textAllCaps">false</item>
<item name="android:fontFamily">@font/roboto_bold</item>
</style>
<style name="largeCustomFontStyle" parent="@android:style/TextAppearance">
<item name="android:fontFamily">@font/roboto_bold</item>
<item name="android:textSize">30sp</item>
<item name="android:textColor">@color/colorGray</item>
</style>
<style name="largeLightCustomFontStyle" parent="@android:style/TextAppearance">
<item name="android:fontFamily">@font/roboto_light</item>
<item name="android:textSize">26sp</item>
<item name="android:textColor">@color/colorGray</item>
</style>
<style name="mediumCustomFontStyle" parent="@android:style/TextAppearance">
<item name="android:fontFamily">@font/roboto_medium</item>
<item name="android:textSize">22sp</item>
<item name="android:textColor">@color/colorGray</item>
</style>
<style name="paragraphCustomFontStyle" parent="@android:style/TextAppearance">
<item name="android:fontFamily">@font/roboto_regular</item>
<item name="android:textColor">@color/colorGray</item>
</style>
<style name="agreementCustomFontStyle" parent="@android:style/TextAppearance">
<item name="android:fontFamily">@font/roboto_light</item>
<item name="android:textColor">@color/colorGray</item>
</style>
<style name="secondaryButtonCustomStyle" parent="TextAppearance.AppCompat.Button.Custom">
<item name="android:fontFamily">@font/roboto_light</item>
<item name="android:textColor">@color/colorWhite</item>
<item name="android:backgroundTint">@color/colorDeepBlueGray</item>
</style>
</resources>