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

Commit 0f375eed authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'issue_1763' into 'master' 

Use system accent color in all app

See merge request e/apps/pdfviewer!2
parents a5f81894 94034e33

app/src/main/java/com/gsnathan/pdfviewer/AboutActivity.java

+53 −0
Original line number Diff line number Diff line
@@ -24,14 +24,23 @@ 


package com.gsnathan.pdfviewer;



import android.graphics.PorterDuff;

import android.graphics.PorterDuffColorFilter;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;



import androidx.annotation.ColorInt;

import androidx.appcompat.app.AppCompatActivity;

import androidx.appcompat.widget.Toolbar;

import androidx.core.content.ContextCompat;



import android.view.MenuItem;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.TextView;



import com.franmontiel.attributionpresenter.AttributionPresenter;
@@ -52,6 +61,19 @@ public class AboutActivity extends CyaneaAppCompatActivity { 
        setContentView(R.layout.activity_about);

        initUI();

        setUpToolBar();



        updateAccentColor();



        setTextViewDrawableColor(((TextView) findViewById(R.id.introView)), MainActivity.ACCENT_COLOR);

        setTextViewDrawableColor(((TextView) findViewById(R.id.changeView)), MainActivity.ACCENT_COLOR);

        setTextViewDrawableColor((TextView) findViewById(R.id.licenseView), MainActivity.ACCENT_COLOR);

        setTextViewDrawableColor((TextView) findViewById(R.id.privacyView), MainActivity.ACCENT_COLOR);

        setTextViewDrawableColor((TextView) findViewById(R.id.codeView), MainActivity.ACCENT_COLOR);

        setTextViewDrawableColor((TextView) findViewById(R.id.libView), MainActivity.ACCENT_COLOR);

        setTextViewDrawableColor((TextView) findViewById(R.id.emailView), MainActivity.ACCENT_COLOR);

        setTextViewDrawableColor((TextView) findViewById(R.id.gitView), MainActivity.ACCENT_COLOR);





    }



    private void setUpToolBar() {
@@ -63,6 +85,8 @@ public class AboutActivity extends CyaneaAppCompatActivity { 


    private void initUI() {

        //initialize the textview





        versionView = (TextView) findViewById(R.id.versionTextView);

        //initialize the toolbar

        toolbar = (Toolbar) findViewById(R.id.toolbar_about);
@@ -75,7 +99,14 @@ public class AboutActivity extends CyaneaAppCompatActivity { 
            versionView.setText(APP_VERSION_RELEASE);

        }

    }

    private void setTextViewDrawableColor(TextView textView, int color) {



        for (Drawable drawable : textView.getCompoundDrawablesRelative()) {

            if (drawable != null) {

                drawable.setTint(color);

            }

        }

    }

    public void replayIntro(View v) {

        //navigate to intro class (replay the intro)

        startActivity(Utils.navIntent(getApplicationContext(), MainIntroActivity.class));
@@ -224,4 +255,26 @@ public class AboutActivity extends CyaneaAppCompatActivity { 
        return false;

    }



    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/com/gsnathan/pdfviewer/MainActivity.java

+52 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ package com.gsnathan.pdfviewer; 
import android.Manifest;

import android.annotation.SuppressLint;

import android.content.ActivityNotFoundException;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.SharedPreferences;
@@ -34,8 +35,10 @@ import android.content.pm.PackageManager; 
import android.database.Cursor;

import android.graphics.Color;

import android.graphics.PorterDuff;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Build;

import android.os.Environment;

import android.os.Handler;

import android.os.StrictMode;
@@ -46,8 +49,10 @@ import android.print.PrintJob; 
import android.print.PrintManager;

import android.provider.OpenableColumns;



import androidx.annotation.ColorInt;

import androidx.annotation.NonNull;

import androidx.appcompat.app.AlertDialog;

import androidx.appcompat.view.ContextThemeWrapper;

import androidx.core.app.ActivityCompat;

import androidx.core.content.ContextCompat;
@@ -55,8 +60,11 @@ import android.os.Bundle; 


import android.text.InputType;

import android.util.Log;

import android.util.TypedValue;

import android.view.Menu;

import android.view.MenuItem;

import android.view.Window;

import android.view.WindowManager;

import android.widget.EditText;

import android.widget.Toast;
@@ -106,6 +114,7 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 


    @ViewById

    PDFView pdfView;

    public static int ACCENT_COLOR=0;



    @SuppressLint("ClickableViewAccessibility")

    @Override
@@ -129,6 +138,8 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 
        RateThisApp.init(config);

        RateThisApp.onCreate(this);

        RateThisApp.showRateDialogIfNeeded(this);



        ACCENT_COLOR=fetchAccentColor(this);

    }



    private void onFirstInstall() {
@@ -501,6 +512,7 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 
        getMenuInflater().inflate(R.menu.menu, menu);



        BottomNavigationView bot_view = (BottomNavigationView) findViewById(R.id.bottom_navigation);

        bot_view.setBackgroundColor(ACCENT_COLOR);

        Menu bottomMenu = bot_view.getMenu();



        for (int i = 0; i < bottomMenu.size() - 1; i++) {
@@ -553,9 +565,9 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 
            case R.id.action_about:

                startActivity(Utils.navIntent(this, AboutActivity.class));

                return true;

            case R.id.theme:

                startActivity(Utils.navIntent(getApplicationContext(), CyaneaSettingsActivity.class));

                return true;

//            case R.id.theme:

//                startActivity(Utils.navIntent(getApplicationContext(), CyaneaSettingsActivity.class));

//                return true;

            case R.id.settings:

                navToSettings();

                return true;
@@ -577,5 +589,42 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 
        view.animate().translationY(0).setDuration(100);



    }





    /*

     * get Accent color from OS

     * */

    private int fetchAccentColor(Context context) {



        TypedValue typedValue = new TypedValue();

        ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this,

                android.R.style.Theme_DeviceDefault);

        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,

                typedValue, true);

        int color_accent = typedValue.data;

        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color_accent));



        //change toolbar color

        getSupportActionBar().setBackgroundDrawable(

                new ColorDrawable(color_accent));



        //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(color_accent));

        }



        return color_accent;

    }



    @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);

    }



}

app/src/main/java/com/gsnathan/pdfviewer/SettingsActivity.java

+29 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ import android.content.Context; 
import android.content.Intent;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.drawable.ColorDrawable;

import android.os.Build;

import android.os.Bundle;

import android.preference.Preference;

import android.preference.PreferenceActivity;
@@ -12,7 +14,10 @@ import android.preference.PreferenceManager; 
import android.util.Log;

import android.util.TypedValue;

import android.view.MenuItem;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.ColorInt;

import androidx.core.app.NavUtils;



/**
@@ -76,6 +81,8 @@ public class SettingsActivity extends AppCompatPreferenceActivity { 
            }

        });



        updateAccentColor();



    }



    private void setupActionBar() {
@@ -120,4 +127,26 @@ public class SettingsActivity extends AppCompatPreferenceActivity { 
                & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;

    }



    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);

    }





}

app/src/main/res/menu/menu.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ 
        android:orderInCategory="2"

        app:showAsAction="never"  />



    <item

    <!--<item

        android:id="@+id/theme"

        android:orderInCategory="1"

        android:title="@string/theme_picker"

        app:showAsAction="never" />

        app:showAsAction="never" />-->

</menu>
 
 No newline at end of file