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

5
mastodon/src/main/res/color/button_text_m3_filled.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnPrimary" android:state_enabled="true"/>
<item android:color="?colorM3OnSurface" android:alpha="0.38"/>
</selector>

4
mastodon/src/main/res/color/m3_pressed_overlay.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3PressedOverlay" android:alpha="0.12"/>
</selector>

5
mastodon/src/main/res/color/m3_radiobutton_tint.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3Primary" android:state_checked="true"/>
<item android:color="?colorM3OnSurfaceVariant"/>
</selector>

19
mastodon/src/main/res/drawable/bg_button_m3_filled.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<ripple android:color="@color/m3_pressed_overlay">
<item>
<shape>
<solid android:color="?colorM3Primary"/>
<corners android:radius="20dp"/>
</shape>
</item>
</ripple>
</item>
<item>
<shape>
<solid android:color="?colorM3DisabledBackground"/>
<corners android:radius="20dp"/>
</shape>
</item>
</selector>

9
mastodon/src/main/res/drawable/ic_m3_cancel.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2ZM12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20ZM12,10.59L15.59,7L17,8.41L13.41,12L17,15.59L15.59,17L12,13.41L8.41,17L7,15.59L10.59,12L7,8.41L8.41,7L12,10.59Z"
android:fillColor="#49454F"/>
</vector>

9
mastodon/src/main/res/drawable/ic_m3_search.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M12.3,11.058L17.075,15.833L15.833,17.075L11.058,12.3C10.167,12.942 9.092,13.333 7.917,13.333C4.925,13.333 2.5,10.908 2.5,7.917C2.5,4.925 4.925,2.5 7.917,2.5C10.908,2.5 13.333,4.925 13.333,7.917C13.333,9.092 12.942,10.167 12.3,11.058ZM7.917,4.167C5.842,4.167 4.167,5.842 4.167,7.917C4.167,9.992 5.842,11.667 7.917,11.667C9.992,11.667 11.667,9.992 11.667,7.917C11.667,5.842 9.992,4.167 7.917,4.167Z"
android:fillColor="#49454F"/>
</vector>

5
mastodon/src/main/res/drawable/rect_4dp.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#000"/>
<corners android:radius="4dp"/>
</shape>

52
mastodon/src/main/res/layout/fragment_login.xml Normal file
View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<me.grishka.appkit.views.FragmentRootLinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:id="@+id/appkit_loader_root"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="?colorM3Background">
<include layout="@layout/appkit_toolbar"/>
<FrameLayout
android:id="@+id/appkit_loader_content"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
<include layout="@layout/loading"
android:id="@+id/loading"/>
<ViewStub android:layout="?errorViewLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/error"
android:visibility="gone"/>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/content_stub"/>
</FrameLayout>
<LinearLayout
android:id="@+id/button_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/btn_next"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:minWidth="145dp"
style="@style/Widget.Mastodon.M3.Button.Filled"
android:text="@string/next" />
</LinearLayout>
</me.grishka.appkit.views.FragmentRootLinearLayout>

71
mastodon/src/main/res/layout/header_onboarding_login.xml Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_body_large"
android:paddingStart="56dp"
android:paddingEnd="24dp"
android:text="@string/login_subtitle"/>
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginTop="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
app:editTextOffsetY="8dp"
android:background="@drawable/rect_4dp"
android:backgroundTint="?colorM3SurfaceVariant">
<EditText
android:id="@+id/search_edit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:stateListAnimator="@null"
android:textColor="?colorM3OnSurfaceVariant"
android:textColorHint="?colorM3OnSurfaceVariant"
android:inputType="textUri"
android:importantForAutofill="no"
android:paddingStart="48dp"
android:layout_marginEnd="52dp"
android:drawablePadding="16dp"
android:textAppearance="@style/m3_body_large"
android:hint="@string/server_url"/>
<ImageView
android:layout_width="44dp"
android:layout_height="20dp"
android:layout_gravity="start|center_vertical"
android:scaleType="center"
android:importantForAccessibility="no"
android:tint="?colorM3OnSurfaceVariant"
android:src="@drawable/ic_m3_search"/>
<ImageButton
android:id="@+id/search_clear"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="6dp"
android:background="?android:selectableItemBackgroundBorderless"
android:layout_gravity="center_vertical|end"
android:visibility="gone"
tools:visibility="visible"
android:contentDescription="@string/clear"
android:stateListAnimator="@null"
android:elevation="0dp"
android:src="@drawable/ic_m3_cancel"/>
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
</LinearLayout>

