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

new colors

This commit is contained in:
Thomas 2022-11-29 10:23:19 +01:00
parent f29122e3ef
commit 635dc94b8d
23 changed files with 276 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/AndroidManifest.xml
View File

@ -30,7 +30,7 @@
android:roundIcon="@mipmap/ic_launcher_bubbles_round"
android:supportsRtl="true"
android:requestLegacyExternalStorage="true"
android:theme="@style/AppThemeDark"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup">
@ -320,29 +320,29 @@
<activity
android:name=".activities.ReportActivity"
android:theme="@style/AppThemeBarDark"
android:theme="@style/AppThemeBar"
android:windowSoftInputMode="stateVisible" />
<activity
android:name=".activities.CustomSharingActivity"
android:label="@string/settings_title_custom_sharing"
android:theme="@style/AppThemeBarDark"
android:theme="@style/AppThemeBar"
android:windowSoftInputMode="stateVisible" />
<activity
android:name=".activities.FilterActivity"
android:label="@string/filters"
android:theme="@style/AppThemeBarDark"
android:theme="@style/AppThemeBar"
android:windowSoftInputMode="stateVisible" />
<activity
android:name=".activities.EditProfileActivity"
android:label="@string/edit_profile"
android:theme="@style/AppThemeBarDark"
android:theme="@style/AppThemeBar"
android:windowSoftInputMode="stateVisible" />
<activity
android:name=".activities.CacheActivity"
android:label="@string/action_cache"
android:theme="@style/AppThemeBarDark" />
android:theme="@style/AppThemeBar" />
<provider
android:name="androidx.core.content.FileProvider"

6
app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
View File

@ -23,7 +23,6 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.Toast;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -35,6 +34,7 @@ import app.fedilab.android.client.entities.api.admin.AdminAccount;
import app.fedilab.android.client.entities.api.admin.AdminReport;
import app.fedilab.android.databinding.ActivityAdminReportBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.StatusReportAdapter;
import app.fedilab.android.viewmodel.mastodon.AdminVM;
import es.dmoral.toasty.Toasty;
@ -67,8 +67,8 @@ public class AccountReportActivity extends BaseActivity {
report = (AdminReport) b.getSerializable(Helper.ARG_REPORT);
}
binding.allow.getBackground().setColorFilter(ContextCompat.getColor(AccountReportActivity.this, R.color.green_1), PorterDuff.Mode.MULTIPLY);
binding.reject.getBackground().setColorFilter(ContextCompat.getColor(AccountReportActivity.this, R.color.red_1), PorterDuff.Mode.MULTIPLY);
binding.allow.getBackground().setColorFilter(ThemeHelper.getAttColor(this, R.attr.colorPrimary), PorterDuff.Mode.MULTIPLY);
binding.reject.getBackground().setColorFilter(ThemeHelper.getAttColor(this, R.attr.colorError), PorterDuff.Mode.MULTIPLY);
if (account_id == null && report == null && targeted_account == null) {

6
app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
View File

@ -24,7 +24,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.ViewModelProvider;
import com.bumptech.glide.Glide;
@ -34,6 +33,7 @@ import app.fedilab.android.R;
import app.fedilab.android.client.entities.app.InstanceSocial;
import app.fedilab.android.databinding.ActivityInstanceSocialBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.viewmodel.mastodon.InstanceSocialVM;
@ -89,10 +89,10 @@ public class InstanceHealthActivity extends BaseActivity {
binding.name.setText(instanceSocial.name);
if (instanceSocial.up) {
binding.up.setText(R.string.is_up);
binding.up.setTextColor(ContextCompat.getColor(InstanceHealthActivity.this, R.color.green_1));
binding.up.setTextColor(ThemeHelper.getAttColor(this, R.attr.colorPrimary));
} else {
binding.up.setText(R.string.is_down);
binding.up.setTextColor(ContextCompat.getColor(InstanceHealthActivity.this, R.color.red_1));
binding.up.setTextColor(ThemeHelper.getAttColor(this, R.attr.colorError));
}
binding.uptime.setText(getString(R.string.instance_health_uptime, (instanceSocial.uptime * 100)));
if (instanceSocial.checked_at != null)

4
app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
View File

@ -547,12 +547,12 @@ public class ProfileActivity extends BaseActivity {
}
if (relationship.following) {
binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_remove_24);
binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ProfileActivity.this, R.color.red_1)));
binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(this, R.attr.colorError)));
doAction = action.UNFOLLOW;
binding.accountFollow.setContentDescription(getString(R.string.action_unfollow));
binding.accountFollow.setVisibility(View.VISIBLE);
} else if (relationship.blocking) {
binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ProfileActivity.this, R.color.red_1)));
binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(this, R.attr.colorError)));
binding.accountFollow.setIconResource(R.drawable.ic_baseline_lock_open_24);
doAction = action.UNBLOCK;
binding.accountFollow.setVisibility(View.VISIBLE);

