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

Compose design + media upload

Browse Source
This commit is contained in:
Grishka
2022-02-04 13:50:19 +03:00
parent 20d3a62747
commit cc06715aa6
24 changed files with 668 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,10 +12,13 @@
<color name="gray_25">#FCFCFD</color>
<color name="gray_50t">#CCF9FAFB</color>
<color name="gray_50">#F9FAFB</color>
<color name="gray_100">#F2F4F7</color>
<color name="gray_800">#282C37</color>
<color name="gray_500">#667085</color>
<color name="gray_800_alpha50">#80282C37</color>
<color name="text_primary">@color/gray_800</color>
<color name="text_secondary">@color/gray_500</color>
<color name="secondary">#E9EDF2</color>
@@ -23,6 +26,7 @@
<color name="text_secondary_alpha50">#80667085</color>
<color name="actionbar_bg">#FAFBFC</color>
<color name="navigation_bar_bg">#000</color>
<color name="highlight_over_dark">#80FFFFFF</color>
<color name="favorite_selected">#FF9F0A</color>
<color name="boost_selected">#79BD9A</color>

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

@@ -28,4 +28,9 @@
<string name="share_toot_title">Share toot</string>
<string name="settings">Settings</string>
<string name="publish">Publish</string>
<string name="discard_draft">Discard draft?</string>
<string name="discard">Discard</string>
<string name="cancel">Cancel</string>
<string name="publishing">Your toot is being tooted</string>
</resources>

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

@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.Mastodon" parent="Theme.AppKit.Light">
<!-- needed to disable scrim on API 29+ -->
<item name="android:enforceNavigationBarContrast">false</item>
<item name="android:enforceStatusBarContrast">false</item>
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
<item name="android:windowBackground">@color/white</item>
<item name="android:statusBarColor">@color/actionbar_bg</item>
<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
<item name="android:colorAccent">@color/gray_800</item>
<item name="android:colorPrimary">@color/gray_800</item>
<item name="android:colorBackground">@color/gray_100</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
<item name="android:buttonStyle">@style/Widget.Mastodon.Button</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
</style>
<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
@@ -20,6 +23,53 @@
<item name="android:textColorSecondary">@color/gray_800</item>
</style>
<style name="Widget.Mastodon.Button" parent="android:Widget.Material.Button">
<item name="android:textAllCaps">false</item>
<item name="android:background">@drawable/bg_button</item>
<item name="android:textAppearance">@style/m3_label_large</item>
<item name="android:textColor">@color/gray_50</item>
<item name="android:minHeight">36dp</item>
<item name="android:minWidth">0px</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert" parent="android:Theme.Material.Light.Dialog.Alert">
<item name="android:windowTitleStyle">@style/alert_title</item>
<item name="android:dialogPreferredPadding">24dp</item>
<item name="android:windowBackground">@drawable/bg_alert</item>
<item name="android:colorBackground">@color/gray_100</item>
<item name="android:buttonBarStyle">@style/Widget.Mastodon.ButtonBar</item>
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
</style>
<style name="Widget.Mastodon.ButtonBar" parent="android:Widget.Material.Light.ButtonBar.AlertDialog">
<!-- <item name="android:layout_marginEnd">4dp</item>-->
<!-- <item name="android:layout_marginStart">12dp</item>-->
<!-- <item name="android:layout_marginTop">20dp</item>-->
<!-- <item name="android:layout_marginBottom">20dp</item>-->
<!-- <item name="android:paddingEnd">4dp</item>-->
<!-- <item name="android:paddingStart">12dp</item>-->
<!-- <item name="android:paddingTop">20dp</item>-->
<!-- <item name="android:paddingBottom">20dp</item>-->
</style>
<style name="Widget.Mastodon.ButtonBarButton" parent="android:Widget.Material.Button.Borderless">
<item name="android:textAllCaps">false</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:minHeight">40dp</item>
<item name="android:minWidth">0px</item>
<item name="android:background">@drawable/bg_alert_button</item>
<item name="android:textAppearance">@style/m3_label_large</item>
<item name="android:textColor">@color/text_primary</item>
</style>
<style name="alert_title">
<item name="android:textColor">@color/text_primary</item>
<item name="android:textSize">24dp</item>
<item name="android:minHeight">38dp</item>
<item name="android:gravity">bottom</item>
</style>
<style name="m3_body_large">
<item name="android:textSize">16dp</item>
<item name="android:textColor">@color/text_primary</item>