From 1691dd4ae03edb9307b54737d4f1e954166247b4 Mon Sep 17 00:00:00 2001 From: Ismael Date: Sun, 2 Jan 2022 22:40:19 +0100 Subject: [PATCH 1/4] Fix for the status bar --- ActivityLauncherApp/build.gradle | 2 ++ .../activitylauncher/MainActivity.java | 6 ++++-- .../src/main/res/menu/main.xml | 12 +++++------ .../src/main/res/values-night/colors.xml | 7 +++++++ .../src/main/res/values-v29/styles.xml | 10 ---------- .../src/main/res/values/attrs.xml | 7 +++++++ .../src/main/res/values/colors.xml | 7 +++++++ .../src/main/res/values/styles.xml | 20 ------------------- .../src/main/res/values/themes.xml | 9 +++++++++ 9 files changed, 42 insertions(+), 38 deletions(-) create mode 100644 ActivityLauncherApp/src/main/res/values-night/colors.xml delete mode 100644 ActivityLauncherApp/src/main/res/values-v29/styles.xml create mode 100644 ActivityLauncherApp/src/main/res/values/attrs.xml create mode 100644 ActivityLauncherApp/src/main/res/values/colors.xml delete mode 100644 ActivityLauncherApp/src/main/res/values/styles.xml create mode 100644 ActivityLauncherApp/src/main/res/values/themes.xml diff --git a/ActivityLauncherApp/build.gradle b/ActivityLauncherApp/build.gradle index 070f0ad..6bf261c 100644 --- a/ActivityLauncherApp/build.gradle +++ b/ActivityLauncherApp/build.gradle @@ -32,4 +32,6 @@ android { dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.fragment:fragment:1.4.0' + implementation 'androidx.appcompat:appcompat:1.4.0' + implementation 'com.google.android.material:material:1.4.0' } diff --git a/ActivityLauncherApp/src/main/java/de/szalkowski/activitylauncher/MainActivity.java b/ActivityLauncherApp/src/main/java/de/szalkowski/activitylauncher/MainActivity.java index f5a15cf..0890727 100644 --- a/ActivityLauncherApp/src/main/java/de/szalkowski/activitylauncher/MainActivity.java +++ b/ActivityLauncherApp/src/main/java/de/szalkowski/activitylauncher/MainActivity.java @@ -1,5 +1,6 @@ package de.szalkowski.activitylauncher; +import android.app.SearchManager; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -8,13 +9,14 @@ import android.view.Menu; import android.view.MenuItem; import android.widget.Filter; import android.widget.Filterable; -import android.widget.SearchView; +import androidx.appcompat.widget.SearchView; import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentActivity; -public class MainActivity extends FragmentActivity { +public class MainActivity extends AppCompatActivity { private Filterable filterTarget = null; diff --git a/ActivityLauncherApp/src/main/res/menu/main.xml b/ActivityLauncherApp/src/main/res/menu/main.xml index 52e2fd0..8987e8e 100644 --- a/ActivityLauncherApp/src/main/res/menu/main.xml +++ b/ActivityLauncherApp/src/main/res/menu/main.xml @@ -1,20 +1,20 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:showAsAction="collapseActionView|ifRoom" + app:actionViewClass="androidx.appcompat.widget.SearchView" /> diff --git a/ActivityLauncherApp/src/main/res/values-night/colors.xml b/ActivityLauncherApp/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..6036e51 --- /dev/null +++ b/ActivityLauncherApp/src/main/res/values-night/colors.xml @@ -0,0 +1,7 @@ + + + #212121 + #484848 + #000000 + #ffffff + \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values-v29/styles.xml b/ActivityLauncherApp/src/main/res/values-v29/styles.xml deleted file mode 100644 index 17aa21b..0000000 --- a/ActivityLauncherApp/src/main/res/values-v29/styles.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/ActivityLauncherApp/src/main/res/values/attrs.xml b/ActivityLauncherApp/src/main/res/values/attrs.xml new file mode 100644 index 0000000..1272456 --- /dev/null +++ b/ActivityLauncherApp/src/main/res/values/attrs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values/colors.xml b/ActivityLauncherApp/src/main/res/values/colors.xml new file mode 100644 index 0000000..ab7393e --- /dev/null +++ b/ActivityLauncherApp/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + #fafafa + #ffffff + #c7c7c7 + #000000 + \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values/styles.xml b/ActivityLauncherApp/src/main/res/values/styles.xml deleted file mode 100644 index 01339af..0000000 --- a/ActivityLauncherApp/src/main/res/values/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/ActivityLauncherApp/src/main/res/values/themes.xml b/ActivityLauncherApp/src/main/res/values/themes.xml new file mode 100644 index 0000000..638f2a1 --- /dev/null +++ b/ActivityLauncherApp/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file From 1e20587c266cf51e08a9686246ca9c6eca8edfcd Mon Sep 17 00:00:00 2001 From: Ismael Date: Sun, 2 Jan 2022 22:44:33 +0100 Subject: [PATCH 2/4] Removed unused implementation --- ActivityLauncherApp/build.gradle | 1 - .../src/main/res/values-night/colors.xml | 12 ++++++------ .../src/main/res/values/attrs.xml | 12 ++++++------ .../src/main/res/values/colors.xml | 12 ++++++------ .../src/main/res/values/themes.xml | 16 ++++++++-------- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/ActivityLauncherApp/build.gradle b/ActivityLauncherApp/build.gradle index 6bf261c..9ddca02 100644 --- a/ActivityLauncherApp/build.gradle +++ b/ActivityLauncherApp/build.gradle @@ -33,5 +33,4 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.fragment:fragment:1.4.0' implementation 'androidx.appcompat:appcompat:1.4.0' - implementation 'com.google.android.material:material:1.4.0' } diff --git a/ActivityLauncherApp/src/main/res/values-night/colors.xml b/ActivityLauncherApp/src/main/res/values-night/colors.xml index 6036e51..8445adf 100644 --- a/ActivityLauncherApp/src/main/res/values-night/colors.xml +++ b/ActivityLauncherApp/src/main/res/values-night/colors.xml @@ -1,7 +1,7 @@ - - - #212121 - #484848 - #000000 - #ffffff + + + #212121 + #484848 + #000000 + #ffffff \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values/attrs.xml b/ActivityLauncherApp/src/main/res/values/attrs.xml index 1272456..9e292a7 100644 --- a/ActivityLauncherApp/src/main/res/values/attrs.xml +++ b/ActivityLauncherApp/src/main/res/values/attrs.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values/colors.xml b/ActivityLauncherApp/src/main/res/values/colors.xml index ab7393e..3a65b9d 100644 --- a/ActivityLauncherApp/src/main/res/values/colors.xml +++ b/ActivityLauncherApp/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ - - - #fafafa - #ffffff - #c7c7c7 - #000000 + + + #fafafa + #ffffff + #c7c7c7 + #000000 \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values/themes.xml b/ActivityLauncherApp/src/main/res/values/themes.xml index 638f2a1..ebfb8f8 100644 --- a/ActivityLauncherApp/src/main/res/values/themes.xml +++ b/ActivityLauncherApp/src/main/res/values/themes.xml @@ -1,9 +1,9 @@ - - - + + + \ No newline at end of file From df0ce3db47523be3b16d4eb3bf3c20d854a8f4bf Mon Sep 17 00:00:00 2001 From: Ismael Date: Sun, 2 Jan 2022 23:07:57 +0100 Subject: [PATCH 3/4] Fix showAsAction to avoid menu item to dissapear --- ActivityLauncherApp/src/main/res/menu/main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ActivityLauncherApp/src/main/res/menu/main.xml b/ActivityLauncherApp/src/main/res/menu/main.xml index 8987e8e..b9bc1a8 100644 --- a/ActivityLauncherApp/src/main/res/menu/main.xml +++ b/ActivityLauncherApp/src/main/res/menu/main.xml @@ -3,7 +3,7 @@ Date: Mon, 3 Jan 2022 10:34:42 +0100 Subject: [PATCH 4/4] Fix low contrast in itemList --- .../activitylauncher/AllTasksListAdapter.java | 2 ++ .../src/main/res/values-night/colors.xml | 11 +++++------ ActivityLauncherApp/src/main/res/values/attrs.xml | 11 +++++------ ActivityLauncherApp/src/main/res/values/colors.xml | 11 +++++------ ActivityLauncherApp/src/main/res/values/themes.xml | 8 ++++---- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ActivityLauncherApp/src/main/java/de/szalkowski/activitylauncher/AllTasksListAdapter.java b/ActivityLauncherApp/src/main/java/de/szalkowski/activitylauncher/AllTasksListAdapter.java index 9913ec8..35c6571 100644 --- a/ActivityLauncherApp/src/main/java/de/szalkowski/activitylauncher/AllTasksListAdapter.java +++ b/ActivityLauncherApp/src/main/java/de/szalkowski/activitylauncher/AllTasksListAdapter.java @@ -106,7 +106,9 @@ public class AllTasksListAdapter extends BaseExpandableListAdapter implements Fi if (activity.is_private) { text1.setEnabled(false); + text1.setAlpha(0.5f); text2.setEnabled(false); + text2.setAlpha(0.5f); ImageView icon1 = view.findViewById(android.R.id.icon1); icon1.setVisibility(View.VISIBLE); diff --git a/ActivityLauncherApp/src/main/res/values-night/colors.xml b/ActivityLauncherApp/src/main/res/values-night/colors.xml index 8445adf..daa0962 100644 --- a/ActivityLauncherApp/src/main/res/values-night/colors.xml +++ b/ActivityLauncherApp/src/main/res/values-night/colors.xml @@ -1,7 +1,6 @@ - - - #212121 - #484848 - #000000 - #ffffff + + + #222222 + #6d6d6d + #1b1b1b \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values/attrs.xml b/ActivityLauncherApp/src/main/res/values/attrs.xml index 9e292a7..40df6c4 100644 --- a/ActivityLauncherApp/src/main/res/values/attrs.xml +++ b/ActivityLauncherApp/src/main/res/values/attrs.xml @@ -1,7 +1,6 @@ - - - - - - + + + + + \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values/colors.xml b/ActivityLauncherApp/src/main/res/values/colors.xml index 3a65b9d..d102109 100644 --- a/ActivityLauncherApp/src/main/res/values/colors.xml +++ b/ActivityLauncherApp/src/main/res/values/colors.xml @@ -1,7 +1,6 @@ - - - #fafafa - #ffffff - #c7c7c7 - #000000 + + + #fafafa + #ffffff + #c7c7c7 \ No newline at end of file diff --git a/ActivityLauncherApp/src/main/res/values/themes.xml b/ActivityLauncherApp/src/main/res/values/themes.xml index ebfb8f8..16ffa5b 100644 --- a/ActivityLauncherApp/src/main/res/values/themes.xml +++ b/ActivityLauncherApp/src/main/res/values/themes.xml @@ -1,9 +1,9 @@ \ No newline at end of file