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

Commit 8449cfdd authored by Narinder Rana's avatar Narinder Rana Committed by Fahim Salam Chowdhury
Browse files

Manage Accent color all Activity, Feb button, navigation drawer, some Button

parent b1d9da78

app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java

+28 −0
Original line number Diff line number Diff line 
package it.niedermann.owncloud.notes.about;



import android.graphics.drawable.ColorDrawable;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.ColorInt;

import androidx.appcompat.app.AppCompatActivity;



import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.main.MainActivity;



public class AboutActivity extends AppCompatActivity {

    @Override
@@ -12,5 +18,27 @@ public class AboutActivity extends AppCompatActivity { 
        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_about);

        getFragmentManager().beginTransaction().replace(R.id.container, new AboutFragment()).commit();

        updateAccentColor();

    }



    private void updateAccentColor() {

        //change toolbar color

        getSupportActionBar().setBackgroundDrawable(

                new ColorDrawable(MainActivity.ACCENT_COLOR));



        //change status bar color

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(darkenColor(MainActivity.ACCENT_COLOR));

        }

    }



    @ColorInt

    int darkenColor(@ColorInt int color) {

        float[] hsv = new float[3];

        android.graphics.Color.colorToHSV(color, hsv);

        hsv[2] *= 0.8f;

        return android.graphics.Color.HSVToColor(hsv);

    }

}
 
 No newline at end of file

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

+27 −0
Original line number Diff line number Diff line
@@ -3,14 +3,18 @@ package it.niedermann.owncloud.notes.edit; 
import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.FAVORITES;



import android.content.Intent;

import android.graphics.drawable.ColorDrawable;

import android.os.Build;

import android.os.Bundle;

import android.text.TextUtils;

import android.util.Log;

import android.view.Menu;

import android.view.MenuItem;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Toast;



import androidx.annotation.ColorInt;

import androidx.annotation.NonNull;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.ViewModelProvider;
@@ -92,6 +96,8 @@ public class EditNoteActivity extends LockedActivity implements BaseNoteFragment 


        setSupportActionBar(binding.toolbar);

        binding.toolbar.setOnClickListener((v) -> fragment.showEditTitleDialog());



        updateAccentColor();

    }



    @Override
@@ -316,4 +322,25 @@ public class EditNoteActivity extends LockedActivity implements BaseNoteFragment 
    public void applyBrand(int mainColor, int textColor) {

        applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar);

    }



    private void updateAccentColor(){

        //change toolbar color

        getSupportActionBar().setBackgroundDrawable(

                new ColorDrawable(MainActivity.ACCENT_COLOR));



        //change status bar color

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(darkenColor(MainActivity.ACCENT_COLOR));

        }

    }



    @ColorInt

    int darkenColor(@ColorInt int color) {

        float[] hsv = new float[3];

        android.graphics.Color.colorToHSV(color, hsv);

        hsv[2] *= 0.8f;

        return android.graphics.Color.HSVToColor(hsv);

    }

}
 
 No newline at end of file

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

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.animation.AnimatorInflater; 
import android.app.SearchManager;

import android.content.Context;

import android.content.Intent;

import android.content.res.ColorStateList;

import android.graphics.Color;

import android.graphics.PorterDuff;

import android.graphics.drawable.ColorDrawable;
@@ -369,6 +370,7 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 
        });



        ACCENT_COLOR= fetchAccentColor(this);

        fabCreate.setBackgroundTintList(ColorStateList.valueOf(darkenColor20(ACCENT_COLOR)));

    }



    @Override
@@ -868,4 +870,11 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 
        hsv[2] *= 0.8f;

        return android.graphics.Color.HSVToColor(hsv);

    }



    @ColorInt int darkenColor20(@ColorInt int color) {

        float[] hsv = new float[3];

        android.graphics.Color.colorToHSV(color, hsv);

        hsv[2] *= 0.6f;

        return android.graphics.Color.HSVToColor(hsv);

    }

}

app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java

+29 −0
Original line number Diff line number Diff line 
package it.niedermann.owncloud.notes.preferences;



import android.graphics.drawable.ColorDrawable;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.ColorInt;

import androidx.annotation.Nullable;

import androidx.lifecycle.ViewModelProvider;



import it.niedermann.owncloud.notes.LockedActivity;

import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.databinding.ActivityPreferencesBinding;

import it.niedermann.owncloud.notes.main.MainActivity;



public class PreferencesActivity extends LockedActivity {
@@ -28,6 +34,29 @@ public class PreferencesActivity extends LockedActivity { 
        getSupportFragmentManager().beginTransaction()

                .replace(R.id.fragment_container_view, new PreferencesFragment())

                .commit();



        updateAccentColor();

    }



    private void updateAccentColor(){

        //change toolbar color

        getSupportActionBar().setBackgroundDrawable(

                new ColorDrawable(MainActivity.ACCENT_COLOR));



        //change status bar color

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(darkenColor(MainActivity.ACCENT_COLOR));

        }

    }



    @ColorInt

    int darkenColor(@ColorInt int color) {

        float[] hsv = new float[3];

        android.graphics.Color.colorToHSV(color, hsv);

        hsv[2] *= 0.8f;

        return android.graphics.Color.HSVToColor(hsv);

    }



    @Override

app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java

+29 −0
Original line number Diff line number Diff line
@@ -3,10 +3,15 @@ package it.niedermann.owncloud.notes.widget.notelist; 
import android.app.Activity;

import android.appwidget.AppWidgetManager;

import android.content.Intent;

import android.graphics.drawable.ColorDrawable;

import android.os.Build;

import android.os.Bundle;

import android.util.Log;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Toast;



import androidx.annotation.ColorInt;

import androidx.annotation.Nullable;

import androidx.lifecycle.ViewModelProvider;
@@ -21,6 +26,7 @@ import it.niedermann.owncloud.notes.LockedActivity; 
import it.niedermann.owncloud.notes.NotesApplication;

import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.databinding.ActivityNoteListConfigurationBinding;

import it.niedermann.owncloud.notes.main.MainActivity;

import it.niedermann.owncloud.notes.main.navigation.NavigationAdapter;

import it.niedermann.owncloud.notes.main.navigation.NavigationClickListener;

import it.niedermann.owncloud.notes.main.navigation.NavigationItem;
@@ -139,9 +145,32 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity { 
            }

            runOnUiThread(() -> viewModel.getAdapterCategories(localAccount.getId()).observe(this, (navigationItems) -> adapterCategories.setItems(navigationItems)));

        });



        updateAccentColor();

    }



    @Override

    public void applyBrand(int mainColor, int textColor) {

    }



    private void updateAccentColor(){

        //change toolbar color

        getSupportActionBar().setBackgroundDrawable(

                new ColorDrawable(MainActivity.ACCENT_COLOR));



        //change status bar color

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(darkenColor(MainActivity.ACCENT_COLOR));

        }

    }



    @ColorInt

    int darkenColor(@ColorInt int color) {

        float[] hsv = new float[3];

        android.graphics.Color.colorToHSV(color, hsv);

        hsv[2] *= 0.8f;

        return android.graphics.Color.HSVToColor(hsv);

    }

}