aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java2
-rw-r--r--src/main/res/layout/account_row.xml1
-rw-r--r--src/main/res/layout/activity_contact_details.xml24
-rw-r--r--src/main/res/layout/activity_muc_details.xml46
-rw-r--r--src/main/res/layout/contact.xml9
-rw-r--r--src/main/res/layout/message_received.xml1
-rw-r--r--src/main/res/layout/message_sent.xml1
-rw-r--r--src/main/res/layout/message_status.xml1
-rw-r--r--src/main/res/values/styles.xml3
9 files changed, 34 insertions, 54 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index ae3e21b48..43f7aad3e 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -979,6 +979,8 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
super.onViewCreated(view, savedInstanceState);
registerForContextMenu(getListView());
getListView().setFastScrollEnabled(true);
+ getListView().setDivider(null);
+ getListView().setDividerHeight(0);
}
@Override
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index d36eecccb..c50485f56 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -13,7 +13,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
- android:src="@drawable/ic_profile"
android:contentDescription="@string/account_image_description"
android:background="@drawable/message_border"
android:padding="1dp"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index d2dfd6deb..b2cf020e5 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -73,11 +73,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/account_settings_example_jabber_id"
- android:textColor="?attr/color_text_primary"
android:textIsSelectable="true"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"
- android:visibility="gone" />
+ android:visibility="gone"
+ android:textAppearance="@style/TextAppearance.AppCompat.Title" />
<com.wefika.flowlayout.FlowLayout
android:id="@+id/tags"
@@ -96,8 +94,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
- android:textColor="?attr/color_text_primary"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_message"
@@ -107,9 +104,7 @@
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:gravity="center_horizontal"
- android:textColor="?attr/color_text_primary"
- android:textSize="?attr/TextSizeBody"
- android:textStyle="italic" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/resource"
@@ -143,8 +138,7 @@
android:layout_below="@+id/add_contact_button"
android:layout_marginTop="4dp"
android:text="@string/send_presence_updates"
- android:textColor="?attr/color_text_primary"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<CheckBox
android:id="@+id/details_receive_presence"
@@ -154,8 +148,7 @@
android:layout_alignParentStart="true"
android:layout_below="@+id/details_send_presence"
android:text="@string/receive_presence_updates"
- android:textColor="?attr/color_text_primary"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
</LinearLayout>
@@ -167,9 +160,8 @@
android:layout_below="@+id/details_jidbox"
android:layout_marginTop="32dp"
android:text="@string/using_account"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo"
- android:visibility="gone" />
+ android:visibility="gone"
+ android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</RelativeLayout>
</android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index bf7accfd5..15af277a0 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -55,8 +55,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/change_conference_button"
android:text="@string/private_conference"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<ImageButton
android:id="@+id/change_conference_button"
@@ -83,8 +82,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/notification_status_button"
android:text="@string/notify_on_all_messages"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<ImageButton
android:id="@+id/notification_status_button"
@@ -100,27 +98,14 @@
</RelativeLayout>
<TextView
- android:id="@+id/details_account"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:layout_marginTop="32dp"
- android:text="@string/using_account"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo"
- android:visibility="gone" />
-
- <TextView
android:id="@+id/muc_jabberid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/account_settings_example_jabber_id"
- android:textColor="@color/black87"
android:textIsSelectable="true"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"
- android:visibility="gone" />
+ android:visibility="gone"
+ android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</LinearLayout>
</android.support.v7.widget.CardView>
@@ -154,7 +139,6 @@
android:layout_alignParentLeft="true"
android:layout_alignParentRight="false"
android:padding="1dp"
- android:src="@drawable/ic_profile"
app:riv_border_color="@color/grey500"
app:riv_border_width="1dp"
app:riv_corner_radius="36dp" />
@@ -172,16 +156,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:id="@+id/muc_role"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" />
</LinearLayout>
<ImageButton
@@ -258,8 +240,7 @@
android:ellipsize="end"
android:singleLine="true"
android:text="@string/server_info_mam"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:id="@+id/muc_info_mam"
@@ -267,10 +248,19 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
</TableRow>
</TableLayout>
+
+ <TextView
+ android:id="@+id/details_account"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:layout_marginTop="32dp"
+ android:text="@string/using_account"
+ android:visibility="gone"
+ android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 2865f3edf..92a796e3b 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -11,7 +11,6 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
- android:src="@drawable/ic_profile"
app:riv_border_width="1dp"
app:riv_border_color="@color/grey500"
app:riv_corner_radius="28dp" />
@@ -22,23 +21,21 @@
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/contact_photo"
android:orientation="vertical"
- android:paddingLeft="8dp">
+ android:paddingLeft="16dp">
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/contact_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:id="@+id/contact_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" />
<com.wefika.flowlayout.FlowLayout
android:id="@+id/tags"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 41be316a9..6c50f2bae 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,7 +16,6 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile"
app:riv_border_width="1dip"
app:riv_border_color="@color/grey500"
app:riv_corner_radius="24dp" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 835830ea9..15a52a797 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -14,7 +14,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index afdf317d7..835e380a5 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -29,7 +29,6 @@
android:layout_marginRight="-1.5dp"
android:padding="0dp"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile"
app:riv_border_width="1dp"
app:riv_border_color="@color/grey500"
app:riv_corner_radius="16dp"/>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index c35a4c862..1b3798eca 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,3 +1,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1">
+ <item name="android:textColor">?android:textColorSecondary</item>
+ </style>
</resources> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 23:22:41 +0000