Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Add bulb to scene transition, make transitionName unique for each contact

Browse Source
This commit is contained in:
str4d
2016-04-28 10:38:12 +00:00
committed by Torsten Grote
parent b818d6846c
commit 69026054cd
7 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/res/layout/contact_avatar_status.xml
View File

@@ -11,7 +11,6 @@
android:id="@+id/contactAvatar"
android:layout_width="30dp"
android:layout_height="30dp"
android:transitionName="avatar"
app:civ_border_color="@color/action_bar_text"
app:civ_border_width="@dimen/avatar_border_width"
tools:src="@drawable/ic_launcher"/>
@@ -22,7 +21,7 @@
android:layout_height="15dp"
android:layout_gravity="bottom|right"
android:scaleType="fitCenter"
tools:src="@drawable/contact_online"
tools:ignore="ContentDescription"/>
tools:ignore="ContentDescription"
tools:src="@drawable/contact_online"/>
</FrameLayout>

9
briar-android/res/layout/list_item_contact.xml
View File

@@ -10,9 +10,9 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/listitem_horizontal_margin"
android:paddingBottom="@dimen/listitem_horizontal_margin"
android:background="?attr/selectableItemBackground"
android:paddingBottom="@dimen/listitem_horizontal_margin"
android:paddingTop="@dimen/listitem_horizontal_margin"
>
<de.hdodenhof.circleimageview.CircleImageView
@@ -24,7 +24,6 @@
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin"
android:transitionName="avatar"
app:civ_border_color="@color/briar_primary"
app:civ_border_width="@dimen/avatar_border_width"
tools:src="@drawable/ic_launcher"/>
@@ -33,13 +32,13 @@
android:id="@+id/textViews"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin"
android:layout_toEndOf="@+id/avatarView"
android:layout_toLeftOf="@+id/bulbView"
android:layout_toRightOf="@+id/avatarView"
android:layout_toEndOf="@+id/avatarView">
android:orientation="vertical">
<TextView
android:id="@+id/nameView"