3
app/src/main/java/app/fedilab/android/helper/CountDrawable.java
View File

@ -25,7 +25,6 @@ import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import app.fedilab.android.R;
@ -43,7 +42,7 @@ public class CountDrawable extends Drawable {
float mTextSize = context.getResources().getDimension(R.dimen.badge_count_textsize);
mBadgePaint = new Paint();
mBadgePaint.setColor(ContextCompat.getColor(context, R.color.red_1));
mBadgePaint.setColor(ThemeHelper.getAttColor(context, R.attr.colorPrimary));
mBadgePaint.setAntiAlias(true);
mBadgePaint.setStyle(Paint.Style.FILL);

2
app/src/main/java/app/fedilab/android/helper/ThemeHelper.java
View File

@ -63,7 +63,7 @@ public class ThemeHelper {
public static void initiliazeColors(Activity activity) {
TypedValue typedValue = new TypedValue();
Resources.Theme theme = activity.getTheme();
theme.resolveAttribute(R.attr.linkColor, typedValue, true);
theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
linkColor = -1;
if (prefs.getBoolean("use_custom_theme", false)) {

6
app/src/main/java/app/fedilab/android/ui/drawer/AccountAdapter.java
View File

@ -30,7 +30,6 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.core.app.ActivityOptionsCompat;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelStoreOwner;
@ -48,6 +47,7 @@ import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.databinding.DrawerAccountBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.viewmodel.mastodon.AccountsVM;
import es.dmoral.toasty.Toasty;
@ -98,11 +98,11 @@ public class AccountAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
}
if (account.relationShip.following) {
accountViewHolder.binding.followAction.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(context, R.color.red_1)));
accountViewHolder.binding.followAction.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(context, R.attr.colorError)));
doAction = ProfileActivity.action.UNFOLLOW;
accountViewHolder.binding.followAction.setIconResource(R.drawable.ic_baseline_person_remove_24);
} else if (account.relationShip.requested) {
accountViewHolder.binding.followAction.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(context, R.color.red_1)));
accountViewHolder.binding.followAction.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(context, R.attr.colorError)));
doAction = ProfileActivity.action.NOTHING;
accountViewHolder.binding.followAction.setEnabled(false);
accountViewHolder.binding.followAction.setIconResource(R.drawable.ic_baseline_hourglass_full_24);

6
app/src/main/java/app/fedilab/android/ui/drawer/AccountListAdapter.java
View File

@ -22,7 +22,6 @@ import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelStoreOwner;
import androidx.recyclerview.widget.RecyclerView;
@ -37,6 +36,7 @@ import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.databinding.DrawerAccountListBinding;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM;
@ -87,7 +87,7 @@ public class AccountListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
if (searchList != null) {
if (accountList.contains(account)) {
holder.binding.listAction.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(context, R.color.red_1)));
holder.binding.listAction.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(context, R.attr.colorError)));
holder.binding.listAction.setIconResource(R.drawable.ic_baseline_person_remove_alt_1_24);
holder.binding.listAction.setOnClickListener(v -> {
List<String> ids = new ArrayList<>();
@ -107,7 +107,7 @@ public class AccountListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
});
}
} else {
holder.binding.listAction.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(context, R.color.red_1)));
holder.binding.listAction.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(context, R.attr.colorError)));
holder.binding.listAction.setIconResource(R.drawable.ic_baseline_person_remove_alt_1_24);
holder.binding.listAction.setOnClickListener(v -> {
accountList.remove(account);

4
app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
View File

@ -1237,7 +1237,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
layoutMediaBinding.media.setScaleType(ImageView.ScaleType.CENTER_CROP);
}
if (statusToDeal.sensitive) {
Helper.changeDrawableColor(context, layoutMediaBinding.viewHide, R.color.red_1);
Helper.changeDrawableColor(context, layoutMediaBinding.viewHide, ThemeHelper.getAttColor(context, R.attr.colorError));
} else {
Helper.changeDrawableColor(context, layoutMediaBinding.viewHide, R.color.white);
}
@ -1402,7 +1402,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
.into(layoutMediaBinding.media);
}
if (statusToDeal.sensitive) {
Helper.changeDrawableColor(context, layoutMediaBinding.viewHide, R.color.red_1);
Helper.changeDrawableColor(context, layoutMediaBinding.viewHide, ThemeHelper.getAttColor(context, R.attr.colorError));
} else {
Helper.changeDrawableColor(context, layoutMediaBinding.viewHide, R.color.white);
}

