I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Material design: text appearance

Browse Source
This commit is contained in:
str4d
2014-11-15 01:47:53 +00:00
parent bf1eb02b96
commit 0e7de7a962
8 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/activity_main.xml
View File

@@ -78,7 +78,7 @@
android:paddingRight="@dimen/nav_horizontal_margin"
android:paddingStart="@dimen/listitem_text_left_margin"
android:text="@string/address_book"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:textAppearance="@style/TextAppearance.AppCompat.Primary" />
</RelativeLayout>
<RelativeLayout
@@ -108,7 +108,7 @@
android:paddingRight="@dimen/nav_horizontal_margin"
android:paddingStart="@dimen/listitem_text_left_margin"
android:text="@string/network_status"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:textAppearance="@style/TextAppearance.AppCompat.Primary" />
</RelativeLayout>
</LinearLayout>

2
app/src/main/res/layout/dialog_password.xml
View File

@@ -9,7 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enter_password"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:textAppearance="@style/TextAppearance.AppCompat.Primary" />
<EditText
android:id="@+id/passwordInput"

11
app/src/main/res/layout/listitem_contact.xml
View File

@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/listitem_height_one_line">
android:layout_height="@dimen/listitem_height_one_line_avatar">
<ImageView
android:id="@+id/contact_picture"
android:layout_width="@dimen/listitem_picture_size"
android:layout_height="@dimen/listitem_picture_size"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin"
android:scaleType="centerCrop"
android:src="@drawable/ic_contact_picture" />
android:src="@drawable/ic_contact_picture"/>
<TextView
android:id="@+id/contact_name"
@@ -23,6 +26,6 @@
android:layout_marginLeft="@dimen/listitem_text_left_margin"
android:layout_marginStart="@dimen/listitem_text_left_margin"
android:text="Contact name"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:textAppearance="@style/TextAppearance.AppCompat.Primary"/>
</RelativeLayout>

9
app/src/main/res/layout/listitem_email.xml
View File

@@ -39,7 +39,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="Email subject"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
android:textAppearance="@style/TextAppearance.AppCompat.Primary" />
<TextView
android:id="@+id/email_address"
@@ -53,7 +53,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="From"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:textAppearance="@style/TextAppearance.AppCompat.Secondary" />
<TextView
android:id="@+id/email_content"
@@ -67,8 +67,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="Content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/secondary_text_default_material_light" />
android:textAppearance="@style/TextAppearance.AppCompat.Secondary" />
<ImageView
android:id="@+id/email_attachment"
@@ -106,6 +105,6 @@
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
android:layout_marginRight="@dimen/listitem_horizontal_margin"
android:text="##:## XX"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="@style/TextAppearance.AppCompat.Secondary" />
</RelativeLayout>

2
app/src/main/res/layout/listitem_folder.xml
View File

@@ -14,6 +14,6 @@
android:paddingRight="@dimen/nav_horizontal_margin"
android:paddingStart="@dimen/nav_horizontal_margin"
android:text="Folder Name"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:textAppearance="@style/TextAppearance.AppCompat.Primary" />
</RelativeLayout>

2
app/src/main/res/layout/listitem_folder_with_icon.xml
View File

@@ -22,6 +22,6 @@
android:paddingRight="@dimen/nav_horizontal_margin"
android:paddingStart="@dimen/listitem_text_left_margin"
android:text="Folder Name"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
android:textAppearance="@style/TextAppearance.AppCompat.Primary" />
</RelativeLayout>

13
app/src/main/res/values/dimens.xml
View File

@@ -6,11 +6,20 @@
<dimen name="nav_horizontal_margin">16dp</dimen>
<dimen name="nav_entry_height">48dp</dimen>
<dimen name="listitem_height_one_line">56dp</dimen>
<dimen name="listitem_height_three_lines">88dp</dimen>
<dimen name="text_size_primary">16sp</dimen>
<dimen name="text_size_secondary">14sp</dimen>
<dimen name="list_vertical_padding">8dp</dimen>
<dimen name="listitem_horizontal_margin">16dp</dimen>
<dimen name="listitem_picture_size">40dp</dimen>
<dimen name="listitem_icon_size">24dp</dimen>
<dimen name="listitem_text_left_margin">72dp</dimen>
<dimen name="listitem_icon_left_margin">8dp</dimen>
<dimen name="listitem_height_one_line">48dp</dimen>
<dimen name="listitem_height_one_line_avatar">56dp</dimen>
<dimen name="listitem_height_three_lines">88dp</dimen>
<dimen name="contact_chip_height">32dp</dimen>
<dimen name="contact_chip_main_margins">8dp</dimen>

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

@@ -20,4 +20,14 @@
<!-- The rest of your attributes -->
</style>
<style name="TextAppearance.AppCompat.Primary" parent="TextAppearance.AppCompat.Body1">
<item name="android:textColor">@color/primary_text_default_material_light</item>
<item name="android:textSize">@dimen/text_size_primary</item>
</style>
<style name="TextAppearance.AppCompat.Secondary" parent="TextAppearance.AppCompat.Body1">
<item name="android:textColor">@color/secondary_text_default_material_light</item>
<item name="android:textSize">@dimen/text_size_secondary</item>
</style>
</resources>