Move from java/ to kotlin/ directory
Android 12 dynamic color usage on login screen
This commit is contained in:
@@ -117,9 +117,10 @@
|
||||
android:id="@+id/passwordInput"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:imeOptions="actionGo"
|
||||
android:fontFamily="@font/roboto_regular"
|
||||
android:hint="@string/password_login_hint"
|
||||
android:inputType="textPassword" />
|
||||
android:imeOptions="actionGo"
|
||||
android:typeface="normal" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
@@ -137,15 +138,15 @@
|
||||
android:paddingStart="24dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:text="@string/log_in"
|
||||
android:textColor="?colorAccent"
|
||||
android:textColor="?colorActionContentPrimary"
|
||||
android:textSize="14sp"
|
||||
app:backgroundTint="?colorSurface"
|
||||
app:backgroundTint="?colorAction"
|
||||
app:cornerRadius="50dp"
|
||||
app:elevation="16dp"
|
||||
app:icon="@drawable/ic_arrow_end"
|
||||
app:iconGravity="end"
|
||||
app:iconTint="?colorAccent"
|
||||
app:rippleColor="?colorAccent" />
|
||||
app:iconTint="?colorActionContentPrimary"
|
||||
app:rippleColor="?colorActionRipple" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/friendsFragment"
|
||||
android:name="com.meloda.fast.fragment.friends.FriendsFragment"
|
||||
android:name="com.meloda.fast.screens.friends.FriendsFragment"
|
||||
android:label="FriendsFragment"
|
||||
tools:layout="@layout/fragment_friends" />
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/importantFragment"
|
||||
android:name="com.meloda.fast.fragment.important.ImportantFragment"
|
||||
android:name="com.meloda.fast.screens.important.ImportantFragment"
|
||||
android:label="ImportantFragment"
|
||||
tools:layout="@layout/fragment_important" />
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/loginFragment"
|
||||
android:name="com.meloda.fast.fragment.login.LoginFragment"
|
||||
android:name="com.meloda.fast.screens.login.LoginFragment"
|
||||
android:label="LoginFragment"
|
||||
tools:layout="@layout/fragment_login">
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/validationFragment"
|
||||
android:name="com.meloda.fast.fragment.login.ValidationFragment"
|
||||
android:name="com.meloda.fast.screens.login.ValidationFragment"
|
||||
android:label="ValidationFragment"
|
||||
tools:layout="@layout/fragment_validation">
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/mainFragment"
|
||||
android:name="com.meloda.fast.fragment.main.MainFragment"
|
||||
android:name="com.meloda.fast.screens.main.MainFragment"
|
||||
android:label="MainFragment"
|
||||
tools:layout="@layout/fragment_main">
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/loginFragment"
|
||||
android:name="com.meloda.fast.fragment.login.LoginFragment"
|
||||
android:name="com.meloda.fast.screens.login.LoginFragment"
|
||||
android:label="LoginFragment"
|
||||
tools:layout="@layout/fragment_login">
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/validationFragment"
|
||||
android:name="com.meloda.fast.fragment.login.ValidationFragment"
|
||||
android:name="com.meloda.fast.screens.login.ValidationFragment"
|
||||
android:label="ValidationFragment"
|
||||
tools:layout="@layout/fragment_validation">
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/conversationsFragment"
|
||||
android:name="com.meloda.fast.fragment.messages.ConversationsFragment"
|
||||
android:name="com.meloda.fast.screens.messages.ConversationsFragment"
|
||||
android:label="ConversationsFragment"
|
||||
tools:layout="@layout/fragment_conversations" />
|
||||
|
||||
|
||||
@@ -2,15 +2,21 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
|
||||
<item name="colorPrimary">@color/dark_primary</item>
|
||||
<item name="colorPrimaryDark">@color/dark_primaryDark</item>
|
||||
<item name="android:statusBarColor">@color/dark_statusBar</item>
|
||||
<item name="android:navigationBarColor">@color/dark_navigationBar</item>
|
||||
<item name="android:windowBackground">@color/dark_background</item>
|
||||
<item name="colorAccent">@color/dark_accent</item>
|
||||
<item name="colorAction">@color/dark_action</item>
|
||||
<item name="colorActionRipple">@color/dark_actionRipple</item>
|
||||
<item name="colorActionContentPrimary">@color/dark_actionContentPrimary</item>
|
||||
|
||||
|
||||
<item name="colorPrimary">@color/dark_primary</item>
|
||||
|
||||
<item name="toolbarStyle">@style/AppTheme.Toolbar</item>
|
||||
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
|
||||
<item name="dialogCornerRadius">12dp</item>
|
||||
<item name="android:windowBackground">@color/dark_background</item>
|
||||
<item name="itemTitleColor">?colorAccent</item>
|
||||
<item name="dividerHorizontal">@color/dark_divider</item>
|
||||
<item name="textColorSecondary">@color/dark_textSecondary</item>
|
||||
@@ -21,7 +27,6 @@
|
||||
|
||||
<item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</item>
|
||||
|
||||
<item name="android:navigationBarColor">@color/dark_navigationBar</item>
|
||||
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">
|
||||
@android:color/transparent
|
||||
</item>
|
||||
@@ -50,7 +55,6 @@
|
||||
|
||||
<style name="AppTheme.FullScreenDialog" parent="Theme.MaterialComponents.DayNight.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>
|
||||
@@ -68,7 +72,6 @@
|
||||
<style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
|
||||
<item name="colorAccent">@color/dark_accent</item>
|
||||
<item name="colorPrimary">@color/dark_primary</item>
|
||||
<item name="colorPrimaryDark">@color/dark_primaryDark</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
@@ -0,0 +1,60 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<color name="statusBar">@android:color/system_accent1_10</color>
|
||||
<color name="navigationBar">@android:color/system_accent1_10</color>
|
||||
<color name="background">@android:color/system_accent1_10</color>
|
||||
<color name="accent">@android:color/system_accent1_500</color>
|
||||
<color name="action">@android:color/system_accent3_500</color>
|
||||
<color name="actionRipple">@android:color/system_accent3_200</color>
|
||||
<color name="actionContentPrimary">@android:color/system_accent1_10</color>
|
||||
|
||||
|
||||
<color name="primary">@android:color/system_accent1_10</color>
|
||||
|
||||
<color name="divider">#E0E0E0</color>
|
||||
|
||||
<color name="textSecondary">#99000000</color>
|
||||
|
||||
<color name="text_secondary_100_alpha">#ff000000</color>
|
||||
<color name="text_secondary_87_alpha">#DE000000</color>
|
||||
<color name="text_secondary_60_alpha">#99000000</color>
|
||||
|
||||
<color name="text_secondary_light_100_alpha">#ffffff</color>
|
||||
<color name="text_secondary_light_87_alpha">#DEFFFFFF</color>
|
||||
<color name="text_secondary_light_60_alpha">#99FFFFFF</color>
|
||||
|
||||
<color name="text_secondary_60">#666666</color>
|
||||
|
||||
<color name="fast_logo_border_color">#F5F5F5</color>
|
||||
|
||||
<color name="login_secondary_color">#5c5c5c</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>
|
||||
|
||||
|
||||
<color name="dark_statusBar">@android:color/system_accent1_1000</color>
|
||||
<color name="dark_navigationBar">@android:color/system_accent1_1000</color>
|
||||
<color name="dark_background">@android:color/system_accent1_1000</color>
|
||||
<color name="dark_accent">@android:color/system_accent1_400</color>
|
||||
<color name="dark_action">@android:color/system_accent3_300</color>
|
||||
<color name="dark_actionRipple">@android:color/system_accent3_50</color>
|
||||
<color name="dark_actionContentPrimary">@android:color/system_accent3_1000</color>
|
||||
|
||||
<color name="dark_primary">@android:color/system_accent1_900</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>
|
||||
@@ -1,6 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<attr name="colorAction" format="color" />
|
||||
<attr name="colorActionRipple" format="color" />
|
||||
<attr name="colorActionContentPrimary" format="color" />
|
||||
|
||||
<attr name="itemTitleColor" format="color" />
|
||||
|
||||
<attr name="textColorSecondary" format="color" />
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="primary">@color/accent</color>
|
||||
<color name="primaryDark">#ffffff</color>
|
||||
<color name="accent">#4284F4</color>
|
||||
|
||||
<color name="statusBar">#ffffff</color>
|
||||
<color name="navigationBar">#ffffff</color>
|
||||
<color name="background">#ffffff</color>
|
||||
<color name="accent">#4284F4</color>
|
||||
<color name="action">#4E8CF6</color>
|
||||
<color name="actionRipple">#95BBFB</color>
|
||||
<color name="actionContentPrimary">#ffffff</color>
|
||||
|
||||
<color name="primary">@color/accent</color>
|
||||
|
||||
<color name="divider">#E0E0E0</color>
|
||||
|
||||
@@ -35,11 +40,15 @@
|
||||
|
||||
<!-- Dark Theme Colors -->
|
||||
|
||||
<color name="dark_primary">#000000</color>
|
||||
<color name="dark_primaryDark">#000000</color>
|
||||
<color name="dark_accent">#63ACFF</color>
|
||||
<color name="dark_statusBar">#000000</color>
|
||||
<color name="dark_navigationBar">#000000</color>
|
||||
<color name="dark_background">#000000</color>
|
||||
<color name="dark_accent">#63ACFF</color>
|
||||
<color name="dark_action">#56A5FF</color>
|
||||
<color name="dark_actionRipple">#2E90FF</color>
|
||||
<color name="dark_actionContentPrimary">#000000</color>
|
||||
|
||||
<color name="dark_primary">#000000</color>
|
||||
|
||||
<color name="dark_divider">#292929</color>
|
||||
|
||||
|
||||
@@ -2,16 +2,21 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
|
||||
<item name="colorPrimary">@color/primary</item>
|
||||
<item name="colorPrimaryDark">@color/primaryDark</item>
|
||||
<item name="android:statusBarColor">@color/statusBar</item>
|
||||
<item name="android:navigationBarColor">@color/navigationBar</item>
|
||||
<item name="android:windowBackground">@color/background</item>
|
||||
<item name="colorAccent">@color/accent</item>
|
||||
<item name="colorAction">@color/action</item>
|
||||
<item name="colorActionRipple">@color/actionRipple</item>
|
||||
<item name="colorActionContentPrimary">@color/actionContentPrimary</item>
|
||||
|
||||
<item name="colorPrimary">@color/primary</item>
|
||||
|
||||
<item name="toolbarStyle">@style/AppTheme.Toolbar</item>
|
||||
|
||||
<item name="android:windowLightStatusBar">true</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
|
||||
<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>
|
||||
@@ -22,7 +27,6 @@
|
||||
|
||||
<item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</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
|
||||
@@ -54,7 +58,6 @@
|
||||
|
||||
<style name="AppTheme.FullScreenDialog" parent="Theme.MaterialComponents.DayNight.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>
|
||||
@@ -79,7 +82,6 @@
|
||||
<style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
|
||||
<item name="colorAccent">@color/accent</item>
|
||||
<item name="colorPrimary">@color/primary</item>
|
||||
<item name="colorPrimaryDark">@color/primaryDark</item>
|
||||
<item name="android:windowLightStatusBar">true</item>
|
||||
</style>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user