Commit 7589f91e authored by Thomas's avatar Thomas
Browse files

Fix theming

parent c3a7bbad

app/src/main/assets/themes/cyanea_themes.json

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    "accent": "#FF2b90d9",

    "accent_dark": "#FF1b80c9",

    "accent_light": "#FF772b90d9",

    "background": "#FF121212",

    "background": "#FF272727",

    "background_dark": "#FF282c37",

    "background_light": "#FF282c37",

    "should_tint_statusbar": true,

app/src/main/java/app/fedilab/android/helper/SpannableHelper.java

+0 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.text.Spanned; 
import android.text.TextPaint;

import android.text.style.ClickableSpan;

import android.text.style.URLSpan;

import android.util.Log;

import android.util.Patterns;

import android.view.LayoutInflater;

import android.view.View;
@@ -114,7 +113,6 @@ public class SpannableHelper { 
                }

                if (url != null && urlText != null && !url.equals(urlText) && !urlText.contains("<span")) {

                    urlDetails.put(url, urlText);

                    Log.v(Helper.TAG, "PUT: " + urlText + " -> " + url);

                }

            }

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.text.SpannableString; 
import android.text.Spanned;

import android.text.TextUtils;

import android.text.style.ForegroundColorSpan;

import android.util.Log;

import android.util.TypedValue;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;
@@ -395,6 +396,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            Helper.changeDrawableColor(context, holder.binding.statusBoostIcon, theme_text_header_2_line);

            Helper.changeDrawableColor(context, holder.binding.statusPinned, theme_text_header_2_line);

        }

        Log.v(Helper.TAG, "theme_statuses_color: " + theme_statuses_color);

        if (theme_statuses_color != -1) {

            holder.binding.cardviewContainer.setBackgroundColor(theme_statuses_color);

            holder.binding.translationLabel.setBackgroundColor(theme_statuses_color);

app/src/main/res/layout/drawer_status.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/cardview_container"

    android:layout_width="match_parent"

    android:backgroundTint="@color/cyanea_primary_dark_reference"

    android:layout_height="wrap_content"

    android:layout_marginHorizontal="@dimen/card_margin"

    android:layout_marginTop="@dimen/card_margin"

    android:clipChildren="false"

    android:clipToPadding="false"

    app:cardElevation="2dp">

    app:cardElevation="0dp">



    <androidx.appcompat.widget.LinearLayoutCompat

        android:layout_width="match_parent"

app/src/main/res/layout/drawer_status_compose.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginHorizontal="12dp"

    android:backgroundTint="?backgroundColorLight"

    android:backgroundTint="@color/cyanea_primary_dark_reference"

    android:layout_marginTop="12dp"

    android:clipChildren="false"

    android:clipToPadding="false"

    app:cardElevation="2dp">

    app:cardElevation="0dp">



    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_width="match_parent"