4
app/src/main/res/drawable/media_message_border.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/mastodonC1__" />
<solid android:color="?android:colorBackground" />
<stroke
android:width="1dp"
android:color="@color/mastodonC1" />
android:color="?colorPrimary" />
<padding
android:bottom="1dp"

2
app/src/main/res/drawable/red_border.xml
View File

@ -3,7 +3,7 @@
<solid android:color="@android:color/transparent" />
<stroke
android:width="1dip"
android:color="@color/red_1" />
android:color="?colorError" />
<corners android:radius="2dp" />
<padding
android:bottom="1dip"

6
app/src/main/res/layout/account_field_item.xml
View File

@ -46,13 +46,13 @@
android:insetTop="0dp"
android:insetBottom="0dp"
android:padding="0dp"
android:textColor="@color/red_1"
android:textColor="?colorError"
app:icon="@drawable/ic_compose_attachment_remove"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconTint="@color/red_1"
app:iconTint="?colorError"
app:layout_constraintStart_toStartOf="@id/banner_pp"
app:layout_constraintTop_toTopOf="@id/banner_pp"
app:strokeColor="@color/red_1" />
app:strokeColor="?colorError" />
</androidx.appcompat.widget.LinearLayoutCompat>

2
app/src/main/res/layout/activity_admin_account.xml
View File

@ -147,7 +147,7 @@
android:layout_marginTop="5dp"
android:background="@drawable/red_border"
android:text="Peertube"
android:textColor="@color/red_1"
android:textColor="?colorError"
android:visibility="gone"
tools:ignore="HardcodedText" />

7
app/src/main/res/layout/activity_profile.xml
View File

@ -172,7 +172,7 @@
android:layout_marginTop="5dp"
android:background="@drawable/red_border"
android:text="Peertube"
android:textColor="@color/red_1"
android:textColor="?colorError"
android:visibility="gone"
tools:ignore="HardcodedText" />
@ -191,7 +191,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/red"
android:textColor="?colorError"
android:visibility="gone" />
<androidx.appcompat.widget.AppCompatTextView
@ -341,8 +341,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="@string/disclaimer_full"
android:textColor="@color/dark_text" />
android:text="@string/disclaimer_full" />
<com.google.android.material.button.MaterialButton
android:id="@+id/open_remote_profile"

2
app/src/main/res/layout/domains_blocked.xml
View File

@ -7,4 +7,4 @@
android:paddingEnd="5dp"
android:paddingRight="5dp"
android:singleLine="true"
android:textColor="@color/red_1" />
android:textColor="?colorError" />

4
app/src/main/res/layout/fragment_login_register_mastodon.xml
View File

@ -31,7 +31,7 @@
android:background="@drawable/red_border"
android:gravity="center"
android:padding="5dp"
android:textColor="@color/red_1"
android:textColor="?colorError"
android:visibility="gone" />
<TextView
@ -41,7 +41,7 @@
android:layout_gravity="center"
android:gravity="center"
android:text="@string/validation_needed"
android:textColor="@color/red_1"
android:textColor="?colorError"
android:visibility="gone" />
<com.google.android.material.textfield.TextInputLayout

3
app/src/main/res/layout/fragment_slide_media.xml
View File

@ -40,7 +40,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/dark_text"
android:textSize="12sp" />
</RelativeLayout>
@ -131,9 +130,7 @@
android:layout_marginBottom="40dp"
android:background="@drawable/media_message_border"
android:gravity="center"
android:text="@string/media_ready"
android:textColor="@color/dark_text"
android:textSize="14sp"
android:visibility="gone" />
</RelativeLayout>

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

@ -13,7 +13,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/titleb"
android:textSize="20sp" />
<androidx.appcompat.widget.AppCompatEditText

14
app/src/main/res/layout/popup_notification_settings.xml
View File

