moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

very subtle

This commit is contained in:
Daniel Gultsch 2015-07-21 02:21:34 +02:00
parent b7ff2c3461
commit 74e05023b4
9 changed files with 75 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -38,6 +38,7 @@ dependencies {
compile 'me.leolin:ShortcutBadger:1.1.1@aar' compile 'me.leolin:ShortcutBadger:1.1.1@aar'
compile 'com.kyleduo.switchbutton:library:1.2.8' compile 'com.kyleduo.switchbutton:library:1.2.8'
compile 'org.whispersystems:axolotl-android:1.3.4' compile 'org.whispersystems:axolotl-android:1.3.4'
compile 'com.makeramen:roundedimageview:2.1.1'
} }
android { android {

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

@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:background="?android:attr/activatedBackgroundIndicator" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:background="?android:attr/activatedBackgroundIndicator"
android:paddingBottom="8dp" android:paddingLeft="8dp"
android:paddingTop="8dp"> android:paddingBottom="8dp"
android:paddingTop="8dp">
<ImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/account_image" android:id="@+id/account_image"
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:src="@drawable/ic_profile"
android:contentDescription="@string/account_image_description"> android:contentDescription="@string/account_image_description"
</ImageView> app:riv_corner_radius="2dp" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"

15
src/main/res/layout/activity_edit_account.xml
View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent" android:layout_width="match_parent"
android:background="@color/grey200" > android:layout_height="match_parent"
android:background="@color/grey200">
<ScrollView <ScrollView
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -27,12 +28,14 @@
android:background="@drawable/infocard_border" android:background="@drawable/infocard_border"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/infocard_padding"> android:padding="@dimen/infocard_padding">
<ImageView android:id="@+id/avater" <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avater"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:contentDescription="@string/account_image_description"/> android:contentDescription="@string/account_image_description"
app:riv_corner_radius="2dp"/>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

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

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="fill_parent" android:layout_width="fill_parent"
android:background="@color/grey200"> android:layout_height="fill_parent"
android:background="@color/grey200">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -35,13 +36,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32dp"> android:layout_marginBottom="32dp">
<ImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/your_photo" android:id="@+id/your_photo"
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:src="@drawable/ic_profile"
</ImageView> app:riv_corner_radius="2dp" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"

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

@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:background="?android:attr/activatedBackgroundIndicator" android:layout_height="wrap_content"
android:padding="8dp" > android:background="?android:attr/activatedBackgroundIndicator"
android:padding="8dp">
<ImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/contact_photo" android:id="@+id/contact_photo"
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:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_profile" > android:src="@drawable/ic_profile"
</ImageView> app:riv_corner_radius="2dp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

12
src/main/res/layout/conversation_list_row.xml
View File

@ -1,7 +1,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:descendantFocusability="blocksDescendants"> android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants">
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -21,12 +22,13 @@
android:orientation="horizontal" android:orientation="horizontal"
android:padding="8dp" > android:padding="8dp" >
<ImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/conversation_image" android:id="@+id/conversation_image"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:scaleType="centerCrop" /> android:scaleType="centerCrop"
app:riv_corner_radius="2dp" />
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"

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

@ -1,21 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?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="fill_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:paddingBottom="3dp" android:orientation="vertical"
android:paddingLeft="8dp" android:paddingBottom="3dp"
android:paddingRight="8dp" android:paddingLeft="8dp"
android:paddingTop="3dp"> android:paddingRight="8dp"
android:paddingTop="3dp">
<ImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo" android:id="@+id/message_photo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
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" /> android:src="@drawable/ic_profile"
app:riv_corner_radius="2dp" />
<LinearLayout <LinearLayout
android:id="@+id/message_box" android:id="@+id/message_box"

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

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?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="fill_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:paddingBottom="3dp" android:orientation="vertical"
android:paddingLeft="8dp" android:paddingBottom="3dp"
android:paddingRight="8dp" android:paddingLeft="8dp"
android:paddingTop="3dp"> android:paddingRight="8dp"
android:paddingTop="3dp">
<ImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo" android:id="@+id/message_photo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -17,7 +18,8 @@
android:src="@drawable/ic_profile" 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"
app:riv_corner_radius="2dp" />
<LinearLayout <LinearLayout
android:id="@+id/message_box" android:id="@+id/message_box"

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

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?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="fill_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:orientation="vertical"
android:paddingLeft="8dp" android:paddingBottom="5dp"
android:paddingRight="8dp" android:paddingLeft="8dp"
android:paddingTop="5dp" > android:paddingRight="8dp"
android:paddingTop="5dp">
<ImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo" android:id="@+id/message_photo"
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="32dp" android:layout_height="32dp"
@ -17,7 +18,8 @@
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" /> android:src="@drawable/ic_profile"
app:riv_corner_radius="1dp"/>
<TextView <TextView
android:id="@+id/status_message" android:id="@+id/status_message"