melod1n/fast-messenger
3
2
Fork 1
Code Issues Actions Packages Projects 1 Releases Wiki Activity

lil update

Browse Source
This commit is contained in:
Danil Nikolaev
2021-08-04 23:01:22 +03:00
parent dabf2f86fd
commit c77ebae57a
33 changed files with 548 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable-v21/ic_security.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:pathData="M12,12H19C18.47,16.11 15.72,19.78 12,20.92V12H5V6.3L12,3.19M12,1L3,5V11C3,16.55 6.84,21.73 12,23C17.16,21.73 21,16.55 21,11V5L12,1Z" />
</vector>
app/src/main/res/layout/dialog_captcha.xml
+83
View File
@@ -0,0 +1,83 @@
<?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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/activity_horizontal_margin">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="50dp"
tools:src="@tools:sample/backgrounds/scenic" />
<LinearLayout
android:id="@+id/captchaContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/captchaImage"
style="@style/AppTheme.Login.EditText.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:src="@drawable/ic_security"
app:tint="?colorAccent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/captchaLayout"
style="@style/Widget.TextInputLayout.NoError.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/captchaInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/captcha_hint"
android:imeOptions="actionGo"
android:lines="1"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/cancel"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_weight="1"
android:text="@android:string/cancel"
app:elevation="0dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/ok"
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/ok"
app:elevation="0dp" />
</LinearLayout>
</LinearLayout>
</layout>
app/src/main/res/layout/fragment_conversations.xml
+28 -26
View File
@@ -1,45 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="conversations" />
<com.google.android.material.appbar.AppBarLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_conversation" />
</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="@android:color/transparent"
app:elevation="0dp">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|enterAlways">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
app:titleCentered="true" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/recycler_view" />
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"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone" />
android:visibility="gone"
tools:visibility="visible" />
<include
layout="@layout/no_items_view"
app/src/main/res/layout/fragment_login.xml
+6 -6
View File
@@ -73,7 +73,8 @@
android:id="@+id/loginLayout"
style="@style/Widget.TextInputLayout.NoError.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
app:boxStrokeErrorColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/loginInput"
@@ -81,12 +82,10 @@
android:layout_height="48dp"
android:hint="@string/login_hint"
android:imeOptions="actionGo"
android:inputType="textEmailAddress"
android:textCursorDrawable="@null" />
android:inputType="textEmailAddress" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
@@ -110,6 +109,7 @@
style="@style/Widget.TextInputLayout.NoError.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:boxStrokeErrorColor="@android:color/transparent"
app:passwordToggleEnabled="true"
app:passwordToggleTint="?colorAccent">
@@ -117,9 +117,9 @@
android:id="@+id/passwordInput"
android:layout_width="match_parent"
android:layout_height="48dp"
android:imeOptions="actionGo"
android:hint="@string/password_login_hint"
android:inputType="textPassword"
android:textCursorDrawable="@null" />
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
app/src/main/res/layout/item_conversation.xml
+16 -16
View File
@@ -2,7 +2,7 @@
<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"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
@@ -12,7 +12,7 @@
android:paddingBottom="2dp">
<LinearLayout
android:id="@+id/conversationContainer"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="6dp"
@@ -27,15 +27,15 @@
android:layout_weight="0">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/conversationAvatar"
android:id="@+id/peerAvatar"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="bottom|end"
tools:actualImageResource="@color/accent"
app:shapeAppearanceOverlay="@style/CircleImageView.56"
tools:src="?colorAccent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/conversationUserOnline"
android:id="@+id/peerOnline"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="bottom|end"
@@ -59,7 +59,7 @@
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/conversationType"
android:id="@+id/type"
android:layout_width="20dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
@@ -70,7 +70,7 @@
tools:src="@drawable/ic_dialog_type_conversation" />
<TextView
android:id="@+id/conversationTitle"
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -93,17 +93,17 @@
android:orientation="horizontal">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/conversationUserAvatar"
android:layout_width="20dp"
android:layout_height="20dp"
android:id="@+id/fromAvatar"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
tools:actualImageResource="@color/accent"
app:shapeAppearanceOverlay="@style/CircleImageView.24"
tools:src="?colorAccent"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/conversationTextAttachment"
android:id="@+id/textAttachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
@@ -114,7 +114,7 @@
tools:visibility="visible" />
<TextView
android:id="@+id/conversationText"
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
@@ -138,7 +138,7 @@
android:paddingEnd="6dp">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/conversationOut"
android:id="@+id/out"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_gravity="bottom"
@@ -151,7 +151,7 @@
</LinearLayout>
<TextView
android:id="@+id/conversationDate"
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|top"
@@ -164,7 +164,7 @@
tools:text="now" />
<TextView
android:id="@+id/conversationCounter"
android:id="@+id/counter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
app/src/main/res/values/colors.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="primary">#ffffff</color>
<color name="primary">@color/accent</color>
<color name="primaryDark">#ffffff</color>
<color name="accent">#4284F4</color>
<color name="navigationBar">#ffffff</color>
app/src/main/res/values/strings.xml
+3 -1
View File
@@ -150,9 +150,11 @@
<string name="password_login_hint">Password</string>
<string name="email_login_hint">E-mail or phone number</string>
<string name="log_in">Log in</string>
<string name="captcha_hint">Captcha</string>
<string name="captcha_hint">Captcha code</string>
<string name="input_captcha">Input code from picture</string>
<string name="login_hint">Login</string>
<string name="conversations">Conversations</string>
</resources>
app/src/main/res/values/styles.xml
+14
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme.ActivityAnimation" parent="@android:style/Animation.Activity">
<item name="android:activityOpenEnterAnimation">@anim/activity_open_enter</item>
<item name="android:activityOpenExitAnimation">@anim/activity_open_exit</item>
@@ -11,4 +12,17 @@
<item name="android:windowEnterAnimation">@anim/slide_up</item>
<item name="android:windowExitAnimation">@anim/slide_down</item>
</style>
<style name="CircleImageView">
<item name="cornerFamily">rounded</item>
</style>
<style name="CircleImageView.56">
<item name="cornerRadius">56dp</item>
</style>
<style name="CircleImageView.24">
<item name="cornerRadius">24dp</item>
</style>
</resources>
app/src/main/res/values/themes.xml
+6 -11
View File
@@ -27,6 +27,7 @@
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">
@android:color/transparent
</item>
</style>
<style name="AppTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar.PrimarySurface">
@@ -37,21 +38,15 @@
</style>
<style name="Toolbar.Title" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textSize">24sp</item>
<item name="android:fontFamily">@font/tt_commons_medium</item>
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/accent</item>
<item name="android:fontFamily">@font/google_sans_medium</item>
</style>
<style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert" />
<style name="AppTheme.Login.EditText" parent="">
<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">14sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColorHint">?textColorSecondary</item>
<style name="AppTheme.Login.EditText" parent="Widget.Design.TextInputEditText">
<item name="android:layout_height">48dp</item>
<item name="fontFamily">@font/google_sans_regular</item>
<item name="android:singleLine">true</item>
<item name="android:maxLines">1</item>