sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

started to change text style to app compat

This commit is contained in:
Daniel Gultsch 2018-02-18 12:13:51 +01:00
parent 5ebcb1ae71
commit 0262975635
9 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View File

@ -1034,6 +1034,8 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
registerForContextMenu(getListView()); registerForContextMenu(getListView());
getListView().setFastScrollEnabled(true); getListView().setFastScrollEnabled(true);
getListView().setDivider(null);
getListView().setDividerHeight(0);
} }
@Override @Override

1
src/main/res/layout/account_row.xml
View File

@ -13,7 +13,6 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:src="@drawable/ic_profile"
android:contentDescription="@string/account_image_description" android:contentDescription="@string/account_image_description"
app:riv_corner_radius="2dp" /> app:riv_corner_radius="2dp" />

20
src/main/res/layout/activity_contact_details.xml
View File

@ -47,9 +47,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/account_settings_example_jabber_id" android:text="@string/account_settings_example_jabber_id"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>
<com.wefika.flowlayout.FlowLayout <com.wefika.flowlayout.FlowLayout
android:id="@+id/tags" android:id="@+id/tags"
@ -66,17 +64,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
android:textSize="?attr/TextSizeBody"/>
<TextView <TextView
android:id="@+id/status_message" android:id="@+id/status_message"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:textColor="?attr/color_text_secondary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"
android:textStyle="italic"/>
<Button <Button
android:id="@+id/add_contact_button" android:id="@+id/add_contact_button"
@ -91,16 +86,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/send_presence_updates" android:text="@string/send_presence_updates"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"/>
<CheckBox <CheckBox
android:id="@+id/details_receive_presence" android:id="@+id/details_receive_presence"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/receive_presence_updates" android:text="@string/receive_presence_updates"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"/>
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -111,8 +104,7 @@
android:layout_below="@+id/details_jidbox" android:layout_below="@+id/details_jidbox"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:text="@string/using_account" android:text="@string/using_account"
android:textColor="?attr/color_text_secondary" android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
android:textSize="?attr/TextSizeInfo"/>
</RelativeLayout> </RelativeLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>

28
src/main/res/layout/activity_muc_details.xml
View File

@ -23,7 +23,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/infocard_padding">fill_parent android:padding="@dimen/infocard_padding">
<TextView <TextView
android:id="@+id/muc_jabberid" android:id="@+id/muc_jabberid"
@ -31,9 +31,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:text="@string/account_settings_example_jabber_id" android:text="@string/account_settings_example_jabber_id"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -45,7 +43,6 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:src="@drawable/ic_profile"
app:riv_corner_radius="2dp"/> app:riv_corner_radius="2dp"/>
<LinearLayout <LinearLayout
@ -61,16 +58,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
android:textSize="?attr/TextSizeHeadline"/>
<TextView <TextView
android:id="@+id/muc_role" android:id="@+id/muc_role"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"/>
android:textSize="?attr/TextSizeBody"/>
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
@ -98,8 +93,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/change_conference_button" android:layout_toLeftOf="@+id/change_conference_button"
android:text="@string/private_conference" android:text="@string/private_conference"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="?attr/TextSizeBody"
/> />
<ImageButton <ImageButton
@ -128,8 +122,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/notification_status_button" android:layout_toLeftOf="@+id/notification_status_button"
android:text="@string/notify_on_all_messages" android:text="@string/notify_on_all_messages"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="?attr/TextSizeBody"
/> />
<ImageButton <ImageButton
@ -164,8 +157,7 @@
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:text="@string/server_info_mam" android:text="@string/server_info_mam"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"/>
<TextView <TextView
android:id="@+id/muc_info_mam" android:id="@+id/muc_info_mam"
@ -173,8 +165,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"/>
</TableRow> </TableRow>
</TableLayout> </TableLayout>
@ -186,8 +177,7 @@
android:layout_gravity="right" android:layout_gravity="right"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:text="@string/using_account" android:text="@string/using_account"
android:textColor="?attr/color_text_secondary" android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
android:textSize="?attr/TextSizeInfo"/>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>

9
src/main/res/layout/contact.xml
View File

@ -12,7 +12,6 @@
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_profile"
app:riv_corner_radius="2dp" /> app:riv_corner_radius="2dp" />
<LinearLayout <LinearLayout
@ -21,23 +20,21 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toRightOf="@+id/contact_photo" android:layout_toRightOf="@+id/contact_photo"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="8dp" > android:paddingLeft="16dp" >
<TextView <TextView
android:id="@+id/contact_display_name" android:id="@+id/contact_display_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
android:textSize="?attr/TextSizeHeadline" />
<TextView <TextView
android:id="@+id/contact_jid" android:id="@+id/contact_jid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"/>
android:textSize="?attr/TextSizeBody" />
<com.wefika.flowlayout.FlowLayout <com.wefika.flowlayout.FlowLayout
android:id="@+id/tags" android:id="@+id/tags"
android:layout_width="wrap_content" android:layout_width="wrap_content"

1
src/main/res/layout/message_received.xml
View File

@ -16,7 +16,6 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_profile"
app:riv_corner_radius="2dp" /> app:riv_corner_radius="2dp" />
<LinearLayout <LinearLayout

1
src/main/res/layout/message_sent.xml
View File

@ -15,7 +15,6 @@
android:layout_height="48dp" android:layout_height="48dp"
android:scaleType="fitXY" android:scaleType="fitXY"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:src="@drawable/ic_profile"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"

1
src/main/res/layout/message_status.xml
View File

@ -27,7 +27,6 @@
android:layout_marginRight="-1.5dp" android:layout_marginRight="-1.5dp"
android:padding="0dp" android:padding="0dp"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_profile"
app:riv_corner_radius="1dp"/> app:riv_corner_radius="1dp"/>
<TextView <TextView

6
src/main/res/values/styles.xml
View File

@ -1,7 +1,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Divider"> <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1">
<item name="android:layout_width">match_parent</item> <item name="android:textColor">?android:textColorSecondary</item>
<item name="android:layout_height">1.5dp</item>
<item name="android:background">@color/black12</item>
</style> </style>
</resources> </resources>