Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d6d49e2 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '1101-Fix_wrong_color_issue' into 'main' 

1101-Fix_wrong_color_issue

See merge request !38
parents f33e87bc c5ae07c0

app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java

+1 −15
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ public class BrandingUtil { 


    @ColorInt

    public static int readBrandMainColor(@NonNull Context context) {

        final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());

        Log.v(TAG, "--- Read: shared_preference_theme_main");

        return sharedPreferences.getInt(pref_key_branding_main, context.getApplicationContext().getResources().getColor(R.color.defaultBrand));

        return ContextCompat.getColor(context, R.color.defaultBrand);

    }



    @ColorInt
@@ -162,21 +160,9 @@ public class BrandingUtil { 
    }



    public static void tintMenuIcon(@NonNull MenuItem menuItem, @ColorInt int color) {

        var drawable = menuItem.getIcon();

        if (drawable != null) {

            drawable = DrawableCompat.wrap(drawable);

            DrawableCompat.setTint(drawable, color);

            menuItem.setIcon(drawable);

        }

    }



    public static void applyBrandToLayerDrawable(@NonNull LayerDrawable check, @IdRes int areaToColor, @ColorInt int mainColor) {

        final var drawable = check.findDrawableByLayerId(areaToColor);

        if (drawable == null) {

            Log.e(TAG, "Could not find areaToColor (" + areaToColor + "). Cannot apply brand.");

        } else {

            DrawableCompat.setTint(drawable, mainColor);

        }

    }



    @ColorInt

app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java

+2 −7
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ import static it.niedermann.owncloud.notes.shared.util.WidgetUtil.pendingIntentF 
import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import trikita.log.Log;
@@ -20,10 +19,8 @@ import android.view.View; 
import android.widget.ScrollView;



import androidx.annotation.CallSuper;

import androidx.annotation.ColorInt;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.core.content.ContextCompat;

import androidx.core.content.pm.ShortcutInfoCompat;

import androidx.core.content.pm.ShortcutManagerCompat;

import androidx.core.graphics.drawable.IconCompat;
@@ -37,7 +34,6 @@ import java.util.Calendar; 
import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;



import it.niedermann.android.util.ColorUtil;

import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.accountpicker.AccountPickerDialogFragment;

import it.niedermann.owncloud.notes.branding.BrandedFragment;
@@ -53,7 +49,6 @@ import it.niedermann.owncloud.notes.shared.model.DBStatus; 
import it.niedermann.owncloud.notes.shared.model.ISyncCallback;

import it.niedermann.owncloud.notes.shared.util.ApiVersionUtil;

import it.niedermann.owncloud.notes.shared.util.NoteUtil;

import it.niedermann.owncloud.notes.shared.util.NotesColorUtil;

import it.niedermann.owncloud.notes.shared.util.ShareUtil;



public abstract class BaseNoteFragment extends BrandedFragment implements CategoryDialogListener, EditTitleListener {
@@ -201,7 +196,7 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego 
    }



    private void prepareFavoriteOption(MenuItem item) {

        item.setIcon(note.getFavorite() ? R.drawable.ic_star_accent_24dp : R.drawable.ic_star_border_accent_24dp);

        item.setIcon(note.getFavorite() ? R.drawable.ic_star_golden_24dp : R.drawable.ic_star_border_24dp);

        item.setChecked(note.getFavorite());

        tintMenuIcon(item, colorAccent);

    }
@@ -252,7 +247,7 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego 
                if (ShortcutManagerCompat.isRequestPinShortcutSupported(context)) {

                    final var pinShortcutInfo = new ShortcutInfoCompat.Builder(context, String.valueOf(note.getId()))

                            .setShortLabel(note.getTitle())

                            .setIcon(IconCompat.createWithResource(context.getApplicationContext(), TRUE.equals(note.getFavorite()) ? R.drawable.ic_star_accent_24dp : R.drawable.ic_star_border_accent_24dp))

                            .setIcon(IconCompat.createWithResource(context.getApplicationContext(), TRUE.equals(note.getFavorite()) ? R.drawable.ic_star_golden_24dp : R.drawable.ic_star_border_24dp))

                            .setIntent(new Intent(getActivity(), EditNoteActivity.class).putExtra(EditNoteActivity.PARAM_NOTE_ID, note.getId()).setAction(ACTION_SHORTCUT))

                            .build();

app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -606,10 +606,8 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 


        binding.headerView.setBackgroundColor(mainColor);

        binding.appName.setTextColor(textColor);

        activityBinding.progressCircular.getIndeterminateDrawable().setColorFilter(getSecondaryForegroundColorDependingOnTheme(this, mainColor), PorterDuff.Mode.SRC_IN);



        // TODO We assume, that the background of the spinner is always white

        activityBinding.swiperefreshlayout.setColorSchemeColors(contrastRatioIsSufficient(Color.WHITE, mainColor) ? mainColor : Color.BLACK);

        binding.appName.setTextColor(textColor);



        adapter.applyBrand(mainColor, textColor);

app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java

+2 −2
Original line number Diff line number Diff line
@@ -318,8 +318,8 @@ public class MainViewModel extends AndroidViewModel { 


    private static List<NavigationItem> fromCategoriesWithNotesCount(@NonNull Context context, @Nullable String expandedCategory, @NonNull List<CategoryWithNotesCount> fromDatabase, int count, int favoritesCount) {

        final var categories = convertToCategoryNavigationItem(context, fromDatabase);

        final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT);

        final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_grey_24dp, FAVORITES);

        final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.ic_access_time_24dp, RECENT);

        final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_24dp, FAVORITES);



        final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);

        items.add(itemRecent);

app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java

+0 −8
Original line number Diff line number Diff line
@@ -81,14 +81,6 @@ public class MultiSelectedActionModeCallback implements Callback { 
        // inflate contextual menu

        mode.getMenuInflater().inflate(R.menu.menu_list_context_multiple, menu);

        menu.findItem(R.id.menu_move).setVisible(canMoveNoteToAnotherAccounts);

        for (int i = 0; i < menu.size(); i++) {

            var drawable = menu.getItem(i).getIcon();

            if (drawable != null) {

                drawable = DrawableCompat.wrap(drawable);

                DrawableCompat.setTint(drawable, colorAccent);

                menu.getItem(i).setIcon(drawable);

            }

        }

        return true;

    }