Commit 635dc94b authored by Thomas's avatar Thomas
Browse files

new colors

parent f29122e3

app/src/main/AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -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"

app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {

app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -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)

app/src/main/java/app/fedilab/android/activities/ProfileActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

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

+1 −2
Original line number Diff line number Diff line
@@ -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);