diff options
Diffstat (limited to 'src/distractionless/ui')
| -rw-r--r-- | src/distractionless/ui/apps.cljd | 11 | ||||
| -rw-r--r-- | src/distractionless/ui/apps/settings.cljd | 30 | ||||
| -rw-r--r-- | src/distractionless/ui/constants.cljd | 5 |
3 files changed, 20 insertions, 26 deletions
diff --git a/src/distractionless/ui/apps.cljd b/src/distractionless/ui/apps.cljd index 7fd620c..02679ac 100644 --- a/src/distractionless/ui/apps.cljd +++ b/src/distractionless/ui/apps.cljd @@ -6,7 +6,7 @@ [distractionless.ui.apps.settings :as duasettings])) (defn load-installed-apps! [a] - (reset! a (await (apps/InstalledApps.getInstalledApps)))) + (reset! a (await (apps/InstalledApps.getInstalledApps false)))) (defn- render-app [app config-file ctx reloader] (m/ListTile @@ -15,12 +15,7 @@ .onTap #(do (await (apps/InstalledApps.startApp (.-packageName app))) nil) .onLongPress #(duasettings/open app config-file ctx reloader))) -(defn apps-list [apps query config-file ctx reloader] +(defn apps-list [apps config-file ctx reloader] (m/ListView - .children (for [app (if (cstr/blank? query) - apps - (filter #(cstr/includes? - (cstr/lower-case (.-name %)) - (cstr/lower-case query)) - apps))] + .children (for [app apps] (render-app app config-file ctx reloader)))) diff --git a/src/distractionless/ui/apps/settings.cljd b/src/distractionless/ui/apps/settings.cljd index 1b4de0a..c6d1c67 100644 --- a/src/distractionless/ui/apps/settings.cljd +++ b/src/distractionless/ui/apps/settings.cljd @@ -15,21 +15,21 @@ .iconSize 30.0)])) (defn- favourite-setting [app config-file reloader] - (m/Row - .children [(m/Checkbox - .value (contains? (get (dconfig/read-from-file config-file) "favourites") - (.-packageName app)) - .onChanged (fn [new-val] - (if new-val - (dconfig/update-config! config-file - #(update % "favourites" conj (.-packageName app)) - reloader) - (dconfig/update-config! config-file - (fn [config] - (update config "favourites" disj (.-packageName app))) - reloader))) - .activeColor duconstants/checkbox-active-color) - (m/Text "Favorit")])) + (m/CheckboxListTile + .title (m/Text "Favorit" + .style duconstants/text-style) + .value (contains? (get (dconfig/read-from-file config-file) "favourites") + (.-packageName app)) + .onChanged (fn [new-val] + (if new-val + (dconfig/update-config! config-file + #(update % "favourites" conj (.-packageName app)) + reloader) + (dconfig/update-config! config-file + (fn [config] + (update config "favourites" disj (.-packageName app))) + reloader))) + .activeColor duconstants/checkbox-active-color)) (defn open [app config-file ctx reloader] (m/showDialog diff --git a/src/distractionless/ui/constants.cljd b/src/distractionless/ui/constants.cljd index 505778f..f08b24b 100644 --- a/src/distractionless/ui/constants.cljd +++ b/src/distractionless/ui/constants.cljd @@ -1,9 +1,8 @@ (ns distractionless.ui.constants (:require ["package:flutter/material.dart" :as m])) -(def background-color (m/Color.fromARGB 255 157 166 159)) -(def search-bar-color (m/Color.fromARGB 255 138 150 141)) -(def text-color (m/Color.fromARGB 255 0 0 0)) +(def background-color (m/Color.fromARGB 255 208 255 254)) +(def text-color (m/Color.fromARGB 255 55 55 55)) (def checkbox-active-color (m/Color.fromARGB 255 86 93 86)) (def checkbox-fill-color (m/Color.fromARGB 255 197 205 199)) |