hacker/fast-messenger
1
0
Fork 0
forked from melod1n/fast-messenger
Code Pull Requests Activity

Basic conversations screen

Browse Source 
attachment types
action types
forwards
This commit is contained in:
Danil Nikolaev
2021-09-11 21:58:55 +03:00
parent 2109ff9ee5
commit f7c8d6e1c8
91 changed files with 1694 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/font/google_sans_regular.ttf
BIN
View File
Binary file not shown.
app/src/main/res/layout/fragment_conversations.xml
+2 -34
View File
@@ -8,8 +8,7 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
@@ -18,23 +17,10 @@
android:orientation="vertical"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_conversation" />
tools:listitem="@layout/item_conversation_old" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:background="@drawable/toolbar_background"
android:elevation="3dp"
app:title="@string/conversations"
app:titleCentered="true" />
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="wrap_content"
@@ -43,22 +29,4 @@
android:visibility="gone"
tools:visibility="visible" />
<include
layout="@layout/no_items_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<include
layout="@layout/no_internet_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<include
layout="@layout/error_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/fragment_main.xml
+2 -2
View File
@@ -9,14 +9,14 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="48dp" />
android:layout_height="match_parent" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomBar"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="bottom"
android:visibility="gone"
app:backgroundTint="?colorSurface"
app:elevation="0.5dp"
app:itemIconTint="@drawable/navigation_view_items_colors"
app/src/main/res/layout/item_conversation.xml
+75 -158
View File
@@ -1,186 +1,103 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="2dp"
android:paddingBottom="2dp">
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:id="@+id/container"
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="6dp"
android:baselineAligned="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="6dp">
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginVertical="10dp"
android:orientation="horizontal">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0">
android:layout_width="56dp"
android:layout_height="56dp">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/peerAvatar"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="bottom|end"
app:shapeAppearanceOverlay="@style/CircleImageView.56"
tools:src="?colorAccent" />
<com.meloda.fast.widget.CircleImageView
android:id="@+id/avatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="#ff0000" />
<FrameLayout
android:id="@+id/online"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="end|bottom">
<com.meloda.fast.widget.CircleImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center"
android:src="@color/background" />
<com.meloda.fast.widget.CircleImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center"
android:src="@drawable/ic_online_pc"
app:tint="@color/online" />
</FrameLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/peerOnline"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="bottom|end"
tools:src="@drawable/ic_online_pc" />
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:gravity="center"
android:layout_marginStart="24dp"
android:orientation="vertical">
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/type"
android:layout_width="20dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:paddingStart="2dp"
android:paddingEnd="0dp"
android:tint="@color/conversationTitle"
android:visibility="gone"
tools:src="@drawable/ic_dialog_type_conversation" />
<TextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/tt_commons_medium"
android:singleLine="true"
android:textColor="#ff0000"
android:textSize="20sp"
tools:text="Title" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:minHeight="26dp"
android:orientation="horizontal">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/fromAvatar"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
app:shapeAppearanceOverlay="@style/CircleImageView.24"
tools:src="?colorAccent"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/textAttachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="1.5dp"
android:tint="?colorAccent"
android:visibility="gone"
tools:src="@drawable/ic_message_attachment_camera"
tools:visibility="visible" />
android:layout_weight="1"
android:fontFamily="@font/google_sans_regular"
android:maxLines="2"
android:textColor="#201A1A"
android:textSize="22sp"
tools:text="Title" />
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
<com.google.android.material.textview.MaterialTextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="16dp"
android:baselineAligned="false"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="?android:textColorPrimary"
android:textSize="14sp"
android:layout_marginTop="-4dp"
android:alpha="0.5"
android:fontFamily="@font/roboto_regular"
android:textColor="@color/date"
tools:text="20:00" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.7"
android:fontFamily="@font/roboto_regular"
android:maxLines="2"
android:textColor="@color/message"
android:textSize="16sp"
tools:text="Message" />
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="50dp"
android:paddingStart="6dp"
android:paddingEnd="6dp">
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/out"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_gravity="bottom"
android:layout_marginBottom="8dp"
android:src="?colorAccent"
android:visibility="gone"
tools:visibility="gone" />
</androidx.appcompat.widget.LinearLayoutCompat>
</FrameLayout>
</LinearLayout>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|top"
android:layout_margin="8dp"
android:gravity="center"
android:maxLines="1"
android:minWidth="30dp"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:text="now" />
<TextView
android:id="@+id/counter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="36dp"
android:layout_marginEnd="14dp"
android:background="@drawable/ic_conversations_counter_background"
android:backgroundTint="?colorAccent"
android:backgroundTintMode="multiply"
android:fontFamily="@font/google_sans_medium"
android:gravity="center"
android:minWidth="28dp"
android:minHeight="28dp"
android:padding="6dp"
android:textColor="?android:textColorPrimaryInverse"
android:textSize="12sp"
tools:text="12"
tools:visibility="visible" />
</FrameLayout>
</layout>
app/src/main/res/layout/item_conversation_old.xml
+186
View File
@@ -0,0 +1,186 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="2dp"
android:paddingBottom="2dp">
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="6dp"
android:baselineAligned="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="6dp">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/peerAvatar"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="bottom|end"
app:shapeAppearanceOverlay="@style/CircleImageView.56"
tools:src="?colorAccent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/peerOnline"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="bottom|end"
tools:src="@drawable/ic_online_pc" />
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/type"
android:layout_width="20dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:paddingStart="2dp"
android:paddingEnd="0dp"
android:tint="@color/conversationTitle"
android:visibility="gone"
tools:src="@drawable/ic_dialog_type_conversation" />
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/tt_commons_medium"
android:singleLine="true"
android:textColor="#ff0000"
android:textSize="20sp"
tools:text="Title" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:minHeight="26dp"
android:orientation="horizontal">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/fromAvatar"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
app:shapeAppearanceOverlay="@style/CircleImageView.24"
tools:src="?colorAccent"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/textAttachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="1.5dp"
android:tint="?colorAccent"
android:visibility="gone"
tools:src="@drawable/ic_message_attachment_camera"
tools:visibility="visible" />
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="16dp"
android:baselineAligned="false"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="?android:textColorPrimary"
android:textSize="14sp"
tools:text="Message" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="50dp"
android:paddingStart="6dp"
android:paddingEnd="6dp">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/out"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_gravity="bottom"
android:layout_marginBottom="8dp"
android:src="?colorAccent"
android:visibility="gone"
tools:visibility="gone" />
</FrameLayout>
</LinearLayout>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|top"
android:layout_margin="8dp"
android:gravity="center"
android:maxLines="1"
android:minWidth="30dp"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:text="now" />
<TextView
android:id="@+id/counter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="36dp"
android:layout_marginEnd="14dp"
android:background="@drawable/ic_conversations_counter_background"
android:backgroundTint="?colorAccent"
android:backgroundTintMode="multiply"
android:fontFamily="@font/google_sans_medium"
android:gravity="center"
android:minWidth="28dp"
android:minHeight="28dp"
android:padding="6dp"
android:textColor="?android:textColorPrimaryInverse"
android:textSize="12sp"
tools:text="12"
tools:visibility="visible" />
</FrameLayout>
app/src/main/res/values-v31/colors.xml
+7 -4
View File
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="statusBar">@android:color/system_accent1_10</color>
<color name="navigationBar">@android:color/system_accent1_10</color>
<color name="background">@android:color/system_accent1_10</color>
<color name="statusBar">@android:color/system_neutral1_50</color>
<color name="navigationBar">@android:color/system_neutral1_50</color>
<color name="background">@android:color/system_neutral1_50</color>
<color name="accent">@android:color/system_accent1_500</color>
<color name="action">@android:color/system_accent3_500</color>
<color name="actionRipple">@android:color/system_accent3_200</color>
<color name="actionContentPrimary">@android:color/system_accent1_10</color>
<color name="online">@android:color/system_accent3_200</color>
<color name="date">@android:color/system_neutral2_500</color>
<color name="message">@android:color/system_neutral1_900</color>
<color name="primary">@android:color/system_accent1_10</color>
<color name="primary">@android:color/system_neutral1_50</color>
<color name="divider">#E0E0E0</color>
app/src/main/res/values/colors.xml
+4
View File
@@ -15,6 +15,10 @@
<color name="textSecondary">#99000000</color>
<color name="online">#00ff00</color>
<color name="date">#212121</color>
<color name="message">#000000</color>
<color name="text_secondary_100_alpha">#ff000000</color>
<color name="text_secondary_87_alpha">#DE000000</color>
app/src/main/res/values/strings.xml
+5
View File
@@ -158,5 +158,10 @@
<string name="conversations">Conversations</string>
<string name="code_hint">Code</string>
<string name="input_validation_code">Input code from sms</string>
<string name="you_message_prefix">You</string>
<string name="message_geo">Geolocation</string>
<string name="message_geo_point">Point</string>
<string name="forwarded_message">Message</string>
<string name="forwarded_messages">Messages</string>
</resources>