diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/res/layout/activity_publish_profile_picture.xml | 10 | ||||
| -rw-r--r-- | src/main/res/layout/activity_trust_keys.xml | 25 | ||||
| -rw-r--r-- | src/main/res/layout/keys_card.xml | 17 |
3 files changed, 20 insertions, 32 deletions
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index ee587086b..ee60dcae0 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -23,8 +23,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:padding="@dimen/card_padding_regular" - android:orientation="vertical"> + android:orientation="vertical" + android:padding="@dimen/card_padding_regular"> <LinearLayout android:id="@+id/account_image_wrapper" @@ -61,7 +61,7 @@ android:layout_gravity="center_horizontal" android:text="@string/touch_to_choose_picture" android:textAlignment="center" - android:textColor="?attr/color_text_primary" /> + android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> <TextView android:id="@+id/secondary_hint" @@ -72,7 +72,7 @@ android:layout_gravity="center_horizontal" android:text="@string/or_long_press_for_default" android:textAlignment="center" - android:textColor="?attr/color_text_secondary" /> + android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> <TextView android:id="@+id/hint_or_warning" @@ -83,7 +83,7 @@ android:minLines="3" android:textAlignment="center" android:textColor="?attr/color_text_primary" - android:textSize="?attr/TextSizeBody" /> + android:textAppearance="@style/TextAppearance.AppCompat.Body1"/> </LinearLayout> </android.support.v7.widget.CardView> diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 4806f492e..7f84491e0 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -38,17 +38,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/error_trustkeys_title" - android:textColor="?attr/color_text_primary" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> <TextView android:id="@+id/key_error_message" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:textColor="?attr/color_text_primary" - android:textSize="?attr/TextSizeBody"/> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> </LinearLayout> </android.support.v7.widget.CardView> @@ -67,24 +64,20 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/card_padding_regular"> + android:padding="@dimen/card_padding_list"> <TextView android:id="@+id/own_keys_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?attr/color_text_primary" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:layout_margin="@dimen/list_padding" + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> <LinearLayout android:id="@+id/own_keys_details" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:divider="?android:dividerHorizontal" - android:orientation="vertical" - android:showDividers="middle"> - </LinearLayout> + android:orientation="vertical" /> </LinearLayout> </android.support.v7.widget.CardView> @@ -118,14 +111,14 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/cancel" - android:textColor="?attr/color_text_primary"/> + android:textColor="?attr/color_text_primary" /> <View android:layout_width="1dp" android:layout_height="fill_parent" android:layout_marginBottom="7dp" android:layout_marginTop="7dp" - android:background="?attr/divider"/> + android:background="?attr/divider" /> <Button android:id="@+id/save_button" @@ -135,7 +128,7 @@ android:layout_weight="1" android:enabled="true" android:text="@string/done" - android:textColor="?attr/color_text_secondary"/> + android:textColor="?attr/color_text_secondary" /> </LinearLayout> </RelativeLayout> </layout>
\ No newline at end of file diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml index 70f2c12d9..63fd7e2f3 100644 --- a/src/main/res/layout/keys_card.xml +++ b/src/main/res/layout/keys_card.xml @@ -15,33 +15,28 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/card_padding_regular"> + android:padding="@dimen/card_padding_list"> <TextView android:id="@+id/foreign_keys_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?attr/color_text_primary" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:layout_margin="@dimen/list_padding" + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> <LinearLayout android:id="@+id/foreign_keys_details" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:divider="?android:dividerHorizontal" - android:orientation="vertical" - android:showDividers="middle"> - </LinearLayout> + android:orientation="vertical"></LinearLayout> <TextView android:id="@+id/no_keys_to_accept" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" + android:layout_margin="@dimen/list_padding" android:text="@string/no_keys_just_confirm" - android:textColor="?attr/color_text_primary" - android:textSize="?attr/TextSizeBody"/> + android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> </LinearLayout> </android.support.v7.widget.CardView> </layout>
\ No newline at end of file |