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

я не помню, что тут

Browse Source
This commit is contained in:
Danil Nikolaev
2021-10-02 20:13:27 +03:00
parent 7c72199d32
commit 9e074dd5ad
35 changed files with 945 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable-v21/ic_star_border.xml
+9 -4
View File
@@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
</vector>
app/src/main/res/drawable/ic_chat_attachment_panel_background.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:topLeftRadius="30dp"
android:topRightRadius="30dp" />
<solid android:color="@android:color/white" />
</shape>
app/src/main/res/drawable/ic_image_button_circle_background.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@android:color/white" />
<corners android:radius="100dp" />
</shape>
app/src/main/res/drawable/ic_message_in_background.xml
+2 -2
View File
@@ -6,8 +6,8 @@
<corners
android:bottomLeftRadius="5dp"
android:bottomRightRadius="40dp"
android:bottomRightRadius="30dp"
android:topLeftRadius="30dp"
android:topRightRadius="40dp" />
android:topRightRadius="30dp" />
</shape>
app/src/main/res/drawable/ic_message_out_background.xml
+4
View File
@@ -2,6 +2,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="2dp"
android:color="@color/messageOutStrokeColor" />
<solid android:color="@color/messageOutColor" />
<corners
app/src/main/res/drawable/ic_message_out_background_middle.xml
+4
View File
@@ -2,6 +2,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="2dp"
android:color="@color/messageOutStrokeColor" />
<solid android:color="@color/messageOutColor" />
<corners
app/src/main/res/drawable/ic_round_close_20.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59 7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z" />
</vector>
app/src/main/res/layout/fragment_conversations.xml
+40 -11
View File
@@ -20,18 +20,9 @@
android:elevation="0dp"
app:collapsedTitleTextAppearance="@style/CollapsingToolbarCollapsedTitle"
app:expandedTitleTextAppearance="@style/CollapsingToolbarTitle"
app:layout_scrollFlags="scroll|enterAlways|snap"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:title="Messages">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="?android:windowBackground"
android:elevation="0dp"
app:layout_collapseMode="parallax"
app:menu="@menu/fragment_conversations" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/expandedImage"
android:layout_width="match_parent"
@@ -43,11 +34,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="30dp"
android:orientation="horizontal"
android:paddingStart="0dp"
android:paddingEnd="30dp"
app:layout_collapseParallaxMultiplier="0.5">
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/search"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="16dp"
@@ -63,6 +56,42 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="?android:windowBackground"
android:elevation="0dp"
app:layout_collapseMode="parallax"
app:menu="@menu/fragment_conversations">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/toolbarAvatarContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="30dp"
android:orientation="horizontal"
app:layout_collapseParallaxMultiplier="0.5">
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/toolbarSearch"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="16dp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_search"
android:tint="?colorSecondary3Variant" />
<com.meloda.fast.widget.CircleImageView
android:id="@+id/toolbarAvatar"
android:layout_width="30dp"
android:layout_height="30dp"
tools:src="@tools:sample/avatars" />
</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
app/src/main/res/layout/fragment_login.xml
+8
View File
@@ -9,6 +9,14 @@
android:layout_height="match_parent"
android:orientation="vertical">
<WebView
android:id="@+id/webView"
android:layout_width="0dp"
android:layout_height="0dp"
android:clickable="false"
android:focusable="false"
android:visibility="gone" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
app/src/main/res/layout/fragment_messages_history.xml
+97 -7
View File
@@ -7,7 +7,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
@@ -49,21 +48,21 @@
android:id="@+id/avatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:src="@tools:sample/avatars"
tools:visibility="visible" />
tools:src="@tools:sample/avatars" />
<FrameLayout
android:id="@+id/avatarPlaceholder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
android:layout_height="match_parent">
<com.meloda.fast.widget.CircleImageView
android:id="@+id/placeholderBack"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@color/n1_50" />
<com.meloda.fast.widget.CircleImageView
android:id="@+id/placeholder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/ic_account_circle_cut"
@@ -90,7 +89,34 @@
android:layout_height="14dp"
android:layout_gravity="center"
android:src="@drawable/ic_online_pc"
app:tint="@color/a3_200" />
app:tint="?colorSecondary2" />
</FrameLayout>
<FrameLayout
android:id="@+id/pin"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="start|top"
android:visibility="gone"
tools:visibility="visible">
<com.meloda.fast.widget.CircleImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="center"
android:background="@drawable/ic_back"
android:backgroundTint="@color/n2_500"
android:elevation="0.5dp" />
<com.meloda.fast.widget.CircleImageView
android:id="@+id/pinIcon"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center"
android:elevation="1dp"
android:src="@drawable/ic_round_push_pin_24"
app:tint="@color/n2_0" />
</FrameLayout>
@@ -182,6 +208,69 @@
</FrameLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/attachmentPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginBottom="35dp"
android:background="@drawable/ic_chat_attachment_panel_background"
android:backgroundTint="@color/n2_100"
android:minHeight="105dp"
android:orientation="vertical"
android:padding="16dp"
app:layout_anchor="@+id/messagePanel"
app:layout_anchorGravity="center_vertical|top">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/replyMessage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/replyMessageTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?textColorPrimary"
app:fontFamily="@font/google_sans_regular"
tools:text="Michael Bae" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/dismissReply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_image_button_circle_background"
android:backgroundTint="@color/n1_50"
android:src="@drawable/ic_round_close_20"
android:tint="?colorSecondary3" />
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/replyMessageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?textColorPrimary"
android:textSize="16sp"
app:fontFamily="@font/roboto_regular"
tools:text="Short Message." />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="40dp"
@@ -211,7 +300,8 @@
android:layout_marginHorizontal="20dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/message_input_hint" />
android:hint="@string/message_input_hint"
android:singleLine="true" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/attach"
app/src/main/res/layout/item_message_attachment_link.xml
+1 -2
View File
@@ -9,12 +9,11 @@
android:orientation="horizontal"
android:padding="4dp">
<com.google.android.material.imageview.ShapeableImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/preview"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
android:scaleType="centerCrop"
tools:src="@tools:sample/avatars" />
<androidx.appcompat.widget.LinearLayoutCompat
app/src/main/res/layout/item_message_in.xml
+27 -32
View File
@@ -51,31 +51,39 @@
android:layout_height="wrap_content"
android:background="@drawable/ic_message_in_background"
android:backgroundTint="@color/n2_100"
android:minWidth="60dp"
android:orientation="vertical"
android:padding="15dp"
tools:ignore="UselessParent">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:autoLink="all"
android:textColor="@color/n1_800"
tools:text="This" />
<Space
android:id="@+id/attachmentSpacer"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:visibility="gone" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/attachmentContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone" />
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:autoLink="all"
android:padding="15dp"
android:textColor="@color/n1_800"
tools:text="This" />
<Space
android:id="@+id/attachmentSpacer"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:visibility="gone" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/attachmentContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone" />
</androidx.appcompat.widget.LinearLayoutCompat>
</com.meloda.fast.widget.BoundedLinearLayout>
@@ -88,19 +96,6 @@
android:src="@color/a3_200" />
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="12dp"
android:textColor="?textColorSecondaryVariant"
android:visibility="gone"
tools:layout_height="18dp"
tools:text="12:00"
tools:visibility="visible" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</layout>
app/src/main/res/layout/item_message_out.xml
+18 -28
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<androidx.appcompat.widget.LinearLayoutCompat
@@ -30,28 +31,26 @@
android:layout_height="10dp"
android:visibility="gone" />
<FrameLayout
android:id="@+id/bubbleStroke"
<com.meloda.fast.widget.BoundedLinearLayout
android:id="@+id/bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_message_out_background_stroke"
android:padding="1.5dp"
tools:ignore="UselessParent">
android:layout_gravity="center"
android:background="@drawable/ic_message_out_background"
android:clipChildren="true"
android:clipToPadding="true"
android:orientation="vertical">
<com.meloda.fast.widget.BoundedLinearLayout
android:id="@+id/bubble"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/ic_message_out_background"
android:orientation="vertical"
android:padding="15dp">
android:layout_height="wrap_content">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
android:padding="15dp"
android:textColor="@color/n1_900"
tools:text="This is test" />
@@ -59,30 +58,21 @@
android:id="@+id/attachmentSpacer"
android:layout_width="wrap_content"
android:layout_height="5dp"
android:layout_below="@+id/text"
android:visibility="gone" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/attachmentContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/attachmentSpacer"
android:orientation="vertical"
android:visibility="gone" />
</com.meloda.fast.widget.BoundedLinearLayout>
</FrameLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginEnd="12dp"
android:textColor="?textColorSecondaryVariant"
android:visibility="gone"
tools:layout_height="18dp"
tools:text="12:00"
tools:visibility="visible" />
android:visibility="gone"
app:layout_anchor="@+id/text"
app:layout_anchorGravity="bottom" />
</RelativeLayout>
</com.meloda.fast.widget.BoundedLinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</layout>
app/src/main/res/values/strings.xml
+8
View File
@@ -109,4 +109,12 @@
<string name="post_type_user">User post</string>
<string name="post_type_unknown">Post</string>
<string name="message_attachments_story">Story</string>
<string name="log_out">Log out</string>
<string name="confirm">Confirmation</string>
<string name="log_out_confirm">Are you really want to log out?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="message_context_action_reply">Reply</string>
<string name="message_context_action_mark_as_important">Mark as important</string>
<string name="message_context_action_unmark_as_important">Unmark as important</string>
</resources>