TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conversation scroll date label themed.

Browse Source 
New muted icon.
This commit is contained in:
Anton Chekulaev 2020-08-24 15:33:01 +10:00
parent 9cb0a18a85
commit 1191353fde
7 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/drawable/ic_outline_notifications_off_24.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM12,6.5c2.49,0 4,2.02 4,4.5v0.1l2,2L18,11c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.24,0.06 -0.47,0.15 -0.69,0.23l1.64,1.64c0.18,-0.02 0.36,-0.05 0.55,-0.05zM5.41,3.35L4,4.76l2.81,2.81C6.29,8.57 6,9.74 6,11v5l-2,2v1h14.24l1.74,1.74 1.41,-1.41L5.41,3.35zM16,17L8,17v-6c0,-0.68 0.12,-1.32 0.34,-1.9L16,16.76L16,17z"/>
</vector>

6
res/layout/conversation_activity.xml
View File

@ -44,10 +44,10 @@
<ImageView
android:id="@+id/muteIndicatorImageView"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="center"
android:src="@drawable/ic_mute"
android:src="@drawable/ic_outline_notifications_off_24"
android:layout_marginRight="6dp"
android:visibility="gone"
tools:visibility="visible"/>

4
res/layout/conversation_fragment.xml
View File

@ -26,8 +26,8 @@
android:paddingBottom="4dp"
android:layout_marginTop="8dp"
android:textSize="@dimen/small_font_size"
android:textColor="#99FFFFFF"
android:background="?attr/conversation_item_sticky_date_background"
android:textColor="?conversation_item_sticky_date_text_color"
android:background="?conversation_item_sticky_date_background"
android:elevation="10dp"
android:visibility="gone"
tools:text="March 1, 2015" />

2
res/layout/conversation_item_header.xml
View File

@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#99FFFFFF"
android:textColor="?conversation_item_sticky_date_text_color"
android:textSize="@dimen/small_font_size"
tools:text="March 1, 2015" />

9
res/layout/view_conversation.xml
View File

@ -69,11 +69,12 @@
<ImageView
android:id="@+id/muteIndicatorImageView"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_mute"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="center"
android:src="@drawable/ic_outline_notifications_off_24"
android:layout_marginTop="1dp"
android:layout_marginEnd="4dp" />
android:layout_marginEnd="6dp" />
<RelativeLayout
android:layout_width="wrap_content"

2
res/values/themes.xml
View File

@ -429,7 +429,7 @@
<item name="conversation_item_date_line_color">@color/core_grey_45</item>
<item name="conversation_item_quote_text_color">@color/core_grey_05</item>
<item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_dark</item>
<item name="conversation_item_sticky_date_text_color">@color/core_grey_25</item>
<item name="conversation_item_sticky_date_text_color">@color/core_grey_45</item>
<item name="conversation_item_image_outline_color">@color/transparent_white_30</item>
<item name="contact_list_divider">@drawable/contact_list_divider_dark</item>

2
src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
View File

@ -38,7 +38,7 @@ class ConversationView : LinearLayout {
}
private fun setUpViewHierarchy() {
val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val contentView = inflater.inflate(R.layout.view_conversation, null)
addView(contentView)
}