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

Theme switching

Browse Source
This commit is contained in:
Danil Nikolaev
2021-02-21 00:31:02 +03:00
parent 06aa41cab1
commit 35c45fd34f
34 changed files with 447 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable-v21/ic_arrow_back.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="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
<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="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
</vector>
app/src/main/res/drawable-v21/ic_online_mobile.xml
+2 -2
View File
@@ -5,14 +5,14 @@
android:viewportHeight="15.921">
<path
android:fillColor="#fff"
android:fillColor="?android:windowBackground"
android:pathData="M2,3h7v10h-7z" />
<path
android:fillColor="?colorAccent"
android:pathData="M8.5026,14.9214L3.0838,14.9214C1.9348,14.9214 1,13.9866 1,12.8376L1,3.0838C1,1.9348 1.9348,1 3.0838,1L8.5036,1.0054C9.6516,1.0054 10.5863,1.9378 10.5863,3.0838L10.5863,12.8376C10.5863,13.9866 9.6516,14.9214 8.5026,14.9214ZM4.0838,10.7539L7.5026,10.7539L7.5026,5.1675L4.0838,5.1675L4.0838,10.7539Z"
android:strokeColor="#00000000" />
<path
android:fillColor="#fff"
android:fillColor="?android:windowBackground"
android:pathData="M3.0838,2C2.4877,2 2,2.4877 2,3.0838L2,12.8376C2,13.4337 2.4877,13.9214 3.0838,13.9214L8.5026,13.9214C9.0986,13.9214 9.5863,13.4337 9.5863,12.8376L9.5863,3.0838C9.5863,2.4877 9.0986,2.0054 8.5026,2.0054L3.0838,2M8.5026,11.7539L3.0838,11.7539L3.0838,4.1675L8.5026,4.1675L8.5026,11.7539M3.0838,0L3.0848,0L3.0858,0L8.5046,0.0054C10.203,0.0054 11.5863,1.3864 11.5863,3.0838L11.5863,12.8376C11.5863,14.538 10.203,15.9214 8.5026,15.9214L3.0838,15.9214C1.3834,15.9214 -0,14.538 -0,12.8376L-0,3.0838C-0,1.3834 1.3834,0 3.0838,0ZM6.5026,6.1675L5.0838,6.1675L5.0838,9.7539L6.5026,9.7539L6.5026,6.1675Z"
android:strokeColor="#00000000" />
</vector>
app/src/main/res/drawable-v21/ic_online_mobile_dark.xml
+18
View File
@@ -0,0 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="11.586dp"
android:height="15.921dp"
android:viewportWidth="11.586"
android:viewportHeight="15.921">
<path
android:fillColor="?android:windowBackground"
android:pathData="M2,3h7v10h-7z" />
<path
android:fillColor="?colorAccent"
android:pathData="M8.5026,14.9214L3.0838,14.9214C1.9348,14.9214 1,13.9866 1,12.8376L1,3.0838C1,1.9348 1.9348,1 3.0838,1L8.5036,1.0054C9.6516,1.0054 10.5863,1.9378 10.5863,3.0838L10.5863,12.8376C10.5863,13.9866 9.6516,14.9214 8.5026,14.9214ZM4.0838,10.7539L7.5026,10.7539L7.5026,5.1675L4.0838,5.1675L4.0838,10.7539Z"
android:strokeColor="#00000000" />
<path
android:fillColor="#fff"
android:pathData="M3.0838,2C2.4877,2 2,2.4877 2,3.0838L2,12.8376C2,13.4337 2.4877,13.9214 3.0838,13.9214L8.5026,13.9214C9.0986,13.9214 9.5863,13.4337 9.5863,12.8376L9.5863,3.0838C9.5863,2.4877 9.0986,2.0054 8.5026,2.0054L3.0838,2M8.5026,11.7539L3.0838,11.7539L3.0838,4.1675L8.5026,4.1675L8.5026,11.7539M3.0838,0L3.0848,0L3.0858,0L8.5046,0.0054C10.203,0.0054 11.5863,1.3864 11.5863,3.0838L11.5863,12.8376C11.5863,14.538 10.203,15.9214 8.5026,15.9214L3.0838,15.9214C1.3834,15.9214 -0,14.538 -0,12.8376L-0,3.0838C-0,1.3834 1.3834,0 3.0838,0ZM6.5026,6.1675L5.0838,6.1675L5.0838,9.7539L6.5026,9.7539L6.5026,6.1675Z"
android:strokeColor="#00000000" />
</vector>
app/src/main/res/layout/activity_main.xml
+1 -9
View File
@@ -15,21 +15,13 @@
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="0dp"
app:elevation="0.5dp"
app:itemIconTint="@drawable/navigation_view_items_colors"
app:itemTextColor="@drawable/navigation_view_items_colors"
app:labelVisibilityMode="unlabeled"
app/src/main/res/layout/fragment_login.xml
+1
View File
@@ -72,6 +72,7 @@
style="@style/AppTheme.Login.EditText"
android:layout_width="match_parent"
android:hint="@string/email_login_hint"
android:imeOptions="actionGo"
android:inputType="textEmailAddress" />
</LinearLayout>
app/src/main/res/layout/item_conversation.xml
+4 -3
View File
@@ -73,9 +73,10 @@
<TextView
android:id="@+id/conversationTitle"
android:layout_width="wrap_content"
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="?itemTitleColor"
@@ -107,10 +108,10 @@
<TextView
android:id="@+id/conversationText"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginEnd="12dp"
android:baselineAligned="false"
android:gravity="center_vertical"
android:singleLine="true"
app/src/main/res/layout/toolbar.xml
-1
View File
@@ -31,7 +31,6 @@
android:clickable="false"
android:focusable="false"
android:tint="?android:textColorPrimary"
android:tintMode="multiply"
tools:src="@drawable/ic_search" />
</LinearLayout>
app/src/main/res/values-night/themes.xml
+29 -20
View File
@@ -22,6 +22,35 @@
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@android:color/transparent</item>
</style>
<style name="AppTheme.FullScreenDialog" parent="Theme.MaterialComponents.Dialog.Bridge">
<item name="colorPrimary">@color/dark_primary</item>
<item name="colorPrimaryDark">@color/dark_primaryDark</item>
<item name="colorAccent">@color/dark_accent</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@color/dark_background</item>
<item name="actionMenuTextColor">?colorAccent</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">
@android:color/transparent
</item>
<item name="colorControlNormal">?colorAccent</item>
</style>
<style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.BottomSheetDialog">
<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.Update" parent="Theme.MaterialComponents.NoActionBar.Bridge">
<item name="colorPrimaryDark">@android:color/white</item>
<item name="colorAccent">@color/dark_accent</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="AppTheme.Start" parent="Theme.MaterialComponents.NoActionBar.Bridge">
<item name="android:windowBackground">@color/dark_accent</item>
<item name="colorPrimaryDark">@color/dark_accent</item>
@@ -31,24 +60,4 @@
<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/dark_accent</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.BottomSheetDialog">
<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/arrays.xml
+3 -3
View File
@@ -35,8 +35,8 @@
<string-array name="theme_values">
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
</resources>
app/src/main/res/values/styles.xml
+14
View File
@@ -0,0 +1,14 @@
<?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>
<item name="android:activityCloseEnterAnimation">@anim/activity_close_enter</item>
<item name="android:activityCloseExitAnimation">@anim/activity_close_exit</item>
</style>
<style name="AppTheme.Slide">
<item name="android:windowEnterAnimation">@anim/slide_up</item>
<item name="android:windowExitAnimation">@anim/slide_down</item>
</style>
</resources>
app/src/main/res/values/themes.xml
+42 -52
View File
@@ -22,36 +22,16 @@
<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>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">
@android:color/transparent
</item>
</style>
<style name="AppTheme.Start" parent="Theme.MaterialComponents.Light.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="dialogCornerRadius">12dp</item>
<item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</item>
</style>
<style name="AppTheme.Update" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
<item name="colorPrimaryDark">@android:color/white</item>
<item name="colorAccent">@color/accent</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
<item name="colorAccent">@color/accent</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/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>
@@ -61,37 +41,8 @@
<item name="android:fontFamily">@font/tt_commons_medium</item>
</style>
<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>
<item name="android:activityCloseEnterAnimation">@anim/activity_close_enter</item>
<item name="android:activityCloseExitAnimation">@anim/activity_close_exit</item>
</style>
<style name="AppTheme.Slide">
<item name="android:windowEnterAnimation">@anim/slide_up</item>
<item name="android:windowExitAnimation">@anim/slide_down</item>
</style>
<style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert" />
<style name="AppTheme.FullScreenDialog" parent="Theme.MaterialComponents.Light.Dialog.Bridge">
<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:windowBackground</item>
<item name="actionMenuTextColor">?colorAccent</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">@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:layout_height">52dp</item>
<item name="android:background">@drawable/edittext_filled_background</item>
@@ -106,10 +57,49 @@
<item name="android:maxLines">1</item>
</style>
<style name="AppTheme.FullScreenDialog" parent="Theme.MaterialComponents.Light.Dialog.Bridge">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item>
<item name="colorAccent">@color/accent</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@color/background</item>
<item name="actionMenuTextColor">?colorAccent</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">
@android:color/transparent
</item>
<item name="colorControlNormal">?colorAccent</item>
</style>
<style name="AppTheme.Login.EditText.Icon" parent="">
<item name="tint">?textColorSecondary</item>
<item name="android:layout_marginStart">8dp</item>
<item name="android:layout_marginEnd">12dp</item>
</style>
<style name="AppTheme.Update" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
<item name="colorPrimaryDark">@android:color/white</item>
<item name="colorAccent">@color/accent</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
<item name="colorAccent">@color/accent</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item>
</style>
<style name="AppTheme.Start" parent="Theme.MaterialComponents.Light.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="dialogCornerRadius">12dp</item>
<item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</item>
</style>
</resources>