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/drawable-v21/ic_fast_lightning.xml
+23 -23
View File
@@ -8,117 +8,117 @@
<path
android:name="path_2"
android:pathData="M 9.772 120.235 L 66.463 47.228 L 35.78 47.228 L 9.772 120.235 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"
android:fillType="evenOdd"/>
<path
android:name="path_3"
android:pathData="M 17.524 43.689 L 16.824 44.603 L 31.704 59.483 L 32.123 58.283 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_4"
android:pathData="M 15.12 46.809 L 14.42 47.723 L 30.269 63.571 L 30.688 62.371 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_5"
android:pathData="M 19.928 40.568 L 19.228 41.482 L 33.144 55.395 L 33.563 54.195 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_6"
android:pathData="M 22.332 37.448 L 21.632 38.358 L 34.581 51.307 L 35 50.107 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_7"
android:pathData="M 12.716 49.929 L 12.016 50.843 L 28.831 67.659 L 29.25 66.459 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_8"
android:pathData="M 3.105 62.413 L 2.405 63.327 L 6.877 67.799 L 8.494 67.799 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_9"
android:pathData="M 0.7 65.533 L 0 66.447 L 1.356 67.799 L 2.971 67.799 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_10"
android:pathData="M 5.509 59.293 L 4.809 60.203 L 12.402 67.803 L 14.021 67.803 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_11"
android:pathData="M 7.913 56.173 L 7.213 57.083 L 17.929 67.799 L 19.548 67.799 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_12"
android:pathData="M 10.317 53.049 L 9.617 53.963 L 23.448 67.799 L 25.063 67.799 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_13"
android:pathData="M 24.732 34.328 L 24.032 35.238 L 36.012 47.218 L 36.431 46.018 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_14"
android:pathData="M 46.359 6.24 L 45.659 7.154 L 48.939 10.434 L 49.362 9.234 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_15"
android:pathData="M 43.959 9.36 L 43.259 10.274 L 47.507 14.522 L 47.93 13.322 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_16"
android:pathData="M 48.763 3.12 L 48.063 4.034 L 50.375 6.346 L 50.798 5.154 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_17"
android:pathData="M 41.555 12.484 L 40.855 13.394 L 46.07 18.609 L 46.493 17.409 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_18"
android:pathData="M 51.167 0 L 50.467 0.914 L 51.812 2.259 L 52.235 1.067 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_19"
android:pathData="M 39.151 15.604 L 38.451 16.514 L 44.63 22.697 L 45.049 21.497 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_20"
android:pathData="M 31.939 24.964 L 31.239 25.878 L 40.321 34.96 L 40.74 33.76 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_21"
android:pathData="M 27.136 31.208 L 26.436 32.118 L 37.445 43.132 L 37.864 41.932 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_22"
android:pathData="M 29.54 28.084 L 28.84 28.998 L 38.89 39.048 L 39.309 37.848 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_23"
android:pathData="M 36.747 18.724 L 36.047 19.638 L 43.194 26.785 L 43.613 25.585 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
<path
android:name="path_24"
android:pathData="M 34.348 21.844 L 33.648 22.758 L 41.762 30.872 L 42.181 29.672 Z"
android:fillColor="#4284f4"
android:fillColor="#ffffff"
android:strokeWidth="1"/>
</vector>
app/src/main/res/drawable-v21/ic_online_mobile.xml
+1
View File
@@ -3,6 +3,7 @@
android:height="15.921dp"
android:viewportWidth="11.586"
android:viewportHeight="15.921">
<path
android:fillColor="#fff"
android:pathData="M2,3h7v10h-7z" />
app/src/main/res/drawable-v21/ic_search.xml
+8 -4
View File
@@ -1,5 +1,9 @@
<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="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
</vector>
app/src/main/res/drawable/chat_panel_background.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<stroke
android:width="1dp"
android:color="@color/divider" />
android:color="?dividerHorizontal" />
<size
android:width="200dp"
app/src/main/res/drawable/ic_login_edittext_background.xml → app/src/main/res/drawable/edittext_filled_background.xml
+1 -1
View File
@@ -3,6 +3,6 @@
android:shape="rectangle">
<corners android:radius="3dp" />
<solid android:color="@color/login_edittext_background" />
<solid android:color="?editTextFilledBackgroundColor" />
</shape>
app/src/main/res/drawable/ic_logo_fast_border.xml
+1 -1
View File
@@ -4,6 +4,6 @@
<stroke
android:width="1dp"
android:color="@color/fast_logo_border_color" />
android:color="?dividerHorizontal" />
</shape>
app/src/main/res/drawable-v21/ic_online_pc.xml → app/src/main/res/drawable/ic_online_pc.xml
-1
View File
@@ -10,7 +10,6 @@
<stroke
android:width="2dp"
android:color="?android:windowBackground" />
</shape>
</item>
</layer-list>
app/src/main/res/drawable/item_divider.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="rectangle">
<size
android:width="1dp"
android:height="1dp" />
<solid android:color="@color/accent" />
</shape>
app/src/main/res/drawable/navigation_view_items_colors.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/accent" android:state_checked="true" />
<item android:color="@color/text_secondary_60_alpha" />
<item android:color="?colorAccent" android:state_checked="true" />
<item android:color="?textColorSecondary" />
</selector>
app/src/main/res/drawable/toolbar_background.xml
+2 -2
View File
@@ -4,9 +4,9 @@
<corners android:radius="8dp" />
<solid android:color="@android:color/white" />
<solid android:color="?colorPrimary" />
<stroke
android:width="1dp"
android:color="@color/divider" />
android:color="?dividerHorizontal" />
</shape>
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>
app/src/main/res/values-night/colors.xml
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="primary">#000000</color>
<color name="primaryDark">#000000</color>
<color name="accent">#63ACFF</color>
<color name="navigationBar">#000000</color>
<color name="background">#000000</color>
<color name="divider">#292929</color>
</resources>
app/src/main/res/values-night/styles.xml
-4
View File
@@ -1,4 +0,0 @@
<resources>
</resources>
app/src/main/res/values-night/themes.xml
+27 -14
View File
@@ -2,40 +2,53 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppTheme" parent="Theme.MaterialComponents.NoActionBar.Bridge">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorPrimary">@color/dark_primary</item>
<item name="colorPrimaryDark">@color/dark_primaryDark</item>
<item name="colorAccent">@color/dark_accent</item>
<item name="toolbarStyle">@style/AppTheme.Toolbar</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="dialogCornerRadius">12dp</item>
<item name="android:windowBackground">@color/background</item>
<item name="android:windowBackground">@color/dark_background</item>
<item name="itemTitleColor">@android:color/white</item>
<item name="dividerHorizontal">@color/dark_divider</item>
<item name="textColorSecondary">@color/dark_textSecondary</item>
<item name="editTextFilledBackgroundColor">@color/dark_edittext_filled_background</item>
<item name="messageInTextColor">@color/dark_message_in</item>
<item name="messageOutTextColor">@color/dark_message_out</item>
<item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/divider</item>
<item name="android:navigationBarColor" tools:targetApi="M">@color/navigationBar</item>
<item name="android:navigationBarColor" tools:targetApi="M">@color/dark_navigationBar</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@android:color/transparent</item>
</style>
<style name="AppTheme.Start" parent="Theme.MaterialComponents.NoActionBar.Bridge">
<item name="android:windowBackground">@color/accent</item>
<item name="colorPrimaryDark">@color/accent</item>
<item name="colorAccent">@color/accent</item>
<item name="android:navigationBarColor">@color/accent</item>
<item name="android:windowBackground">@color/dark_accent</item>
<item name="colorPrimaryDark">@color/dark_accent</item>
<item name="colorAccent">@color/dark_accent</item>
<item name="android:navigationBarColor">@color/dark_accent</item>
<item name="dialogCornerRadius">12dp</item>
<item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</item>
</style>
<style name="AppTheme.Update" parent="Theme.MaterialComponents.NoActionBar.Bridge">
<item name="colorPrimaryDark">@android:color/white</item>
<item name="colorAccent">@color/accent</item>
<item name="colorAccent">@color/dark_accent</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.BottomSheetDialog">
<item name="colorAccent">@color/accent</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item>
<item name="colorAccent">@color/dark_accent</item>
<item name="colorPrimary">@color/dark_primary</item>
<item name="colorPrimaryDark">@color/dark_primaryDark</item>
</style>
<style name="AppTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar.PrimarySurface">
<item name="titleTextAppearance">@style/Toolbar.Title</item>
<item name="android:textSize">24sp</item>
<item name="android:elevation">3dp</item>
<item name="titleTextColor">?colorAccent</item>
<item name="android:background">?colorPrimary</item>
</style>
</resources>
app/src/main/res/values/attrs.xml
+10
View File
@@ -3,6 +3,16 @@
<attr name="itemTitleColor" format="color" />
<attr name="textColorSecondary" format="color" />
<attr name="editTextFilledBackgroundColor" format="color" />
<attr name="fullScreenDialogTheme" format="reference" />
<attr name="messageInTextColor" format="color" />
<attr name="messageOutTextColor" format="color" />
<attr name="onlineMobileDrawable" format="reference" />
<declare-styleable name="CircleImageView">
<attr name="radius" format="integer" />
</declare-styleable>
app/src/main/res/values/colors.xml
+28 -4
View File
@@ -3,12 +3,13 @@
<color name="primary">#ffffff</color>
<color name="primaryDark">#ffffff</color>
<color name="accent">#4284F4</color>
<color name="navigationBar">#E4E4E4</color>
<color name="navigationBar">#ffffff</color>
<color name="background">#ffffff</color>
<color name="color_control_normal">@color/accent</color>
<color name="divider">#E0E0E0</color>
<color name="textSecondary">#99000000</color>
<color name="divider">#e6e6e6</color>
<color name="text_secondary_100_alpha">#ff000000</color>
<color name="text_secondary_87_alpha">#DE000000</color>
@@ -23,6 +24,29 @@
<color name="fast_logo_border_color">#F5F5F5</color>
<color name="login_secondary_color">#5c5c5c</color>
<color name="login_edittext_background">#e8e8e8</color>
<color name="edittext_filled_background">#e8e8e8</color>
<color name="login_button_text_color">#ffffff</color>
<color name="conversationTitle">@color/accent</color>
<color name="message_in">#ffffff</color>
<color name="message_out">#000000</color>
<!-- Dark Theme Colors -->
<color name="dark_primary">#000000</color>
<color name="dark_primaryDark">#000000</color>
<color name="dark_accent">#63ACFF</color>
<color name="dark_navigationBar">#000000</color>
<color name="dark_background">#000000</color>
<color name="dark_divider">#292929</color>
<color name="dark_textSecondary">#99FFFFFF</color>
<color name="dark_edittext_filled_background">#272727</color>
<color name="dark_message_in">#000000</color>
<color name="dark_message_out">#ffffff</color>
</resources>
app/src/main/res/values/themes.xml
+25 -19
View File
@@ -11,14 +11,19 @@
<item name="dialogCornerRadius">12dp</item>
<item name="android:windowBackground">@color/background</item>
<item name="itemTitleColor">@color/accent</item>
<item name="dividerHorizontal">@color/divider</item>
<item name="textColorSecondary">@color/textSecondary</item>
<item name="editTextFilledBackgroundColor">@color/edittext_filled_background</item>
<item name="messageInTextColor">@color/message_in</item>
<item name="messageOutTextColor">@color/message_out</item>
<item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/divider</item>
<item name="android:navigationBarColor">@color/navigationBar</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@android:color/transparent</item>
</style>
<style name="AppTheme.Start" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
@@ -46,11 +51,12 @@
<item name="titleTextAppearance">@style/Toolbar.Title</item>
<item name="android:textSize">24sp</item>
<item name="android:elevation">3dp</item>
<item name="titleTextColor">?colorAccent</item>
<item name="android:background">?colorPrimary</item>
</style>
<style name="Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<style name="Toolbar.Title" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textSize">24sp</item>
<item name="android:fontFamily">@font/tt_commons_medium</item>
</style>
@@ -70,38 +76,38 @@
<style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert" />
<style name="AppTheme.FullScreenDialog" parent="Theme.MaterialComponents.Light.Dialog.Bridge">
<item name="colorPrimaryDark">@color/primaryDark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorPrimary">@color/primaryDark</item>
<item name="colorPrimary">?colorPrimary</item>
<item name="colorPrimaryDark">?colorPrimaryDark</item>
<item name="colorAccent">?colorAccent</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@android:color/white</item>
<item name="actionMenuTextColor">@color/accent</item>
<item name="android:windowBackground">?android:windowBackground</item>
<item name="actionMenuTextColor">?colorAccent</item>
<item name="android:navigationBarColor" tools:targetApi="o_mr1">@color/primaryDark</item>
<item name="android:navigationBarColor" tools:targetApi="o_mr1">?colorPrimaryDark</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/divider</item>
<item name="colorControlNormal">@color/color_control_normal</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@android:color/transparent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="toolbarStyle">@style/AppTheme.Toolbar</item>
</style>
<style name="AppTheme.Login.EditText" parent="">
<item name="android:background">@drawable/ic_login_edittext_background</item>
<item name="android:layout_height">52dp</item>
<item name="android:background">@drawable/edittext_filled_background</item>
<item name="android:paddingStart">16dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:layout_marginEnd">16dp</item>
<item name="android:textSize">12sp</item>
<item name="android:textColor">@color/login_secondary_color</item>
<item name="android:textColorHint">@color/login_secondary_color</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColorHint">?textColorSecondary</item>
<item name="fontFamily">@font/google_sans_regular</item>
<item name="android:singleLine">true</item>
<item name="android:maxLines">1</item>
</style>
<style name="AppTheme.Login.EditText.Icon" parent="">
<item name="tint">#757575</item>
<item name="tint">?textColorSecondary</item>
<item name="android:layout_marginStart">8dp</item>
<item name="android:layout_marginEnd">12dp</item>
</style>