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

Dark theme

Browse Source
This commit is contained in:
Danil Nikolaev
2021-02-20 23:21:25 +03:00
parent 88dddcb133
commit 06aa41cab1
179 changed files with 1011 additions and 1133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_main.xml
+9 -2
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.drawerlayout.widget.DrawerLayout 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/drawerLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -16,13 +15,21 @@
android:layout_height="match_parent"
android:layout_marginBottom="48dp" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_gravity="bottom"
android:layout_marginBottom="48dp"
android:alpha="0.6"
android:background="?dividerHorizontal" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomBar"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="bottom"
app:backgroundTint="?colorPrimary"
app:elevation="8dp"
app:elevation="0dp"
app:itemIconTint="@drawable/navigation_view_items_colors"
app:itemTextColor="@drawable/navigation_view_items_colors"
app:labelVisibilityMode="unlabeled"
app/src/main/res/layout/activity_main_drawer_header.xml
+1 -1
View File
@@ -4,7 +4,7 @@
android:id="@+id/headerRoot"
android:layout_height="80dp">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/headerAvatar"
android:layout_width="44dp"
android:layout_height="44dp"
app/src/main/res/layout/activity_messages.xml
+2 -2
View File
@@ -19,7 +19,7 @@
app:contentInsetStart="0dp"
app:contentInsetStartWithNavigation="0dp">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/chatAvatar"
android:layout_width="45dp"
android:layout_height="45dp"
@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:textAppearanceSmall"
android:textColor="?android:textColorSecondary"
android:textColor="?textColorSecondary"
tools:text="Offline"
tools:visibility="visible" />
app/src/main/res/layout/activity_start.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="64dp">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_gravity="center"
app/src/main/res/layout/fragment_login.xml
+8 -9
View File
@@ -11,10 +11,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:minWidth="340dp"
android:minWidth="380dp"
app:cardCornerRadius="9dp"
app:cardElevation="0dp"
app:strokeColor="@color/fast_logo_border_color"
app:strokeColor="?dividerHorizontal"
app:strokeWidth="2dp">
<LinearLayout
@@ -33,12 +33,12 @@
android:fontFamily="@font/google_sans_regular"
android:text="@string/fast_messenger"
android:textColor="@color/login_secondary_color"
android:textSize="21sp" />
android:textSize="26sp" />
<FrameLayout
android:id="@+id/loginLogoContainer"
android:layout_width="166dp"
android:layout_height="166dp"
android:layout_width="176dp"
android:layout_height="176dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp"
android:background="@drawable/ic_logo_fast_border">
@@ -48,7 +48,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_fast_lightning" />
android:src="@drawable/ic_fast_lightning"
app:tint="?colorAccent" />
</FrameLayout>
@@ -70,7 +71,6 @@
android:id="@+id/loginEmailEditText"
style="@style/AppTheme.Login.EditText"
android:layout_width="match_parent"
android:layout_height="46dp"
android:hint="@string/email_login_hint"
android:inputType="textEmailAddress" />
@@ -94,7 +94,6 @@
android:id="@+id/loginPasswordEditText"
style="@style/AppTheme.Login.EditText"
android:layout_width="match_parent"
android:layout_height="46dp"
android:hint="@string/password_login_hint"
android:inputType="textPassword" />
@@ -104,7 +103,7 @@
android:id="@+id/loginAuthorize"
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:layout_width="wrap_content"
android:layout_height="52dp"
android:layout_height="60dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp"
android:fontFamily="@font/google_sans_regular"
app/src/main/res/layout/item_conversation.xml
+57 -49
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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/conversationRoot"
@@ -8,10 +8,8 @@
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:visibility="invisible"
tools:visibility="visible">
android:paddingTop="2dp"
android:paddingBottom="2dp">
<LinearLayout
android:id="@+id/conversationContainer"
@@ -30,11 +28,12 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/conversationAvatar"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="bottom|end"
app:fadeDuration="150"
app:roundAsCircle="true"
tools:actualImageResource="@color/accent"
tools:src="?colorAccent" />
<androidx.appcompat.widget.AppCompatImageView
@@ -42,7 +41,6 @@
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="bottom|end"
android:layout_margin="3dp"
tools:src="@drawable/ic_online_pc" />
</FrameLayout>
@@ -69,19 +67,20 @@
android:layout_marginStart="4dp"
android:paddingStart="2dp"
android:paddingEnd="0dp"
android:tint="?itemTitleColor"
android:tint="@color/conversationTitle"
android:visibility="gone"
tools:src="@drawable/ic_dialog_type_conversation" />
<TextView
android:id="@+id/conversationTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/tt_commons_medium"
android:singleLine="true"
android:textColor="?itemTitleColor"
android:textSize="20sp"
tools:text="Unidevs" />
tools:text="Title" />
</LinearLayout>
@@ -96,12 +95,13 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/conversationUserAvatar"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_gravity="top"
android:layout_marginEnd="4dp"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
app:fadeDuration="150"
app:roundAsCircle="true"
tools:actualImageResource="@color/accent"
tools:src="?colorAccent"
tools:visibility="visible" />
@@ -109,62 +109,70 @@
android:id="@+id/conversationText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:baselineAligned="false"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="?android:textColorPrimary"
android:textSize="14sp"
tools:text="Message" />
</LinearLayout>
</LinearLayout>
<LinearLayout
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="50dp"
android:orientation="vertical"
android:paddingStart="6dp"
android:paddingEnd="6dp">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/conversationOut"
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" />
<TextView
android:id="@+id/conversationCounter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_conversations_counter_background"
android:backgroundTint="?colorAccent"
android:backgroundTintMode="multiply"
android:gravity="center"
android:minWidth="25dp"
android:minHeight="20dp"
android:padding="4dp"
android:textColor="?android:textColorPrimaryInverse"
android:textSize="12sp"
tools:text="12"
tools:visibility="visible" />
<TextView
android:id="@+id/conversationDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center"
android:maxLines="1"
android:minWidth="30dp"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:text="сейчас" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/conversationDate"
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/conversationCounter"
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:gravity="center"
android:minWidth="25dp"
android:fontFamily="@font/google_sans_medium"
android:minHeight="20dp"
android:padding="6dp"
android:textColor="?android:textColorPrimaryInverse"
android:textSize="12sp"
tools:text="12"
tools:visibility="visible" />
</FrameLayout>
app/src/main/res/layout/item_conversation_light.xml
+2 -2
View File
@@ -6,7 +6,7 @@
android:background="?selectableItemBackground"
android:padding="12dp">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/conversationAvatar"
android:layout_width="56dp"
android:layout_height="56dp"
@@ -60,7 +60,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="12dp">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/conversationOut"
android:layout_width="10dp"
android:layout_height="10dp"
app/src/main/res/layout/item_message.xml
+4 -4
View File
@@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/messageAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
@@ -24,7 +24,7 @@
android:layout_marginBottom="8dp"
tools:src="?colorAccent" />
<ru.melod1n.project.vkm.widget.BoundedLinearLayout
<com.meloda.fast.widget.BoundedLinearLayout
android:id="@+id/messageBubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
android:orientation="vertical"
tools:background="@drawable/ic_message_bubble_out_simple">
<ru.melod1n.project.vkm.widget.WrapTextView
<com.meloda.fast.widget.WrapTextView
android:id="@+id/messageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -54,7 +54,7 @@
tools:text="Some text"
tools:textColor="?android:textColorPrimary" />
</ru.melod1n.project.vkm.widget.BoundedLinearLayout>
</com.meloda.fast.widget.BoundedLinearLayout>
</LinearLayout>
app/src/main/res/layout/item_message_attachment_in.xml
+4 -4
View File
@@ -8,7 +8,7 @@
android:gravity="start"
android:orientation="horizontal">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/messageAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
@@ -17,7 +17,7 @@
android:layout_marginBottom="8dp"
tools:src="?colorAccent" />
<ru.melod1n.project.vkm.widget.BoundedLinearLayout
<com.meloda.fast.widget.BoundedLinearLayout
android:id="@+id/messageBubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
android:orientation="vertical"
tools:background="@drawable/ic_message_bubble_out_simple">
<ru.melod1n.project.vkm.widget.WrapTextView
<com.meloda.fast.widget.WrapTextView
android:id="@+id/messageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
tools:text="Some text"
tools:textColor="?android:textColorPrimary" />
</ru.melod1n.project.vkm.widget.BoundedLinearLayout>
</com.meloda.fast.widget.BoundedLinearLayout>
<LinearLayout
android:id="@+id/messageAttachments"
app/src/main/res/layout/item_message_attachment_out.xml
+4 -4
View File
@@ -8,7 +8,7 @@
android:gravity="end"
android:orientation="horizontal">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/messageAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
@@ -30,7 +30,7 @@
tools:text="10:15"
tools:visibility="visible" />
<ru.melod1n.project.vkm.widget.BoundedLinearLayout
<com.meloda.fast.widget.BoundedLinearLayout
android:id="@+id/messageBubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
android:orientation="vertical"
tools:background="@drawable/ic_message_bubble_out_simple">
<ru.melod1n.project.vkm.widget.WrapTextView
<com.meloda.fast.widget.WrapTextView
android:id="@+id/messageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
tools:text="Some text"
tools:textColor="?android:textColorPrimary" />
</ru.melod1n.project.vkm.widget.BoundedLinearLayout>
</com.meloda.fast.widget.BoundedLinearLayout>
<LinearLayout
android:id="@+id/messageAttachments"
app/src/main/res/layout/item_message_channel.xml
+2 -2
View File
@@ -7,7 +7,7 @@
android:gravity="start"
android:orientation="vertical">
<ru.melod1n.project.vkm.widget.BoundedLinearLayout
<com.meloda.fast.widget.BoundedLinearLayout
android:id="@+id/messageBubble"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -21,7 +21,7 @@
android:paddingTop="4dp"
android:paddingBottom="4dp">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/messageAvatar"
android:layout_width="35dp"
android:layout_height="35dp"
app/src/main/res/layout/item_message_normal_in.xml
+4 -4
View File
@@ -8,7 +8,7 @@
android:gravity="start"
android:orientation="horizontal">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/messageAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
@@ -17,7 +17,7 @@
android:layout_marginBottom="4dp"
tools:src="?colorAccent" />
<ru.melod1n.project.vkm.widget.BoundedLinearLayout
<com.meloda.fast.widget.BoundedLinearLayout
android:id="@+id/messageBubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
android:minHeight="40dp"
android:orientation="vertical">
<ru.melod1n.project.vkm.widget.WrapTextView
<com.meloda.fast.widget.WrapTextView
android:id="@+id/messageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
app:fixWrap="true"
tools:text="Some text " />
</ru.melod1n.project.vkm.widget.BoundedLinearLayout>
</com.meloda.fast.widget.BoundedLinearLayout>
<TextView
android:id="@+id/messageDate"
app/src/main/res/layout/item_message_normal_out.xml
+4 -4
View File
@@ -8,7 +8,7 @@
android:gravity="end"
android:orientation="horizontal">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/messageAvatar"
android:layout_width="40dp"
android:layout_height="40dp"
@@ -32,7 +32,7 @@
tools:text="10:15"
tools:visibility="visible" />
<ru.melod1n.project.vkm.widget.BoundedLinearLayout
<com.meloda.fast.widget.BoundedLinearLayout
android:id="@+id/messageBubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
android:minHeight="40dp"
android:orientation="vertical">
<ru.melod1n.project.vkm.widget.WrapTextView
<com.meloda.fast.widget.WrapTextView
android:id="@+id/messageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
app:fixWrap="true"
tools:text="Some text" />
</ru.melod1n.project.vkm.widget.BoundedLinearLayout>
</com.meloda.fast.widget.BoundedLinearLayout>
</LinearLayout>
app/src/main/res/layout/item_user.xml
+1 -1
View File
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_weight="0">
<ru.melod1n.project.vkm.widget.CircleImageView
<com.meloda.fast.widget.CircleImageView
android:id="@+id/userAvatar"
android:layout_width="50dp"
android:layout_height="50dp"
app/src/main/res/layout/toolbar.xml
+5 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ru.melod1n.project.vkm.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
<com.meloda.fast.widget.Toolbar 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/toolbar"
@@ -30,8 +30,9 @@
android:background="@android:color/transparent"
android:clickable="false"
android:focusable="false"
tools:src="@drawable/ic_search"
tools:tint="?android:textColorPrimary" />
android:tint="?android:textColorPrimary"
android:tintMode="multiply"
tools:src="@drawable/ic_search" />
</LinearLayout>
@@ -64,4 +65,4 @@
</RelativeLayout>
</ru.melod1n.project.vkm.widget.Toolbar>
</com.meloda.fast.widget.Toolbar>