aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/res/layout/activity_change_password.xml2
-rw-r--r--src/main/res/layout/activity_contact_details.xml20
-rw-r--r--src/main/res/layout/activity_edit_account.xml9
-rw-r--r--src/main/res/layout/activity_muc_details.xml13
-rw-r--r--src/main/res/layout/activity_publish_profile_picture.xml2
-rw-r--r--src/main/res/layout/activity_set_presence.xml4
-rw-r--r--src/main/res/layout/activity_trust_keys.xml4
-rw-r--r--src/main/res/layout/contact.xml2
-rw-r--r--src/main/res/layout/contact_key.xml45
-rw-r--r--src/main/res/layout/keys_card.xml2
-rw-r--r--src/main/res/values/dimens.xml4
11 files changed, 51 insertions, 56 deletions
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index ab2535281..d8e7d1785 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<android.support.design.widget.TextInputLayout
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index b2cf020e5..75ef17978 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -25,7 +25,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/contact_display_name"
@@ -73,9 +73,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/account_settings_example_jabber_id"
+ android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textIsSelectable="true"
- android:visibility="gone"
- android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+ android:visibility="gone" />
<com.wefika.flowlayout.FlowLayout
android:id="@+id/tags"
@@ -160,8 +160,8 @@
android:layout_below="@+id/details_jidbox"
android:layout_marginTop="32dp"
android:text="@string/using_account"
- android:visibility="gone"
- android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+ android:visibility="gone" />
</RelativeLayout>
</android.support.v7.widget.CardView>
@@ -178,8 +178,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:background="@drawable/infocard_border"
- android:padding="@dimen/infocard_padding"
+ android:padding="@dimen/card_padding_regular"
android:touchscreenBlocksFocus="true">
<TextView
@@ -215,14 +214,13 @@
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin"
- android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:layout_marginTop="@dimen/activity_vertical_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_list">
<LinearLayout
android:id="@+id/details_contact_keys"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 941f584c8..b685e9cad 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -30,7 +30,7 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avater"
@@ -187,7 +187,7 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding"
+ android:padding="@dimen/card_padding_regular"
android:visibility="gone">
<TextView
@@ -234,7 +234,7 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding"
+ android:padding="@dimen/card_padding_regular"
android:visibility="gone">
<TableLayout
@@ -659,7 +659,7 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding"
+ android:padding="@dimen/card_padding_regular"
android:visibility="gone">
<TextView
@@ -669,6 +669,7 @@
android:text="@string/other_devices"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeHeadline"
+ android:layout_margin="@dimen/list_padding"
android:textStyle="bold" />
<LinearLayout
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 15af277a0..5dfe75458 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -18,14 +18,13 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/conference_name"
@@ -117,14 +116,13 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_list">
<RelativeLayout
android:layout_width="fill_parent"
@@ -215,7 +213,6 @@
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding"
android:visibility="gone">
@@ -223,7 +220,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_list">
<TableLayout
android:layout_width="match_parent"
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 922d1f8f3..c6339604c 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -31,7 +31,7 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<LinearLayout
android:id="@+id/account_image_wrapper"
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index b3fc6f26e..1996e6fdf 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<android.support.text.emoji.widget.EmojiAppCompatEditText
android:id="@+id/presence_status_message"
@@ -78,7 +78,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding"/>
+ android:padding="@dimen/card_padding_regular"/>
</android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView>
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 7ba6fd674..4806f492e 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<TextView
android:id="@+id/key_error_message_title"
@@ -67,7 +67,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<TextView
android:id="@+id/own_keys_title"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 92a796e3b..159b1256a 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/activatedBackgroundIndicator"
- android:padding="8dp">
+ android:padding="@dimen/list_padding">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/contact_photo"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 1da9f132a..e276fc047 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -9,34 +9,32 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:paddingBottom="8dp"
- android:paddingLeft="8dp"
- android:paddingTop="8dp">
+ android:padding="@dimen/list_padding">
<TextView
android:id="@+id/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/action_container"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
+ android:clickable="true"
android:fontFamily="monospace"
android:longClickable="true"
- android:clickable="true" />
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
<TextView
android:id="@+id/key_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black54"
android:layout_alignParentLeft="true"
android:layout_below="@+id/key"
- android:maxLines="1"
- android:textSize="?attr/TextSizeInfo"
+ android:clickable="true"
android:longClickable="true"
- android:clickable="true" />
+ android:maxLines="1"
+ android:textColor="@color/black54"
+ android:textSize="?attr/TextSizeInfo" />
<TextView
android:id="@+id/key_trust"
@@ -44,48 +42,47 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/key"
- android:visibility="gone"
+ android:longClickable="true"
android:textColor="@color/black54"
android:textSize="?attr/TextSizeInfo"
- android:longClickable="true" />
+ android:visibility="gone" />
<LinearLayout
android:id="@+id/action_container"
- android:layout_width="96dp"
- android:layout_marginRight="-32dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="vertical"
android:layout_alignParentRight="true"
- android:layout_centerVertical="true">
+ android:layout_centerVertical="true"
+ android:orientation="vertical">
<ImageButton
- android:layout_gravity="center_horizontal"
android:id="@+id/button_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_remove"
- android:layout_marginRight="16dp"
android:visibility="gone" />
<ImageView
- android:visibility="gone"
android:id="@+id/verified_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:layout_marginRight="16dp"
- android:src="@drawable/ic_verified_fingerprint" />
+ android:padding="@dimen/image_button_padding"
+ android:src="@drawable/ic_verified_fingerprint"
+ android:visibility="gone" />
<android.support.v7.widget.SwitchCompat
android:id="@+id/tgl_trust"
- android:visibility="gone"
+ style="@style/MD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- style="@style/MD" />
+ android:layout_gravity="center_horizontal"
+ android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout> \ 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 b312e4227..70f2c12d9 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<TextView
android:id="@+id/foreign_keys_title"
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 08861f6d5..810feee69 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -2,7 +2,9 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">8dp</dimen>
<dimen name="activity_vertical_margin">8dp</dimen>
- <dimen name="infocard_padding">16dp</dimen>
+ <dimen name="card_padding_regular">16dp</dimen>
+ <dimen name="card_padding_list">8dp</dimen> <!-- card_padding_regular minus list_padding -->
+ <dimen name="list_padding">8dp</dimen>
<dimen name="image_button_padding">12dp</dimen>
<dimen name="audio_player_width">224dp</dimen>
</resources>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 22:16:31 +0000