Skip to content

Commit 3393a3f

Browse files
committed
refactor(data/ui/res): refactor database related sharedpeferences to use more proper types to store
like draft and clipboard limit should use int instead of string, clipboard and draft output rules or clipboard compare rules should use List<String>
1 parent ef110ef commit 3393a3f

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

app/src/main/java/com/osfans/trime/data/AppPrefs.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -366,11 +366,11 @@ class AppPrefs(
366366
var draftOutputRules: List<String>
367367
get() = prefs.getPref(DRAFT_OUTPUT_RULES, "").trim().split('\n')
368368
set(v) = prefs.setPref(DRAFT_OUTPUT_RULES, v.joinToString("\n"))
369-
var clipboardLimit: String
370-
get() = prefs.getPref(CLIPBOARD_LIMIT, "50")
369+
var clipboardLimit: Int
370+
get() = prefs.getPref(CLIPBOARD_LIMIT, 10)
371371
set(v) = prefs.setPref(CLIPBOARD_LIMIT, v)
372-
var draftLimit: String
373-
get() = prefs.getPref(DRAFT_LIMIT, "20")
372+
var draftLimit: Int
373+
get() = prefs.getPref(DRAFT_LIMIT, 10)
374374
set(v) = prefs.setPref(DRAFT_LIMIT, v)
375375
var draftExcludeApp: String
376376
get() = prefs.getPref(DRAFT_EXCLUDE_APP, "")

app/src/main/res/values-zh-rCN/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -259,4 +259,5 @@
259259
<string name="simple_key_unpin">取消置顶</string>
260260
<string name="simple_key_pin">置顶</string>
261261
<string name="delete_all">删除全部</string>
262+
<string name="disable">禁用</string>
262263
</resources>

app/src/main/res/values-zh-rTW/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -260,4 +260,5 @@
260260
<string name="simple_key_unpin">取消置頂</string>
261261
<string name="simple_key_pin">置頂</string>
262262
<string name="delete_all">刪除全部</string>
263+
<string name="disable">禁用</string>
263264
</resources>

app/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -263,4 +263,5 @@
263263
<string name="simple_key_unpin">Unpin</string>
264264
<string name="simple_key_pin">Pin</string>
265265
<string name="delete_all">Delete all</string>
266+
<string name="disable">Disbale</string>
266267
</resources>

app/src/main/res/xml/other_preference.xml

+10-7
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@
2828
<PreferenceCategory android:key="other_clipboard"
2929
app:iconSpaceReserved="false"
3030
app:title="@string/other_clipboard">
31-
<ListPreference
31+
<com.osfans.trime.ui.components.DialogSeekBarPreference
3232
app:key="other_clipboard_limit"
33-
android:defaultValue="100"
33+
android:defaultValue="10"
3434
app:iconSpaceReserved="false"
35-
app:entries="@array/other__clipboard_manager_entries"
36-
app:entryValues="@array/other__clipboard_manager_values"
35+
app:max="100"
36+
app:systemDefaultValue="0"
37+
app:systemDefaultValueText="@string/disable"
3738
app:title="@string/other_clipboard_limit"
3839
app:useSimpleSummaryProvider="true" />
3940

@@ -64,11 +65,13 @@
6465
<PreferenceCategory android:key="other_draft"
6566
app:iconSpaceReserved="false"
6667
app:title="@string/other_draft">
67-
<ListPreference
68+
<com.osfans.trime.ui.components.DialogSeekBarPreference
6869
app:key="other_draft_limit"
6970
app:iconSpaceReserved="false"
70-
app:entries="@array/other__clipboard_manager_entries"
71-
app:entryValues="@array/other__clipboard_manager_values"
71+
android:defaultValue="10"
72+
app:max="100"
73+
app:systemDefaultValue="0"
74+
app:systemDefaultValueText="@string/disable"
7275
app:title="@string/other_draft_limit"
7376
app:useSimpleSummaryProvider="true" />
7477

0 commit comments

Comments
 (0)