@ -138,10 +138,10 @@
android:minHeight="0dp"
android:text="@string/more_actions"
android:textAllCaps="false"
android:textColor="@color/red_1"
android:textColor="?colorError"
app:icon="@drawable/ic_baseline_expand_more_24"
app:iconTint="@color/red_1"
app:rippleColor="@color/red_1" />
app:iconTint="?colorError"
app:rippleColor="?colorError" />
<com.google.android.material.button.MaterialButton
android:id="@+id/clear_all_notif"
@ -149,12 +149,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/clear_all_notif"
android:textColor="@color/red_1"
android:textColor="?colorError"
android:visibility="gone"
app:icon="@drawable/ic_baseline_delete_24"
app:iconTint="@color/red_1"
app:rippleColor="@color/red_1"
app:strokeColor="@color/red_1" />
app:iconTint="?colorError"
app:rippleColor="?colorError"
app:strokeColor="?colorError" />
</androidx.appcompat.widget.LinearLayoutCompat>

86
app/src/main/res/values-night/themes.xml Normal file
View File

@ -0,0 +1,86 @@
<resources>
<style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorPrimary">@color/md_theme_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_dark_error</item>
<item name="colorOnError">@color/md_theme_dark_onError</item>
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
<item name="colorOutline">@color/md_theme_dark_outline</item>
<item name="android:colorBackground">@color/md_theme_dark_background</item>
<item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
<item name="windowNoTitle">true</item>
<!-- specify enter and exit transitions -->
<item name="android:windowEnterTransition">@android:transition/explode</item>
<item name="android:windowExitTransition">@android:transition/explode</item>
<!-- specify shared element transitions -->
<item name="android:windowSharedElementEnterTransition">
@transition/change_image_transform
</item>
<item name="android:windowSharedElementExitTransition">
@transition/change_image_transform
</item>
</style>
<style name="AppThemeBar" parent="Theme.Material3.Dark">
<item name="colorPrimary">@color/md_theme_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_dark_error</item>
<item name="colorOnError">@color/md_theme_dark_onError</item>
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
<item name="colorOutline">@color/md_theme_dark_outline</item>
<item name="android:colorBackground">@color/md_theme_dark_background</item>
<item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
</style>
<style name="TransparentDark" parent="Theme.Material3.Dark">
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowNoTitle">true</item>
</style>
</resources>

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

