@@ -19,143 +19,6 @@ import com.squareup.moshi.Moshi
1919import com.squareup.moshi.Types
2020import java.lang.reflect.ParameterizedType
2121
22- private const val PREFS_FILENAME = " app.mlauncher.prefs"
23- private const val PREFS_JUNK_FILENAME = " app.mlauncher.prefs.junk"
24- private const val PREFS_ONBOARDING_FILENAME = " app.mlauncher.prefs.onboarding"
25-
26- private const val APP_VERSION = " APP_VERSION"
27- private const val LOCK_ORIENTATION = " LOCK_ORIENTATION"
28- private const val LOCK_ORIENTATION_PORTRAIT = " LOCK_ORIENTATION_PORTRAIT"
29- private const val HAPTIC_FEEDBACK = " HAPTIC_FEEDBACK"
30- private const val FIRST_OPEN = " FIRST_OPEN"
31- private const val FIRST_SETTINGS_OPEN = " FIRST_SETTINGS_OPEN"
32- private const val HOME_APPS_NUM = " HOME_APPS_NUM"
33- private const val HOME_PAGES_NUM = " HOME_PAGES_NUM"
34- private const val HOME_PAGES_PAGER = " HOME_PAGES_PAGER"
35- private const val AUTO_SHOW_KEYBOARD = " AUTO_SHOW_KEYBOARD"
36- private const val AUTO_OPEN_APP = " AUTO_OPEN_APP"
37- private const val OPEN_APP_ON_ENTER = " OPEN_APP_ON_ENTER"
38- private const val RECENT_APPS_DISPLAYED = " RECENT_APPS_DISPLAYED"
39- private const val ICON_RAINBOW_COLORS = " ICON_RAINBOW_COLORS"
40- private const val RECENT_COUNTER = " RECENT_COUNTER"
41- private const val FILTER_STRENGTH = " FILTER_STRENGTH"
42- private const val SHORT_SWIPE_THRESHOLD = " SHORT_SWIPE_THRESHOLD"
43- private const val LONG_SWIPE_THRESHOLD = " LONG_SWIPE_THRESHOLD"
44- private const val ENABLE_FILTER_STRENGTH = " ENABLE_FILTER_STRENGTH"
45- private const val HOME_ALIGNMENT = " HOME_ALIGNMENT"
46- private const val HOME_ALIGNMENT_BOTTOM = " HOME_ALIGNMENT_BOTTOM"
47- private const val HOME_CLICK_AREA = " HOME_CLICK_AREA"
48- private const val DRAWER_ALIGNMENT = " DRAWER_ALIGNMENT"
49- private const val CLOCK_ALIGNMENT = " CLOCK_ALIGNMENT"
50- private const val DATE_ALIGNMENT = " DATE_ALIGNMENT"
51- private const val ALARM_ALIGNMENT = " ALARM_ALIGNMENT"
52- private const val DAILY_WORD_ALIGNMENT = " DAILY_WORD_ALIGNMENT"
53- private const val SHOW_BACKGROUND = " SHOW_BACKGROUND"
54- private const val STATUS_BAR = " STATUS_BAR"
55- private const val NAVIGATION_BAR = " NAVIGATION_BAR"
56- private const val SHOW_BATTERY = " SHOW_BATTERY"
57- private const val SHOW_BATTERY_ICON = " SHOW_BATTERY_ICON"
58- private const val SHOW_WEATHER = " SHOW_WEATHER"
59- private const val GPS_LOCATION = " GPS_LOCATION"
60- private const val SHOW_AZSIDEBAR = " SHOW_AZSIDEBAR"
61- private const val SHOW_DATE = " SHOW_DATE"
62- private const val HOME_LOCKED = " HOME_LOCKED"
63- private const val SETTINGS_LOCKED = " SETTINGS_LOCKED"
64- private const val HIDE_SEARCH_VIEW = " HIDE_SEARCH_VIEW"
65- private const val AUTO_EXPAND_NOTES = " AUTO_EXPAND_NOTES"
66- private const val CLICK_EDIT_DELETE = " CLICK_EDIT_DELETE"
67- private const val SHOW_CLOCK = " SHOW_CLOCK"
68- private const val SHOW_CLOCK_FORMAT = " SHOW_CLOCK_FORMAT"
69- private const val SHOW_ALARM = " SHOW_ALARM"
70- private const val SHOW_DAILY_WORD = " SHOW_DAILY_WORD"
71- private const val SHOW_FLOATING = " SHOW_FLOATING"
72- private const val ICON_PACK_HOME = " ICON_PACK_HOME"
73- private const val CUSTOM_ICON_PACK_HOME = " CUSTOM_ICON_PACK_HOME"
74- private const val ICON_PACK_APP_LIST = " ICON_PACK_APP_LIST"
75- private const val CUSTOM_ICON_PACK_APP_LIST = " CUSTOM_ICON_PACK_APP_LIST"
76- private const val WORD_LIST = " WORD_LIST"
77- private const val SEARCH_START = " SEARCH_START"
78- private const val SWIPE_UP_ACTION = " SWIPE_UP_ACTION"
79- private const val SWIPE_DOWN_ACTION = " SWIPE_DOWN_ACTION"
80- private const val SWIPE_RIGHT_ACTION = " SWIPE_RIGHT_ACTION"
81- private const val SWIPE_LEFT_ACTION = " SWIPE_LEFT_ACTION"
82- private const val LONG_SWIPE_UP_ACTION = " LONG_SWIPE_UP_ACTION"
83- private const val LONG_SWIPE_DOWN_ACTION = " LONG_SWIPE_DOWN_ACTION"
84- private const val LONG_SWIPE_RIGHT_ACTION = " LONG_SWIPE_RIGHT_ACTION"
85- private const val LONG_SWIPE_LEFT_ACTION = " LONG_SWIPE_LEFT_ACTION"
86- private const val CLICK_CLOCK_ACTION = " CLICK_CLOCK_ACTION"
87- private const val CLICK_APP_USAGE_ACTION = " CLICK_APP_USAGE_ACTION"
88- private const val CLICK_FLOATING_ACTION = " CLICK_FLOATING_ACTION"
89- private const val CLICK_DATE_ACTION = " CLICK_DATE_ACTION"
90- private const val DOUBLE_TAP_ACTION = " DOUBLE_TAP_ACTION"
91- private const val HIDDEN_APPS = " HIDDEN_APPS"
92- private const val LOCKED_APPS = " LOCKED_APPS"
93- private const val PINNED_APPS = " PINNED_APPS"
94- private const val HIDDEN_CONTACTS = " HIDDEN_CONTACTS"
95- private const val PINNED_CONTACTS = " PINNED_CONTACTS"
96- private const val SEARCH_ENGINE = " SEARCH_ENGINE"
97- private const val LAUNCHER_FONT = " LAUNCHER_FONT"
98- private const val APP_NAME = " APP_NAME"
99- private const val APP_PACKAGE = " APP_PACKAGE"
100- private const val APP_USER = " APP_USER"
101- private const val APP_ALIAS = " APP_ALIAS"
102- private const val APP_ACTIVITY = " APP_ACTIVITY"
103- private const val APP_USAGE_STATS = " APP_USAGE_STATS"
104- private const val APP_OPACITY = " APP_OPACITY"
105- private const val APP_LANGUAGE = " APP_LANGUAGE"
106- private const val APP_THEME = " APP_THEME"
107- private const val TEMP_UNIT = " TEMP_UNIT"
108- private const val SHORT_SWIPE_UP = " SHORT_SWIPE_UP"
109- private const val SHORT_SWIPE_DOWN = " SHORT_SWIPE_DOWN"
110- private const val SHORT_SWIPE_LEFT = " SHORT_SWIPE_LEFT"
111- private const val SHORT_SWIPE_RIGHT = " SHORT_SWIPE_RIGHT"
112- private const val LONG_SWIPE_UP = " LONG_SWIPE_UP"
113- private const val LONG_SWIPE_DOWN = " LONG_SWIPE_DOWN"
114- private const val LONG_SWIPE_LEFT = " LONG_SWIPE_LEFT"
115- private const val LONG_SWIPE_RIGHT = " LONG_SWIPE_RIGHT"
116- private const val CLICK_CLOCK = " CLICK_CLOCK"
117- private const val CLICK_USAGE = " CLICK_USAGE"
118- private const val CLICK_FLOATING = " CLICK_FLOATING"
119- private const val CLICK_DATE = " CLICK_DATE"
120- private const val DOUBLE_TAP = " DOUBLE_TAP"
121- private const val APP_SIZE_TEXT = " APP_SIZE_TEXT"
122- private const val DATE_SIZE_TEXT = " DATE_SIZE_TEXT"
123- private const val CLOCK_SIZE_TEXT = " CLOCK_SIZE_TEXT"
124- private const val ALARM_SIZE_TEXT = " ALARM_SIZE_TEXT"
125- private const val DAILY_WORD_SIZE_TEXT = " DAILY_WORD_SIZE_TEXT"
126- private const val BATTERY_SIZE_TEXT = " BATTERY_SIZE_TEXT"
127- private const val TEXT_SIZE_SETTINGS = " TEXT_SIZE_SETTINGS"
128- private const val TEXT_PADDING_SIZE = " TEXT_PADDING_SIZE"
129-
130- private const val BACKGROUND_COLOR = " BACKGROUND_COLOR"
131- private const val APP_COLOR = " APP_COLOR"
132- private const val DATE_COLOR = " DATE_COLOR"
133- private const val ALARM_CLOCK_COLOR = " ALARM_CLOCK_COLOR"
134- private const val CLOCK_COLOR = " CLOCK_COLOR"
135- private const val BATTERY_COLOR = " BATTERY_COLOR"
136- private const val DAILY_WORD_COLOR = " DAILY_WORD_COLOR"
137- private const val SHORTCUT_ICONS_COLOR = " SHORTCUT_ICONS_COLOR"
138-
139- private const val NOTES_BACKGROUND_COLOR = " NOTES_BACKGROUND_COLOR"
140- private const val BUBBLE_BACKGROUND_COLOR = " BUBBLE_BACKGROUND_COLOR"
141- private const val BUBBLE_MESSAGE_COLOR = " BUBBLE_MESSAGE_COLOR"
142- private const val BUBBLE_TIMEDATE_COLOR = " BUBBLE_TIMEDATE_COLOR"
143- private const val BUBBLE_CATEGORY_COLOR = " BUBBLE_CATEGORY_COLOR"
144-
145- private const val INPUT_MESSAGE_COLOR = " INPUT_MESSAGE_COLOR"
146- private const val INPUT_MESSAGEHINT_COLOR = " INPUT_MESSAGEHINT_COLOR"
147-
148- private const val WEATHER_LATITUDE = " WEATHER_LATITUDE"
149- private const val WEATHER_LONGITUDE = " WEATHER_LONGITUDE"
150- private const val WEATHER_LOCATION = " WEATHER_LOCATION"
151-
152- private const val NOTES_MESSAGES = " NOTES_MESSAGES"
153- private const val NOTES_CATEGORY = " NOTES_CATEGORY"
154- private const val NOTES_PRIORITY = " NOTES_PRIORITY"
155-
156- private const val ONBOARDING_COMPLETED = " ONBOARDING_COMPLETED"
157- private const val EXPERT_OPTIONS = " EXPERT_OPTIONS"
158-
15922class Prefs (val context : Context ) {
16023 // Build Moshi instance once (ideally a singleton)
16124 val moshi: Moshi = Moshi .Builder ().build()
@@ -166,9 +29,8 @@ class Prefs(val context: Context) {
16629 val messageWrongListType: ParameterizedType = Types .newParameterizedType(List ::class .java, MessageWrong ::class .java)
16730 val messageWrongAdapter: JsonAdapter <List <MessageWrong >> = moshi.adapter(messageWrongListType)
16831
169- internal val prefsNormal: SharedPreferences = context.getSharedPreferences(PREFS_FILENAME , 0 )
170- internal val prefsJunk: SharedPreferences = context.getSharedPreferences(PREFS_JUNK_FILENAME , 0 )
171- internal val prefsOnboarding: SharedPreferences = context.getSharedPreferences(PREFS_ONBOARDING_FILENAME , 0 )
32+ internal val prefsNormal: SharedPreferences = context.getSharedPreferences(PREFS_FILENAME , Context .MODE_PRIVATE )
33+ internal val prefsOnboarding: SharedPreferences = context.getSharedPreferences(PREFS_ONBOARDING_FILENAME , Context .MODE_PRIVATE )
17234 internal val pinnedAppsKey = PINNED_APPS
17335
17436 fun saveToString (): String {
@@ -970,11 +832,11 @@ class Prefs(val context: Context) {
970832 }
971833
972834 fun setProfileCounter (profile : String , counter : Int ) {
973- prefsJunk .edit { putInt(profile, counter) }
835+ prefsNormal .edit { putInt(profile, counter) }
974836 }
975837
976838 fun getProfileCounter (profile : String ): Int {
977- return prefsJunk .getInt(profile, 0 )
839+ return prefsNormal .getInt(profile, 0 )
978840 }
979841
980842 fun getAppTag (appPackage : String , userHandle : UserHandle ? = null): String {
0 commit comments