Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

some changes

This commit is contained in:
Thomas 2022-11-28 18:39:48 +01:00
parent 11ea166a0d
commit db3d317a55
20 changed files with 71 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/drawer_account.xml
View File

@ -17,6 +17,7 @@
<com.google.android.material.card.MaterialCardView 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"
app:cardBackgroundColor="?carViewBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="6dp"

1
app/src/main/res/layout/drawer_account_list.xml
View File

@ -19,6 +19,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?carViewBackground"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
app:cardElevation="5dp"

1
app/src/main/res/layout/drawer_announcement.xml
View File

@ -20,6 +20,7 @@
android:id="@+id/cardview_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?carViewBackground"
android:layout_marginHorizontal="@dimen/card_margin"
android:layout_marginTop="@dimen/card_margin"
android:clipChildren="false"

1
app/src/main/res/layout/drawer_conversation.xml
View File

@ -20,6 +20,7 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?carViewBackground"
android:layout_margin="12dp"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_domain_block.xml
View File

@ -19,6 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
app:cardBackgroundColor="?carViewBackground"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_follow.xml
View File

@ -21,6 +21,7 @@
android:layout_height="wrap_content"
android:layout_margin="6dp"
app:cardElevation="5dp"
app:cardBackgroundColor="?carViewBackground"
app:strokeWidth="0dp">
<androidx.appcompat.widget.LinearLayoutCompat

1
app/src/main/res/layout/drawer_instance_reg.xml
View File

@ -20,6 +20,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
app:cardBackgroundColor="?carViewBackground"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_status.xml
View File

@ -20,6 +20,7 @@
android:id="@+id/cardview_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?carViewBackground"
android:layout_marginHorizontal="@dimen/card_margin"
android:layout_marginTop="@dimen/card_margin"
android:clipToPadding="false"

1
app/src/main/res/layout/drawer_status_compose.xml
View File

@ -21,6 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
app:cardBackgroundColor="?carViewBackground"
android:clipToPadding="false"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_status_draft.xml
View File

@ -21,6 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
app:cardBackgroundColor="?carViewBackground"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_status_filtered.xml
View File

@ -23,6 +23,7 @@
android:layout_marginHorizontal="@dimen/card_margin"
android:layout_marginTop="@dimen/card_margin"
android:clipChildren="false"
app:cardBackgroundColor="?carViewBackground"
android:clipToPadding="false"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_status_filtered_hide.xml
View File

@ -23,6 +23,7 @@
android:layout_marginHorizontal="@dimen/card_margin"
android:layout_marginTop="@dimen/card_margin"
android:clipChildren="false"
app:cardBackgroundColor="?carViewBackground"
android:clipToPadding="false"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_status_history.xml
View File

@ -24,6 +24,7 @@
android:layout_marginTop="12dp"
android:clipChildren="false"
android:clipToPadding="false"
app:cardBackgroundColor="?carViewBackground"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_status_scheduled.xml
View File

@ -21,6 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
app:cardBackgroundColor="?carViewBackground"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_status_simple.xml
View File

@ -22,6 +22,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
app:cardBackgroundColor="?carViewBackground"
android:clipChildren="false"
android:clipToPadding="false"
app:cardElevation="5dp"

1
app/src/main/res/layout/drawer_suggestion.xml
View File

@ -21,6 +21,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="6dp"
android:layout_marginTop="6dp"
app:cardBackgroundColor="?carViewBackground"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/drawer_tag.xml
View File

@ -19,6 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
app:cardBackgroundColor="?carViewBackground"
app:cardElevation="5dp"
app:strokeWidth="0dp">

1
app/src/main/res/layout/thumbnail.xml
View File

@ -6,6 +6,7 @@
android:layout_height="wrap_content"
android:layout_marginVertical="6dp"
android:layout_marginStart="6dp"
app:cardBackgroundColor="?carViewBackground"
app:cardElevation="2dp">
<androidx.constraintlayout.widget.ConstraintLayout

15
app/src/main/res/values/colors.xml
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PrivateResource">
<color name="mastodon_dark_background">#191b22</color>
<color name="mastodon_dark_background_light">#606984</color>
<color name="mastodon_accent_dark">#595aff</color>
<color name="mastodon_accent_light">#8c8dff</color>
<color name="dark_link_toot">#8c8dff</color>
<color name="light_link_toot">#595aff</color>
<color name="my_app_primary_color">#6200EE</color>
<color name="my_app_secondary_color">#03DAC6</color>
<color name="my_app_background_color">#000</color>
@ -50,10 +61,6 @@
<!-- Card border -->
<color name="dark_link_toot">#27a7fc</color>
<color name="light_link_toot">#27a7fc</color>
<!-- COLOR PICKER -->
<color name="blue_color_picker">#0066FF</color>
<color name="brown_color_picker">#AF593E</color>

65
app/src/main/res/values/styles.xml
View File

@ -1,16 +1,22 @@
<resources>
<attr name="linkColor" type="color" />
<attr name="carViewBackground" type="color" />
<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="carViewBackground">@color/white</item>
<item name="linkColor">@color/dark_link_toot</item>
<item name="colorPrimary">@color/mastodon_accent_dark</item>
<item name="colorPrimaryVariant">@color/mastodon_accent_dark</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorSecondary">@color/mastodon_accent_dark</item>
<item name="colorSecondaryVariant">@color/mastodon_accent_dark</item>
<item name="colorOnSecondary">@color/white</item>
<item name="linkColor">@color/light_link_toot</item>
<item name="colorError">@color/red_900</item>
<item name="windowNoTitle">true</item>
@ -23,16 +29,22 @@
</item>
</style>
<style name="AppThemeDark" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/deep_purple_600</item>
<item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/indigo_600</item>
<item name="carViewBackground">@color/mastodon_dark_background</item>
<item name="linkColor">@color/dark_link_toot</item>
<item name="colorPrimary">@color/mastodon_accent_dark</item>
<item name="colorPrimaryVariant">@color/mastodon_accent_dark</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/mastodon_accent_dark</item>
<item name="colorSecondaryVariant">@color/mastodon_accent_dark</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorError">@color/red_900</item>
<item name="windowNoTitle">true</item>
<!-- specify enter and exit transitions -->
@ -50,26 +62,33 @@
<style name="AppThemeBar" parent="Theme.Material3.Light">
<item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/white</item>
<item name="linkColor">@color/light_link_toot</item>
<item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/white</item>
<item name="carViewBackground">@color/white</item>
<item name="linkColor">@color/dark_link_toot</item>
<item name="colorPrimary">@color/mastodon_accent_dark</item>
<item name="colorPrimaryVariant">@color/mastodon_accent_dark</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/mastodon_accent_dark</item>
<item name="colorSecondaryVariant">@color/mastodon_accent_dark</item>
<item name="colorOnSecondary">@color/white</item>
<item name="colorError">@color/red_900</item>
</style>
<style name="AppThemeBarDark" parent="Theme.Material3.Dark">
<item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/white</item>
<item name="carViewBackground">@color/mastodon_dark_background</item>
<item name="linkColor">@color/dark_link_toot</item>
<item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorPrimary">@color/mastodon_accent_dark</item>
<item name="colorPrimaryVariant">@color/mastodon_accent_dark</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/mastodon_accent_dark</item>
<item name="colorSecondaryVariant">@color/mastodon_accent_dark</item>
<item name="colorOnSecondary">@color/white</item>