53
mastodon/src/main/res/layout/item_instance_login.xml Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingEnd="24dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:background="?colorM3SurfaceVariant">
<RadioButton
android:id="@+id/radiobtn"
android:layout_width="28dp"
android:layout_height="24dp"
android:layout_marginEnd="23dp"
android:layout_marginStart="-3dp"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:buttonTint="@color/m3_radiobutton_tint"
android:background="@null"
android:focusable="false"
android:clickable="false"/>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/radiobtn"
android:layout_alignParentTop="true"
android:textAppearance="@style/m3_body_large"
android:singleLine="true"
android:ellipsize="end"
android:gravity="center_vertical"
android:textSize="16sp"
android:minHeight="24dp"
android:textColor="?colorM3OnSurface"
tools:text="mastodon.social"/>
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/radiobtn"
android:layout_below="@id/title"
android:layout_marginBottom="8dp"
android:textAppearance="@style/m3_body_medium"
android:textColor="?colorM3OnSurfaceVariant"
android:textSize="14sp"
android:lineSpacingExtra="4sp"
tools:text="General-purpose server run by the lead developer of Mastodon"/>
</RelativeLayout>

46
mastodon/src/main/res/values-v31/colors.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- M3 dynamic colors -->
<!-- light theme -->
<color name="m3_sys_light_primary">@android:color/system_accent1_600</color>
<color name="m3_sys_light_on_primary">#FFF</color>
<color name="m3_sys_light_primary_container">@android:color/system_accent1_100</color>
<color name="m3_sys_light_on_primary_container">@android:color/system_accent1_900</color>
<color name="m3_sys_light_secondary">@android:color/system_accent2_600</color>
<color name="m3_sys_light_on_secondary">#FFF</color>
<color name="m3_sys_light_secondary_container">@android:color/system_accent2_100</color>
<color name="m3_sys_light_on_secondary_container">@android:color/system_accent2_900</color>
<color name="m3_sys_light_tertiary">@android:color/system_accent3_600</color>
<color name="m3_sys_light_on_tertiary">#FFF</color>
<color name="m3_sys_light_tertiary_container">@android:color/system_accent3_100</color>
<color name="m3_sys_light_on_tertiary_container">@android:color/system_accent3_900</color>
<color name="m3_sys_light_background">@android:color/system_neutral1_10</color>
<color name="m3_sys_light_on_background">@android:color/system_neutral1_900</color>
<color name="m3_sys_light_surface">@android:color/system_neutral1_10</color>
<color name="m3_sys_light_on_surface">@android:color/system_neutral1_900</color>
<color name="m3_sys_light_surface_variant">@android:color/system_neutral2_100</color>
<color name="m3_sys_light_on_surface_variant">@android:color/system_neutral2_700</color>
<color name="m3_sys_light_outline">@android:color/system_neutral2_500</color>
<!-- dark theme -->
<color name="m3_sys_dark_primary">@android:color/system_accent1_200</color>
<color name="m3_sys_dark_on_primary">@android:color/system_accent1_800</color>
<color name="m3_sys_dark_primary_container">@android:color/system_accent1_700</color>
<color name="m3_sys_dark_on_primary_container">@android:color/system_accent1_100</color>
<color name="m3_sys_dark_secondary">@android:color/system_accent2_200</color>
<color name="m3_sys_dark_on_secondary">@android:color/system_accent2_800</color>
<color name="m3_sys_dark_secondary_container">@android:color/system_accent2_700</color>
<color name="m3_sys_dark_on_secondary_container">@android:color/system_accent2_100</color>
<color name="m3_sys_dark_tertiary">@android:color/system_accent3_200</color>
<color name="m3_sys_dark_on_tertiary">@android:color/system_accent3_800</color>
<color name="m3_sys_dark_tertiary_container">@android:color/system_accent3_700</color>
<color name="m3_sys_dark_on_tertiary_container">@android:color/system_accent3_100</color>
<color name="m3_sys_dark_background">@android:color/system_neutral1_900</color>
<color name="m3_sys_dark_on_background">@android:color/system_neutral1_100</color>
<color name="m3_sys_dark_surface">@android:color/system_neutral1_900</color>
<color name="m3_sys_dark_on_surface">@android:color/system_neutral1_100</color>
<color name="m3_sys_dark_surface_variant">@android:color/system_neutral2_700</color>
<color name="m3_sys_dark_on_surface_variant">@android:color/system_neutral2_200</color>
<color name="m3_sys_dark_outline">@android:color/system_neutral2_400</color>
</resources>

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>