owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New login screen

Browse Source
This commit is contained in:
Grishka
2022-12-04 01:34:03 +03:00
parent 4b16262a1a
commit 012cca550e
21 changed files with 1321 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mastodon/src/main/res/values/attrs.xml
View File

@@ -15,6 +15,28 @@
<attr name="colorSearchHint" format="color"/>
<attr name="colorTabInactive" format="color"/>
<attr name="colorAccentLightest" format="color"/>
<attr name="colorM3Primary" format="color"/>
<attr name="colorM3OnPrimary" format="color"/>
<attr name="colorM3PrimaryContainer" format="color"/>
<attr name="colorM3OnPrimaryContainer" format="color"/>
<attr name="colorM3Secondary" format="color"/>
<attr name="colorM3OnSecondary" format="color"/>
<attr name="colorM3SecondaryContainer" format="color"/>
<attr name="colorM3OnSecondaryContainer" format="color"/>
<attr name="colorM3Tertiary" format="color"/>
<attr name="colorM3OnTertiary" format="color"/>
<attr name="colorM3TertiaryContainer" format="color"/>
<attr name="colorM3OnTertiaryContainer" format="color"/>
<attr name="colorM3Background" format="color"/>
<attr name="colorM3OnBackground" format="color"/>
<attr name="colorM3Surface" format="color"/>
<attr name="colorM3OnSurface" format="color"/>
<attr name="colorM3SurfaceVariant" format="color"/>
<attr name="colorM3OnSurfaceVariant" format="color"/>
<attr name="colorM3Outline" format="color"/>
<attr name="colorM3DisabledBackground" format="color"/>
<attr name="colorM3PressedOverlay" format="color"/>
<attr name="primaryLargeButtonStyle" format="reference"/>
<attr name="secondaryLargeButtonStyle" format="reference"/>
@@ -22,4 +44,9 @@
<declare-styleable name="MaxWidthFrameLayout">
<attr name="android:maxWidth" format="dimension"/>
</declare-styleable>
<declare-styleable name="FloatingHintEditTextLayout">
<attr name="editTextOffsetY" format="dimension"/>
<attr name="android:labelTextSize" format="dimension"/>
</declare-styleable>
</resources>

45
mastodon/src/main/res/values/colors.xml
View File

@@ -96,4 +96,49 @@
<color name="shortcut_icon_background">@color/gray_100</color>
<color name="shortcut_icon_foreground">@color/primary_700</color>
<!-- M3 dynamic colors -->
<!-- light theme -->
<color name="m3_sys_light_primary">#6750A4</color>
<color name="m3_sys_light_on_primary">#FFFFFF</color>
<color name="m3_sys_light_primary_container">#EADDFF</color>
<color name="m3_sys_light_on_primary_container">#21005D</color>
<color name="m3_sys_light_secondary">#625B71</color>
<color name="m3_sys_light_on_secondary">#FFFFFF</color>
<color name="m3_sys_light_secondary_container">#E8DEF8</color>
<color name="m3_sys_light_on_secondary_container">#1D192B</color>
<color name="m3_sys_light_tertiary">#7D5260</color>
<color name="m3_sys_light_on_tertiary">#FFF</color>
<color name="m3_sys_light_tertiary_container">#FFD8E4</color>
<color name="m3_sys_light_on_tertiary_container">#31111D</color>
<color name="m3_sys_light_background">#FFFBFE</color>
<color name="m3_sys_light_on_background">#1C1B1F</color>
<color name="m3_sys_light_surface">#FFFBFE</color>
<color name="m3_sys_light_on_surface">#1C1B1F</color>
<color name="m3_sys_light_surface_variant">#E7E0EC</color>
<color name="m3_sys_light_on_surface_variant">#49454F</color>
<color name="m3_sys_light_outline">#79747E</color>
<!-- dark theme -->
<color name="m3_sys_dark_primary">#D0BCFF</color>
<color name="m3_sys_dark_on_primary">#381E72</color>
<color name="m3_sys_dark_primary_container">#4F378B</color>
<color name="m3_sys_dark_on_primary_container">#EADDFF</color>
<color name="m3_sys_dark_secondary">#CCC2DC</color>
<color name="m3_sys_dark_on_secondary">#332D41</color>
<color name="m3_sys_dark_secondary_container">#4A4458</color>
<color name="m3_sys_dark_on_secondary_container">#E8DEF8</color>
<color name="m3_sys_dark_tertiary">#EFB8C8</color>
<color name="m3_sys_dark_on_tertiary">#492532</color>
<color name="m3_sys_dark_tertiary_container">#633B48</color>
<color name="m3_sys_dark_on_tertiary_container">#FFD8E4</color>
<color name="m3_sys_dark_background">#1C1B1F</color>
<color name="m3_sys_dark_on_background">#E6E1E5</color>
<color name="m3_sys_dark_surface">#1C1B1F</color>
<color name="m3_sys_dark_on_surface">#E6E1E5</color>
<color name="m3_sys_dark_surface_variant">#49454F</color>
<color name="m3_sys_dark_on_surface_variant">#CAC4D0</color>
<color name="m3_sys_dark_outline">#938F99</color>
</resources>