@ -2,51 +2,80 @@
<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="seed">#6750A4</color>
<color name="md_theme_light_primary">#6750A4</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#EADDFF</color>
<color name="md_theme_light_onPrimaryContainer">#21005D</color>
<color name="md_theme_light_secondary">#625B71</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#E8DEF8</color>
<color name="md_theme_light_onSecondaryContainer">#1D192B</color>
<color name="md_theme_light_tertiary">#7D5260</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#FFD8E4</color>
<color name="md_theme_light_onTertiaryContainer">#31111D</color>
<color name="md_theme_light_error">#B3261E</color>
<color name="md_theme_light_onError">#FFFFFF</color>
<color name="md_theme_light_errorContainer">#F9DEDC</color>
<color name="md_theme_light_onErrorContainer">#410E0B</color>
<color name="md_theme_light_outline">#79747E</color>
<color name="md_theme_light_background">#FFFBFE</color>
<color name="md_theme_light_onBackground">#1C1B1F</color>
<color name="md_theme_light_surface">#FFFBFE</color>
<color name="md_theme_light_onSurface">#1C1B1F</color>
<color name="md_theme_light_surfaceVariant">#E7E0EC</color>
<color name="md_theme_light_onSurfaceVariant">#49454F</color>
<color name="md_theme_light_inverseSurface">#313033</color>
<color name="md_theme_light_inverseOnSurface">#F4EFF4</color>
<color name="md_theme_light_inversePrimary">#D0BCFF</color>
<color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_surfaceTint">#6750A4</color>
<color name="md_theme_light_outlineVariant">#CAC4D0</color>
<color name="md_theme_light_scrim">#000000</color>
<color name="md_theme_dark_primary">#D0BCFF</color>
<color name="md_theme_dark_onPrimary">#381E72</color>
<color name="md_theme_dark_primaryContainer">#4F378B</color>
<color name="md_theme_dark_onPrimaryContainer">#EADDFF</color>
<color name="md_theme_dark_secondary">#CCC2DC</color>
<color name="md_theme_dark_onSecondary">#332D41</color>
<color name="md_theme_dark_secondaryContainer">#4A4458</color>
<color name="md_theme_dark_onSecondaryContainer">#E8DEF8</color>
<color name="md_theme_dark_tertiary">#EFB8C8</color>
<color name="md_theme_dark_onTertiary">#492532</color>
<color name="md_theme_dark_tertiaryContainer">#633B48</color>
<color name="md_theme_dark_onTertiaryContainer">#FFD8E4</color>
<color name="md_theme_dark_error">#F2B8B5</color>
<color name="md_theme_dark_onError">#601410</color>
<color name="md_theme_dark_errorContainer">#8C1D18</color>
<color name="md_theme_dark_onErrorContainer">#F9DEDC</color>
<color name="md_theme_dark_outline">#938F99</color>
<color name="md_theme_dark_background">#1C1B1F</color>
<color name="md_theme_dark_onBackground">#E6E1E5</color>
<color name="md_theme_dark_surface">#1C1B1F</color>
<color name="md_theme_dark_onSurface">#E6E1E5</color>
<color name="md_theme_dark_surfaceVariant">#49454F</color>
<color name="md_theme_dark_onSurfaceVariant">#CAC4D0</color>
<color name="md_theme_dark_inverseSurface">#E6E1E5</color>
<color name="md_theme_dark_inverseOnSurface">#313033</color>
<color name="md_theme_dark_inversePrimary">#6750A4</color>
<color name="md_theme_dark_shadow">#000000</color>
<color name="md_theme_dark_surfaceTint">#D0BCFF</color>
<color name="md_theme_dark_outlineVariant">#49454F</color>
<color name="md_theme_dark_scrim">#000000</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>
<color name="colorPrimaryVariant">#3700B3</color>
<!-- Header Profile-->
<!-- Header Profile DARK-->
<color name="dark_text_toot_header">#d9d9d9</color>
<color name="colorAccent">@color/mastodonC4</color>
<color name="no_description">#FFEA00</color>
<color name="having_description">#42A5F5</color>
<color name="dark_text">#f3f3f3</color>
<color name="marked_icon">#ca8f04</color>
<color name="boost_icon">#2b90d9</color>
<color name="transparent">#00000000</color>
<color name="transparent_grey">#77000000</color>
<color name="white">#FFF</color>
<color name="green_1">#009688</color>
<color name="red_1">#F44336</color>
<color name="red">#FFCDD2</color>
<color name="titleb">#D7CCC8</color>
<color name="white">#FFF</color>
<color name="black">#000</color>
<!-- Mastodon color scheme -->
<color name="mastodonC1__">#585c67</color>
<color name="mastodonC1___">#454b5b</color>
<color name="mastodonC1">#282c37</color>
<color name="mastodonC1_">#313543</color>
<color name="mastodonC2">#9baec8</color>
<color name="mastodonC3">#d9e1e8</color>
<color name="mastodonC4">#2b90d9</color>
<!-- Primary & accent colors -->

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

@ -1,87 +0,0 @@
<resources>
<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<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 shared element transitions -->
<item name="android:windowSharedElementEnterTransition">
@transition/change_image_transform
</item>
<item name="android:windowSharedElementExitTransition">
@transition/change_image_transform
</item>
</style>
<style name="AppThemeDark" parent="Theme.Material3.Dark.NoActionBar">
<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 -->
<item name="android:windowEnterTransition">@android:transition/explode</item>
<item name="android:windowExitTransition">@android:transition/explode</item>
<!-- specify shared element transitions -->
<item name="android:windowSharedElementEnterTransition">
@transition/change_image_transform
</item>
<item name="android:windowSharedElementExitTransition">
@transition/change_image_transform
</item>
</style>
<style name="AppThemeBar" parent="Theme.Material3.Light">
<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/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="TransparentDark" parent="Theme.Material3.Dark">
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowNoTitle">true</item>
</style>
</resources>

84
app/src/main/res/values/themes.xml Normal file
View File

@ -0,0 +1,84 @@
<resources>
<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
<item name="windowNoTitle">true</item>
<!-- specify enter and exit transitions -->
<item name="android:windowEnterTransition">@android:transition/explode</item>
<item name="android:windowExitTransition">@android:transition/explode</item>
<!-- specify shared element transitions -->
<item name="android:windowSharedElementEnterTransition">
@transition/change_image_transform
</item>
<item name="android:windowSharedElementExitTransition">
@transition/change_image_transform
</item>
</style>
<style name="AppThemeBar" parent="Theme.Material3.Light">
<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
</style>
<style name="TransparentDark" parent="Theme.Material3.Dark">
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowNoTitle">true</item>
</style>
</resources>