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

Commit 3992bf85 authored by Fahim's avatar Fahim Committed by Fahim Salam Chowdhury
Browse files

2829-P,Q-Dark mode implementation 

- Enable dark-mode
- Fix colour mismatch issues
parent 245be5d7

app/src/main/AndroidManifest.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ 
            android:name=".edit.EditNoteActivity"

            android:name=".edit.EditNoteActivity"

            android:label="@string/simple_edit"

            android:label="@string/simple_edit"

            android:launchMode="singleTask"

            android:launchMode="singleTask"

            android:theme="@style/Preferences"

            android:parentActivityName=".main.MainActivity"

            android:parentActivityName=".main.MainActivity"

            android:windowSoftInputMode="stateHidden"

            android:windowSoftInputMode="stateHidden"

            android:exported="true">

            android:exported="true">
@@ -110,6 +111,7 @@ 
        <activity

        <activity

            android:name=".about.AboutActivity"

            android:name=".about.AboutActivity"

            android:label="@string/simple_about"

            android:label="@string/simple_about"

            android:theme="@style/Preferences"

            android:parentActivityName=".main.MainActivity" />

            android:parentActivityName=".main.MainActivity" />





        <activity android:name=".widget.singlenote.SingleNoteWidgetConfigurationActivity"

        <activity android:name=".widget.singlenote.SingleNoteWidgetConfigurationActivity"

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

+1 −10
Original line number Original line Diff line number Diff line
@@ -20,12 +20,10 @@ public class NotesApplication extends Application { 
    private static boolean lockedPreference = false;

    private static boolean lockedPreference = false;

    private static boolean isLocked = true;

    private static boolean isLocked = true;

    private static long lastInteraction = 0;

    private static long lastInteraction = 0;

    private static String PREF_KEY_THEME;

    private static boolean isGridViewEnabled = false;

    private static boolean isGridViewEnabled = false;





    @Override

    @Override

    public void onCreate() {

    public void onCreate() {

        PREF_KEY_THEME = getString(R.string.pref_key_theme);

        setAppTheme(getAppTheme(getApplicationContext()));

        setAppTheme(getAppTheme(getApplicationContext()));

        final var prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

        final var prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

        lockedPreference = prefs.getBoolean(getString(R.string.pref_key_lock), false);

        lockedPreference = prefs.getBoolean(getString(R.string.pref_key_lock), false);
@@ -46,14 +44,7 @@ public class NotesApplication extends Application { 
    }

    }





    public static DarkModeSetting getAppTheme(Context context) {

    public static DarkModeSetting getAppTheme(Context context) {

        final var prefs = PreferenceManager.getDefaultSharedPreferences(context);

        String mode = DarkModeSetting.SYSTEM_DEFAULT.name();

        String mode;

        try {

            mode = prefs.getString(PREF_KEY_THEME, DarkModeSetting.SYSTEM_DEFAULT.name());

        } catch (ClassCastException e) {

            final boolean darkModeEnabled = prefs.getBoolean(PREF_KEY_THEME, false);

            mode = darkModeEnabled ? DarkModeSetting.DARK.name() : DarkModeSetting.LIGHT.name();

        }

        return DarkModeSetting.valueOf(mode);

        return DarkModeSetting.valueOf(mode);

    }

    }

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

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

package it.niedermann.owncloud.notes.preferences;





import android.app.Activity;

import android.app.Activity;

import android.content.Context;

import android.os.Bundle;

import android.os.Bundle;

import android.util.Log;

import android.util.Log;





import androidx.annotation.ColorInt;

import androidx.annotation.ColorInt;

import androidx.annotation.Nullable;

import androidx.core.app.ActivityCompat;

import androidx.lifecycle.ViewModelProvider;

import androidx.lifecycle.ViewModelProvider;

import androidx.preference.ListPreference;

import androidx.preference.Preference;

import androidx.preference.Preference;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceFragmentCompat;
@@ -85,15 +81,6 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Bra 
            Log.e(TAG, "Could not find \"" + getString(R.string.pref_key_lock) + "\"-preference.");

            Log.e(TAG, "Could not find \"" + getString(R.string.pref_key_lock) + "\"-preference.");

        }

        }





        final var themePref = findPreference(getString(R.string.pref_key_theme));

        assert themePref != null;

        themePref.setOnPreferenceChangeListener((preference, newValue) -> {

            NotesApplication.setAppTheme(DarkModeSetting.valueOf((String) newValue));

            viewModel.resultCode$.setValue(Activity.RESULT_OK);

            ActivityCompat.recreate(requireActivity());

            return true;

        });



        wifiOnlyPref = findPreference(getString(R.string.pref_key_wifi_only));

        wifiOnlyPref = findPreference(getString(R.string.pref_key_wifi_only));

        assert wifiOnlyPref != null;

        assert wifiOnlyPref != null;

        wifiOnlyPref.setOnPreferenceChangeListener((preference, newValue) -> {

        wifiOnlyPref.setOnPreferenceChangeListener((preference, newValue) -> {

app/src/main/res/drawable/ic_add_blue_24dp.xml

+2 −2
Original line number Original line Diff line number Diff line 
<vector android:autoMirrored="true"

<vector android:autoMirrored="true"

    android:height="24dp"

    android:height="24dp"

    android:tint="#0082C9"

    android:tint="@color/accent"

    android:viewportHeight="24.0"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

    android:viewportWidth="24.0"

    android:width="24dp"

    android:width="24dp"

    xmlns:android="http://schemas.android.com/apk/res/android">

    xmlns:android="http://schemas.android.com/apk/res/android">

    <path

    <path

        android:fillColor="#FF0082C9"

        android:fillColor="@color/accent_color"

        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />

        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />

</vector>
 
</vector>

app/src/main/res/drawable/ic_more_24.xml

0 → 100644
+9 −0
Original line number Original line Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="@color/accent"

      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>

</vector>