7
mastodon/src/main/res/values/strings.xml
View File

@@ -5,9 +5,9 @@
<string name="get_started">Get started</string>
<string name="log_in">Log in</string>
<string name="next">Next</string>
<string name="loading_instance">Getting instance info…</string>
<string name="loading_instance">Retrieving server info…</string>
<string name="error">Error</string>
<string name="not_a_mastodon_instance">%s doesn\'t appear to be a Mastodon instance.</string>
<string name="not_a_mastodon_instance">%s doesn\'t appear to be a Mastodon server.</string>
<string name="ok">OK</string>
<string name="preparing_auth">Preparing for authentication…</string>
<string name="finishing_auth">Finishing authentication…</string>
@@ -394,4 +394,7 @@
<string name="remove_bookmark">Remove bookmark</string>
<string name="bookmarks">Bookmarks</string>
<string name="your_favorites">Your Favorites</string>
<string name="login_title">Welcome Back</string>
<string name="login_subtitle">Log in with the server where you created your account.</string>
<string name="server_url">Server URL</string>
</resources>

71
mastodon/src/main/res/values/styles.xml
View File

@@ -43,6 +43,29 @@
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
<!-- M3 colors -->
<item name="colorM3Primary">@color/m3_sys_light_primary</item>
<item name="colorM3OnPrimary">@color/m3_sys_light_on_primary</item>
<item name="colorM3PrimaryContainer">@color/m3_sys_light_primary_container</item>
<item name="colorM3OnPrimaryContainer">@color/m3_sys_light_on_primary_container</item>
<item name="colorM3Secondary">@color/m3_sys_light_secondary</item>
<item name="colorM3OnSecondary">@color/m3_sys_light_on_secondary</item>
<item name="colorM3SecondaryContainer">@color/m3_sys_light_secondary_container</item>
<item name="colorM3OnSecondaryContainer">@color/m3_sys_light_on_secondary_container</item>
<item name="colorM3Tertiary">@color/m3_sys_light_tertiary</item>
<item name="colorM3OnTertiary">@color/m3_sys_light_on_tertiary</item>
<item name="colorM3TertiaryContainer">@color/m3_sys_light_tertiary_container</item>
<item name="colorM3OnTertiaryContainer">@color/m3_sys_light_on_tertiary_container</item>
<item name="colorM3Background">@color/m3_sys_light_background</item>
<item name="colorM3OnBackground">@color/m3_sys_light_on_background</item>
<item name="colorM3Surface">@color/m3_sys_light_surface</item>
<item name="colorM3OnSurface">@color/m3_sys_light_on_surface</item>
<item name="colorM3SurfaceVariant">@color/m3_sys_light_surface_variant</item>
<item name="colorM3OnSurfaceVariant">@color/m3_sys_light_on_surface_variant</item>
<item name="colorM3Outline">@color/m3_sys_light_outline</item>
<item name="colorM3DisabledBackground">#1F1F1F1F</item>
<item name="colorM3PressedOverlay">@color/m3_sys_light_on_primary</item>
</style>
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
@@ -90,10 +113,35 @@
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
<!-- M3 colors -->
<item name="colorM3Primary">@color/m3_sys_dark_primary</item>
<item name="colorM3OnPrimary">@color/m3_sys_dark_on_primary</item>
<item name="colorM3PrimaryContainer">@color/m3_sys_dark_primary_container</item>
<item name="colorM3OnPrimaryContainer">@color/m3_sys_dark_on_primary_container</item>
<item name="colorM3Secondary">@color/m3_sys_dark_secondary</item>
<item name="colorM3OnSecondary">@color/m3_sys_dark_on_secondary</item>
<item name="colorM3SecondaryContainer">@color/m3_sys_dark_secondary_container</item>
<item name="colorM3OnSecondaryContainer">@color/m3_sys_dark_on_secondary_container</item>
<item name="colorM3Tertiary">@color/m3_sys_dark_tertiary</item>
<item name="colorM3OnTertiary">@color/m3_sys_dark_on_tertiary</item>
<item name="colorM3TertiaryContainer">@color/m3_sys_dark_tertiary_container</item>
<item name="colorM3OnTertiaryContainer">@color/m3_sys_dark_on_tertiary_container</item>
<item name="colorM3Background">@color/m3_sys_dark_background</item>
<item name="colorM3OnBackground">@color/m3_sys_dark_on_background</item>
<item name="colorM3Surface">@color/m3_sys_dark_surface</item>
<item name="colorM3OnSurface">@color/m3_sys_dark_on_surface</item>
<item name="colorM3SurfaceVariant">@color/m3_sys_dark_surface_variant</item>
<item name="colorM3OnSurfaceVariant">@color/m3_sys_dark_on_surface_variant</item>
<item name="colorM3Outline">@color/m3_sys_dark_outline</item>
<item name="colorM3DisabledBackground">#1FE3E3E3</item>
<item name="colorM3PressedOverlay">@color/m3_sys_dark_primary</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack">
<item name="colorWindowBackground">#000</item>
<item name="colorM3Background">#000</item>
</style>
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
@@ -103,12 +151,20 @@
<item name="android:colorPrimary">@color/gray_50</item>
<item name="android:textColorPrimary">@color/gray_800</item>
<item name="android:textColorSecondary">@color/gray_800</item>
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
</style>
<style name="Theme.Mastodon.Toolbar.Dark" parent="android:ThemeOverlay.Material.Dark.ActionBar">
<item name="android:colorPrimary">@color/gray_800</item>
<item name="android:textColorPrimary">@color/gray_50</item>
<item name="android:textColorSecondary">@color/gray_50</item>
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
</style>
<style name="Widget.Mastodon.Toolbar" parent="android:Widget.Material.Toolbar">
<item name="android:contentInsetStartWithNavigation">0dp</item>
<item name="android:titleMarginEnd">0dp</item>
<item name="android:titleMarginStart">0dp</item>
</style>
<style name="Theme.Mastodon.Toolbar.Profile">
@@ -226,6 +282,21 @@
<item name="android:popupBackground">@drawable/bg_popup</item>
</style>
<style name="Widget.Mastodon.M3.Button" parent="android:Widget.Material.Button">
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14dp</item>
<item name="android:minHeight">40dp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:stateListAnimator">@null</item>
</style>
<style name="Widget.Mastodon.M3.Button.Filled">
<item name="android:background">@drawable/bg_button_m3_filled</item>
<item name="android:textColor">@color/button_text_m3_filled</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
</style>
<style name="alert_title">
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textSize">24dp</item>