Compare commits

...

693 commits

Author SHA1 Message Date
PhilKes
d00300fa0e Bump version 7.4.1 2025-06-04 18:35:01 +02:00
Phil
f13e8227ca
Merge pull request #605 from PhilKes/fix/convert-to-updated-model
Fix convertTo action using updated model
2025-06-04 17:30:55 +02:00
PhilKes
11e472cd30 Fix convertTo action using updated model 2025-06-04 17:26:01 +02:00
Phil
4cc957ccd4
Merge pull request #589 from PhilKes/fix/bold-text-weight
For API >= 33 use font weight 700 for bold
2025-05-10 17:51:23 +02:00
PhilKes
86b74762c5 For API >= 33 use font weight 700 for bold 2025-05-10 17:49:19 +02:00
PhilKes
118285545a Bump versionCode 7404 2025-05-10 16:45:43 +02:00
Phil
402baf8056
Merge pull request #588 from PhilKes/fix/backup-on-save-decrypt
Fix decrypting database on auto-save backup if biometric lock is enabled
2025-05-10 16:43:25 +02:00
PhilKes
de27d40880 Fix decrypting database on auto-save backup if biometric lock is enabled 2025-05-10 15:55:18 +02:00
PhilKes
66ce623e85 Fix NOTALLYX_BACKUP_LOGS_FILE .txt postfix 2025-05-10 15:26:38 +02:00
PhilKes
3c2400c7e6 Bump versionCode 7403 2025-05-10 14:31:18 +02:00
Phil
c64a7b2ed7
Merge pull request #587 from PhilKes/fix/reminder-identifier-requestcode
Use note.id and reminder.id for reminder requestCode
2025-05-10 14:30:49 +02:00
PhilKes
fb687856f1 Use note.id and reminder.id for reminder requestCode 2025-05-10 14:29:23 +02:00
PhilKes
23d678c8a3 Fix double encoded stacktrace on report bug 2025-05-10 13:50:39 +02:00
PhilKes
ade08b52ed Fix widget when displayed note is deleted 2025-05-10 13:18:54 +02:00
PhilKes
62a35132e0 Improve import failed toast message 2025-05-10 12:24:57 +02:00
Phil
9fbe5a6b94
Merge pull request #583 from PhilKes/fix/export-pdf-empty-title
Fix export PDF file name if title is blank
2025-05-08 19:52:31 +02:00
PhilKes
cf7f6f9dda Fix export PDF file name if title is blank 2025-05-08 18:04:50 +02:00
PhilKes
01ac48f930 Bump versionCode 7402 2025-05-07 19:13:36 +02:00
Phil
015f43e94b
Merge pull request #580 from PhilKes/feat/hide-images-overview
Add setting to hide images in overview
2025-05-07 19:13:03 +02:00
PhilKes
830fb6a75c Update translations for new hide images option 2025-05-07 19:05:57 +02:00
PhilKes
c34ee3633e Add setting to hide images in overview 2025-05-07 19:05:57 +02:00
Phil
628bd9d564
Merge pull request #579 from PhilKes/fix/lock-widget
Fix showing widget when actually locked
2025-05-07 19:04:59 +02:00
PhilKes
3e889879fb Fix showing widget when actually locked 2025-05-07 17:52:41 +02:00
PhilKes
b191618a46 Bump versionCode 7401 2025-05-06 18:53:51 +02:00
Phil
5cbc62bdf7
Merge pull request #577 from PhilKes/translation/update
Update cs ru es fr zh-rCN strings.xml
2025-05-06 18:51:23 +02:00
PhilKes
d1e5770180 Update zh-rCN/strings.xml 2025-05-06 18:49:28 +02:00
PhilKes
29cee8faf4 Update fr/strings.xml 2025-05-06 18:48:01 +02:00
PhilKes
4f993af93f Update es/strings.xml 2025-05-06 18:47:34 +02:00
PhilKes
0f0eb80e9b Update ru/strings.xml 2025-05-06 18:46:18 +02:00
PhilKes
1314ab4437 Update cs/strings.xml 2025-05-06 18:45:45 +02:00
Phil
39022edfab
Merge pull request #576 from PhilKes/fix/checked-item-editable
Make checked ListItem non editable
2025-05-06 18:44:14 +02:00
PhilKes
157ecb1b13 Make checked ListItem non editable 2025-05-06 18:44:06 +02:00
Phil
fb35ffdac4
Merge pull request #573 from PhilKes/fix/biometric-lock-open-note
Fix/biometric lock open note
2025-05-06 18:41:46 +02:00
PhilKes
0fee25f022 Use androidx.biometric to fix compatibility issues 2025-05-06 18:41:35 +02:00
PhilKes
2341c30586 Fix hide on create Activity if unlocked 2025-05-06 18:41:35 +02:00
Phil
e553e78efb
Merge pull request #575 from PhilKes/feat/view-intent
Add intent-filter to open any text based file
2025-05-06 18:41:06 +02:00
PhilKes
724d08507a Add intent-filter to open any text based file 2025-05-06 18:40:58 +02:00
Phil
771546a0cb
Merge pull request #572 from PhilKes/fix/backup-logs-duplicates
Fix checking for existing backup logs file
2025-05-06 18:33:44 +02:00
PhilKes
1a6d4083e4 Fix checking for existing backup logs file 2025-05-06 18:33:37 +02:00
Phil
3ac63349d8
Merge pull request #571 from PhilKes/fix/search-actionmode
Update selected notes when search query is changed
2025-05-06 18:32:40 +02:00
PhilKes
06c48ab8d9 Update selected notes when search query is changed 2025-05-05 18:52:03 +02:00
PhilKes
8d20f26eae Add v7.4.0 changelogs 2025-04-18 16:22:17 +02:00
PhilKes
66f0d33cd4 Bump version 7.4.0 2025-04-18 16:15:08 +02:00
Phil
6d81b6f7c0
Merge pull request #551 from PhilKes/feat/disallow-screenshots
Add security option to disallow screenshots
2025-04-18 16:14:12 +02:00
PhilKes
2c1f5d5338 Add security option to disallow screenshots 2025-04-18 16:10:16 +02:00
Phil
adb981d76c
Merge pull request #550 from PhilKes/fix/keyboard-api-24
Fix ListItem deletion order and repair broken parent check state
2025-04-18 15:42:58 +02:00
PhilKes
73a0345fe4 Fix ListItem deletion order and repair broken parent check state 2025-04-18 15:41:45 +02:00
Phil
0407f2bdc4
Merge pull request #549 from PhilKes/fix/keyboard-api-24
Show keyboard when EditText is focused for API < 27
2025-04-18 15:25:15 +02:00
PhilKes
212c354072 Show keyboard when EditText is focused for API < 27 2025-04-18 15:15:49 +02:00
Phil
07ff5691e2
Merge pull request #548 from PhilKes/fix/reminders-dialog-scroll
Reduce reminder dialog padding and add scrolling
2025-04-18 14:54:24 +02:00
PhilKes
20cf84ab69 Reduce reminder dialog padding and add scrolling 2025-04-18 14:52:35 +02:00
Phil
6bfa013a6c
Merge pull request #547 from PhilKes/fix/navigationbarcolor-api24
Fix navigationBarColor in Note and BottomSheetFragments for API < 27
2025-04-18 14:47:29 +02:00
PhilKes
66a7b02c69 Fix navigationBarColor in Note and BottomSheetFragments for API < 27 2025-04-18 14:47:20 +02:00
Phil
62035091f5
Merge pull request #546 from PhilKes/fix/movementmethod-enterbody
Fix setting movementmethod for links
2025-04-18 14:28:06 +02:00
PhilKes
209e19d690 Fix setting movementmethod for links 2025-04-18 14:27:38 +02:00
Phil
899f2c0f9a
Merge pull request #545 from PhilKes/fix/share-text-note
Fix share pure text note
2025-04-18 14:08:19 +02:00
PhilKes
3a0b699c82 Fix share pure text note 2025-04-18 14:06:38 +02:00
Phil
18947835f1
Merge pull request #534 from PhilKes/translation/update
Translation/update
2025-04-10 17:26:09 +02:00
PhilKes
5c0ea100ee Remove unused translations 2025-04-10 17:24:45 +02:00
PhilKes
392a060329 Update fr/strings.xml 2025-04-10 17:11:57 +02:00
PhilKes
1aa5e2c9e7 Update pl/strings.xml 2025-04-10 17:11:19 +02:00
Phil
0d86d7aad8
Merge pull request #533 from PhilKes/fix/remove-capitalize-labels
Remove capitalization in input dialogs
2025-04-10 17:10:18 +02:00
PhilKes
772a43de31 Remove capitalization in input dialogs 2025-04-10 17:09:16 +02:00
PhilKes
ad9b410d45 Add v7.3.1 changelogs 2025-04-08 17:31:48 +02:00
PhilKes
6cf2a8ce1f Bump version 7.3.1 2025-04-08 17:29:24 +02:00
Phil
c33b639a07
Merge pull request #521 from PhilKes/fix/label-crash
Fix search navigate up loop and navigate label crash
2025-04-08 17:22:25 +02:00
PhilKes
61112a18d2 Fix search navigate up loop 2025-04-08 17:21:04 +02:00
PhilKes
30f889f3db Downgrade androidx.navigation to v2.3.5 2025-04-08 17:20:15 +02:00
PhilKes
b95782e53a Add v7.3.0 changelogs 2025-04-07 18:37:55 +02:00
PhilKes
19df4b817f Bump version 7.3.0 2025-04-07 18:23:11 +02:00
PhilKes
333b57c29d Remove it-It and pl-PL changelogs since too much effort 2025-04-07 18:22:23 +02:00
Phil
87124c32f4
Merge pull request #516 from PhilKes/fix/navigationbar-api-24
Remove white navigation bar background for API < 27
2025-04-06 21:55:09 +02:00
PhilKes
f4a7074811 Remove white navigation bar background for API < 27 2025-04-06 21:54:13 +02:00
PhilKes
1f6afb03d4 Fix docusaurus.config.ts baseUrl 2025-04-05 16:07:10 +02:00
PhilKes
56683d5255 Adjust Docusarus theme and index page 2025-04-05 16:03:43 +02:00
PhilKes
e24f630acf Add initial dokusaurus project + github workflows 2025-04-05 15:28:48 +02:00
PhilKes
6b3fec40eb Bump versionCode 7220 2025-04-05 12:26:33 +02:00
Phil
205116ac60
Merge pull request #510 from PhilKes/fix/search-focus
Fix initial focus on Search EditText + back pressing re-focus Search EditText
2025-04-05 12:25:28 +02:00
PhilKes
ffeecdf1ca Fix back pressing re-focus Search EditText 2025-04-05 12:15:24 +02:00
PhilKes
8d6b318e3b Fix initial focus on Search EditText 2025-04-05 12:15:24 +02:00
Phil
8d477e4366
Merge pull request #507 from PhilKes/translation/update
Update de + es + cs + zh-rCN strings.xml
2025-03-31 18:22:37 +02:00
PhilKes
79eacb079d Update de/strings.xml 2025-03-31 18:21:17 +02:00
PhilKes
c122c2cc48 Update zh-rCN/strings.xml 2025-03-31 18:14:29 +02:00
PhilKes
f97f99ded0 Update es/strings.xml 2025-03-31 18:13:46 +02:00
PhilKes
506bc5c362 Update cs/strings.xml 2025-03-31 18:13:11 +02:00
PhilKes
8784145b83 Bump versionCode 7219 2025-03-29 19:27:48 +01:00
PhilKes
7b1aa83fca Fix BaseNote.viewMode db migration 2025-03-29 19:27:20 +01:00
PhilKes
f9ea26f1fa Bump versionCode 7218 2025-03-29 14:10:51 +01:00
Phil
54d835e40b
Merge pull request #503 from PhilKes/feat/persist-note-viewmode
Persist viewMode for each note individually
2025-03-29 14:10:16 +01:00
PhilKes
9fd735ba95 Add viewMode to BaseNote.toJson 2025-03-29 14:09:36 +01:00
PhilKes
b5e13ce73a Remove obsolete defaultNoteViewMode preference 2025-03-29 13:46:17 +01:00
PhilKes
c586eab072 Persist viewMode for each note individually 2025-03-29 13:31:17 +01:00
Phil
860db3e6bb
Merge pull request #502 from PhilKes/fix/new-note-viewmode
Always use Edit view mode for new notes
2025-03-29 12:26:04 +01:00
PhilKes
883998e27f Always use Edit view mode for new notes 2025-03-29 12:24:24 +01:00
Phil
4924ee46ec
Merge pull request #500 from PhilKes/fix/next-action-edittext
Fix next action on ListItem EditText
2025-03-29 12:20:11 +01:00
PhilKes
ad5ad25e11 Fix next action on ListItem EditText 2025-03-29 12:19:36 +01:00
PhilKes
93119098bc Bump versionCode 7217 2025-03-28 18:28:02 +01:00
Phil
764c562859
Merge pull request #494 from PhilKes/feat/note-view-mode
Add Note view mode toggle for read-only mode
2025-03-28 18:27:10 +01:00
PhilKes
b1bf6bc12c Add Note view mode toggle for read-only mode 2025-03-28 18:18:27 +01:00
PhilKes
44d19341b1 Bump versionCode 7216 2025-03-27 19:28:02 +01:00
Phil
be734e080c
Merge pull request #492 from PhilKes/fix/backups-webdav
Fix file append mode not working with WebDAV backup Folder
2025-03-27 19:26:08 +01:00
PhilKes
8a4e2f9a92 Fix file append mode not working with WebDAV backup Folder 2025-03-27 19:21:11 +01:00
Phil
48c07dfe0f
Merge pull request #491 from PhilKes/feat/sharing-images
Add attached images to share note and support sharing files to the app
2025-03-27 18:37:38 +01:00
PhilKes
e09b0f44b7 Support sharing images/files to the app 2025-03-27 18:34:25 +01:00
PhilKes
155d4c1cd9 Add attached images to share note 2025-03-27 18:34:25 +01:00
PhilKes
8e3110f077 Remove unused android.permission.READ_EXTERNAL_STORAGE 2025-03-27 18:33:31 +01:00
PhilKes
17a3eda124 Disable obfuscation in proguard-rules.pro 2025-03-27 18:14:08 +01:00
PhilKes
7edbcccbe4 Bump versionCode 7215 2025-03-26 18:30:03 +01:00
Phil
f4bfa7ccb8
Merge pull request #490 from PhilKes/translation/update
Update zh-rCN and fr strings.xml
2025-03-26 18:29:17 +01:00
PhilKes
ae8bc8e859 Update fr/strings.xml 2025-03-26 18:27:56 +01:00
PhilKes
8af22e1e88 Update zh-rCN/strings.xml 2025-03-26 18:27:56 +01:00
Phil
a57628dc7a
Merge pull request #489 from PhilKes/feat/archived-notes-in-label
Display archived notes in label view
2025-03-26 18:27:25 +01:00
PhilKes
d239f20e6f Display archived notes in label view 2025-03-26 18:21:59 +01:00
Phil
2ddfd5adb9
Merge pull request #488 from PhilKes/feat/labels-hide
Do not show hidden labels in notes overview
2025-03-26 18:21:16 +01:00
PhilKes
b7b0b48c62 Do not show hidden labels in notes overview 2025-03-26 18:17:11 +01:00
Phil
cc64bad689
Merge pull request #487 from PhilKes/feat/edit-label-in-note
Hide hidden labels in overview and quick jump to label from note view
2025-03-26 18:16:16 +01:00
PhilKes
f4de4133ed Hide hidden labels in overview and quick jump to label from note view 2025-03-26 18:03:17 +01:00
PhilKes
21707dfe08 Bump versionCode 7214 2025-03-24 17:41:18 +01:00
Phil
d2ba38a20e
Merge pull request #482 from PhilKes/feat/json-import
Add json import
2025-03-24 17:33:03 +01:00
PhilKes
fe6d6eca8b Add json import 2025-03-24 17:31:00 +01:00
Phil
c5cfa7a6c9
Merge pull request #481 from PhilKes/translation/update
Update es and zh-rCN strings.xml
2025-03-24 17:06:03 +01:00
PhilKes
5711830b0f Update zh-rCN/strings.xml 2025-03-24 17:04:42 +01:00
PhilKes
dae19f07e0 Update es/strings.xml 2025-03-24 17:04:42 +01:00
Phil
36f3cc284f
Merge pull request #480 from PhilKes/fix/ignore-system-suggestionspans
Fix ignoring system SuggestionSpan changes
2025-03-24 17:04:11 +01:00
PhilKes
f38f813af6 Fix ignoring system SuggestionSpan changes 2025-03-24 17:03:59 +01:00
PhilKes
6b80b37714 Bump versionCode 7213 2025-03-23 14:26:19 +01:00
Phil
6c78204111
Merge pull request #474 from PhilKes/feat/convert-note-types
Add convert from/to list/text note actions
2025-03-23 14:25:56 +01:00
PhilKes
900defa670 Add convert from/to list/text note actions 2025-03-23 14:24:06 +01:00
PhilKes
a925712e1f Bump versionCode 7212 2025-03-23 13:28:55 +01:00
Phil
11d1d1fcc5
Merge pull request #473 from PhilKes/feat/dynamic-colors
Add option to use system's wallpaper colors
2025-03-23 13:28:29 +01:00
PhilKes
67e2a35c8f Add option to use system's wallpaper colors 2025-03-23 13:24:15 +01:00
Phil
11eeb0d5bc
Merge pull request #471 from PhilKes/fix/database-decrypt
Make sure decrypted DB cache file is deleted before decrypting
2025-03-22 11:41:20 +01:00
PhilKes
259e223637 Make sure decrypted DB cache file is deleted before decrypting 2025-03-22 11:40:08 +01:00
PhilKes
d7ad549878 Bump versionCode 7211 2025-03-22 11:08:54 +01:00
Phil
86998a84a0
Merge pull request #470 from PhilKes/feat/strikethrough-checked
Strike-through checked ListItems
2025-03-22 11:07:57 +01:00
PhilKes
ac2b87bba1 Strike-through checked ListItems 2025-03-22 11:05:14 +01:00
Phil
13e7b5ac1e
Merge pull request #469 from PhilKes/feat/quick-undo-redo-all
Long click to undo/redo all
2025-03-22 11:05:01 +01:00
PhilKes
5ac794885f Ignore SuggestionSpans for text changes and simplify ListEditTextChange 2025-03-22 11:00:59 +01:00
PhilKes
320c9048a5 Long click to undo/redo all 2025-03-22 11:00:59 +01:00
PhilKes
0cb3fa92df Add ripple effect to bottom appbar buttons 2025-03-22 11:00:59 +01:00
PhilKes
2bd5c575fe Add v7.2.1 changelogs 2025-03-19 18:11:52 +01:00
PhilKes
dbe1b0726b Bump version v7.2.1 2025-03-18 20:51:26 +01:00
Phil
dad74ace96 Merge pull request #465 from PhilKes/translation/update
Update zh-rCN/strings.xml
2025-03-18 18:00:19 +01:00
PhilKes
467f877dcc Update zh-rCN/strings.xml 2025-03-18 17:59:55 +01:00
Phil
3e4acd9355 Merge pull request #464 from PhilKes/fix/export-backup-database
Fix databaseFile path when creating backup
2025-03-18 17:57:48 +01:00
PhilKes
715d1aba1d Fix databaseFile path when creating backup 2025-03-18 17:53:27 +01:00
PhilKes
000bfe7466 Add rate app in About settings 2025-03-16 18:11:32 +01:00
Phil
b0d3cde257 Merge pull request #458 from PhilKes/feat/auto-save-idle
Add auto-save after user idle time
2025-03-16 18:05:28 +01:00
PhilKes
d330f93f00 Add auto-save after user idle time 2025-03-16 18:01:13 +01:00
Phil
f64267c226 Add Google Play badge to README.md 2025-03-12 18:17:29 +01:00
Phil
be16ef27a9
Merge pull request #452 from PhilKes/translation/update
Update cs/fr/zh-rCN translations
2025-03-10 19:01:56 +01:00
PhilKes
2f128f8de1 Update zh-rCN/strings.xml 2025-03-10 19:00:09 +01:00
PhilKes
7bb2ee53e4 Update fr/strings.xml 2025-03-10 18:59:19 +01:00
PhilKes
9fdfb61311 Update cs/strings.xml 2025-03-10 18:58:43 +01:00
PhilKes
628b9a4835 Add NDK debugSymbols to build 2025-03-10 18:11:01 +01:00
PhilKes
95a3b9c048 Add v7.2.0 changelogs 2025-03-09 11:40:31 +01:00
PhilKes
1ea19694fd Bump versionCode 7200 2025-03-08 18:54:53 +01:00
PhilKes
a3b7cdb984 Update de/strings.xml 2025-03-08 11:11:47 +01:00
PhilKes
ab63bfdb9d Added v7.2.0 changelogs 2025-03-08 11:10:09 +01:00
Phil
5a29ce7b12
Merge pull request #445 from PhilKes/fix/bottom-sheet-scrolling
Maximize ActionBottomSheets and allow scrolling
2025-03-07 21:46:37 +01:00
PhilKes
086ca01c74 Add scrolling to DialogColorPicker 2025-03-07 19:30:09 +01:00
PhilKes
b15b8efb1f Maximize ActionBottomSheets and allow scrolling 2025-03-07 19:28:35 +01:00
Phil
1dbca6457b
Merge pull request #443 from PhilKes/feat/sort-by-color
Add sort notes by color option
2025-03-06 18:10:09 +01:00
PhilKes
684388634b Add sort notes by color option 2025-03-06 18:08:30 +01:00
PhilKes
d42d9ebd69 Set Github Token for generate-changelogs.sh 2025-03-06 18:08:11 +01:00
Phil
e48c7b5dec
Merge pull request #441 from PhilKes/feat/list-drag-scroll
Add auto-scroll when dragging ListItem to top/bottom
2025-03-05 18:26:07 +01:00
PhilKes
a02e45ad98 Scroll back to changed ListItem when using undo/redo 2025-03-05 17:40:35 +01:00
PhilKes
0215bcd676 Add auto-scroll when dragging ListItem to top/bottom 2025-03-05 17:37:08 +01:00
PhilKes
7c25838d97 Bump versionCode 7108 2025-03-04 17:25:16 +01:00
Phil
aae366eaff
Merge pull request #438 from PhilKes/fix/move-child-same-parent
Fix update new parent first in finishMove
2025-03-04 17:24:41 +01:00
PhilKes
e153cafe08 Fix update new parent first in finishMove 2025-03-04 17:24:01 +01:00
Phil
4c0ca095d4
Merge pull request #435 from PhilKes/fix/paste-list
Fix paste list text in ListItem
2025-03-03 18:47:46 +01:00
PhilKes
86e68b7936 Fix paste list text in ListItem 2025-03-03 18:25:35 +01:00
PhilKes
10fe736e46 Update translations.xlsx 2025-03-03 18:13:41 +01:00
Phil
45e8c28808
Merge pull request #433 from PhilKes/translation/update
Update zh-rTW/strings.xml + Bump android-translations-converter v1.0.5
2025-03-02 19:12:55 +01:00
PhilKes
b78c5c2259 Update zh-rTW/strings.xml 2025-03-02 19:12:20 +01:00
PhilKes
bed5b08236 Bump android-translations-converter v1.0.5 2025-03-02 19:12:04 +01:00
PhilKes
a00bc28d8e Bump versionCode 7107 2025-03-02 13:11:10 +01:00
PhilKes
a3281d8195 Exclude issues labeled 'already done' from CHANGELOG.md 2025-03-02 12:19:05 +01:00
Phil
94d470956a
Merge pull request #431 from PhilKes/fix/move-inplace
Call finishMove if ListItem dragged to same position
2025-03-02 12:11:59 +01:00
PhilKes
935433bef5 Call finishMove if ListItem dragged to same position 2025-03-02 12:11:34 +01:00
Phil
94e4b5cb7f
Merge pull request #430 from PhilKes/fix/delete-lock
Lock delete action while already deleting note
2025-03-02 11:47:27 +01:00
PhilKes
6698ddfa52 Lock delete action while already deleting note 2025-03-02 11:46:37 +01:00
Phil
6d2f2c00d0
Merge pull request #426 from PhilKes/fix/check-parent
Fix always check previous parent for checked on finishMove
2025-03-02 11:16:54 +01:00
PhilKes
14239cc0a6 Fix always check previous parent for checked on finishMove 2025-03-02 11:15:53 +01:00
PhilKes
0d2b5116a5 Fix enable swipe on previous first ListItem after move 2025-03-02 10:53:13 +01:00
PhilKes
bf7002b0c0 Bump versionCode 7106 2025-02-28 18:39:12 +01:00
Phil
d11b461708
Merge pull request #420 from PhilKes/fix/childindex-calculation
Calculate child index based on ListItem.order
2025-02-28 18:37:20 +01:00
PhilKes
b207b8df77 Fix init List note without auto-sort 2025-02-28 18:08:24 +01:00
PhilKes
bd24776421 Calculate child index based on ListItem.order 2025-02-28 18:02:32 +01:00
PhilKes
02930a25b8 Bump versionCode 7105 2025-02-27 18:24:00 +01:00
Phil
437942536d
Merge pull request #417 from PhilKes/fix/recreate-editactivity
Correctly reload state if EditActivity was destroyed by system
2025-02-27 18:23:03 +01:00
PhilKes
d02171eec4 Correctly reload state if EditActivity was destroyed by system 2025-02-27 18:21:22 +01:00
Phil
e57cec7eef
Merge pull request #416 from PhilKes/fix/savenote-on-crash
Save open note on crash
2025-02-27 18:21:07 +01:00
PhilKes
ac8ec46361 Save open note on crash 2025-02-27 18:15:57 +01:00
PhilKes
ae70770c27 Bump versionCode 7104 2025-02-26 17:41:18 +01:00
Phil
58e9d5a439
Merge pull request #415 from PhilKes/fix/move-ischild
Only make moved items child if item below is child
2025-02-26 17:40:09 +01:00
PhilKes
2b2f7a696b Only make moved items child if item below is child 2025-02-26 17:39:49 +01:00
Phil
3b550162ff
Merge pull request #414 from PhilKes/translation/update
Add zh-rTW/strings.xml
2025-02-26 17:39:07 +01:00
PhilKes
ba9db21ee9 Add zh-rTW/strings.xml 2025-02-26 17:38:32 +01:00
Phil
6f2aee42fd
Merge pull request #388 from PhilKes/refactor/checked-list
Refactor checked items into separate list
2025-02-25 18:44:22 +01:00
PhilKes
b3519b6dc3 Bump versionCode 7103 2025-02-25 18:39:51 +01:00
PhilKes
5dc578eb44 Cleanup old ListItemSortedList implementation 2025-02-25 18:01:40 +01:00
PhilKes
650243edc9 Fix changeIsChild order update when checked items between 2025-02-25 17:42:46 +01:00
PhilKes
503c719a2e Bump versionCode 7102 2025-02-24 20:11:32 +01:00
PhilKes
a4c7822f5c Check parent if only unchecked child was made parent 2025-02-24 20:11:12 +01:00
PhilKes
8ee9d99213 Fix isChild when moving parent with children 2025-02-24 20:11:12 +01:00
PhilKes
3c15cd771f Fix EditListActivity.updateModel items list 2025-02-24 18:55:04 +01:00
PhilKes
9a1d2c4df0 Fix en-/disable swipe if first ListItem changed/moved 2025-02-24 18:47:26 +01:00
PhilKes
e8ff4d7e44 Fix remove ListItem with other items having same body 2025-02-24 18:31:31 +01:00
PhilKes
dcd2aea1c9 Bump versionName 7.2.0 2025-02-23 18:30:31 +01:00
PhilKes
80ac25debd Bump versionCode 7101 2025-02-23 18:25:24 +01:00
PhilKes
8b9c4dec13 Update orders of checkedlist when moving unchecked 2025-02-23 18:25:07 +01:00
PhilKes
2863bb8476 Decrease FastScrollBar min touch size for better delete access 2025-02-23 18:06:04 +01:00
PhilKes
43158e67e5 Use MutableList instead of SortedList 2025-02-23 17:42:48 +01:00
PhilKes
80da91e00b Check parent if unchecked child is deleted if no unchecked child left 2025-02-21 11:25:33 +01:00
PhilKes
b88f80fe75 Check-/Uncheck parent if a child is dragged into it 2025-02-21 11:25:33 +01:00
PhilKes
1c7ee05c69 Fix recalc multiple child positions on move 2025-02-21 11:25:33 +01:00
PhilKes
34c18f8842 Decrease drag handle margin 2025-02-21 11:25:28 +01:00
PhilKes
41cfb1bb2b Fix List item add with children order 2025-02-21 11:25:28 +01:00
PhilKes
0df152491f Fix EditListActivity search in checked items 2025-02-21 11:25:28 +01:00
PhilKes
b2bd349aae Fix ListItemSortedList.moveItemRange position recalculations 2025-02-21 11:25:25 +01:00
PhilKes
55df9cff48 Add v7.1.0 changelogs 2025-02-20 17:42:01 +01:00
PhilKes
c4861a8510 Bump v7.1.0 2025-02-20 17:40:32 +01:00
Phil
cb5a220ec1
Merge pull request #394 from PhilKes/fix/backup-error-notification
Try send notification if backup folder does not exist
2025-02-16 13:10:30 +01:00
PhilKes
b1205b5409 Try send notification if backup folder does not exist 2025-02-16 13:09:34 +01:00
Phil
f24c791fc3
Merge pull request #389 from PhilKes/translation/update
Update polish + spanish translations
2025-02-15 13:20:40 +01:00
PhilKes
157967fa82 Update es/strings.xml 2025-02-15 13:19:39 +01:00
PhilKes
74864fc134 Add fastlane docs for pl-PL 2025-02-15 13:17:53 +01:00
PhilKes
08a2721ca9 Update pl/strings.xml 2025-02-15 13:16:47 +01:00
PhilKes
bc6631adbb Bump versionCode 7008 2025-02-05 18:45:29 +01:00
Phil
09864e3671
Merge pull request #375 from PhilKes/fix/notify-autosave-backup-error
Fix AutoBackup temp dirs cleanup and send error notification
2025-02-05 18:44:39 +01:00
PhilKes
47f3f369c8 Fix german auto_backup_error_message translation 2025-02-05 18:22:51 +01:00
PhilKes
a1e863203d Fix AutoBackup temp dirs cleanup and send error notification 2025-02-05 18:22:51 +01:00
PhilKes
c8387e1f99 Fix periodInDays and maxBackups when periodic backup is enabled 2025-02-05 18:22:51 +01:00
Phil
642eea49ae Merge pull request #376 from PhilKes/fix/textview-color-api28
Fix TextView selectionHandleColor for API smaller 28
2025-02-05 18:21:13 +01:00
PhilKes
1d6c310e8a Fix TextView selectionHandleColor for API smaller 28 2025-02-05 17:42:26 +01:00
Phil
2991d441c4 Merge pull request #374 from PhilKes/fix/backuponsave-import
Refresh backupOnSave on settings import
2025-02-04 17:39:51 +01:00
PhilKes
d9568af924 Refresh backupOnSave on settings import 2025-02-04 17:39:29 +01:00
Phil
7de8559815
Merge pull request #370 from PhilKes/translation/update
Update fr/strings.xml
2025-02-03 18:28:20 +01:00
PhilKes
bde9cde875 Update fr/strings.xml 2025-02-03 18:28:00 +01:00
Phil
6e0c453d79
Merge pull request #369 from PhilKes/fix/startview-import-refresh
Fix startView refresh on import
2025-02-03 18:26:40 +01:00
PhilKes
392ac47b43 Fix startView refresh on import 2025-02-03 18:25:34 +01:00
PhilKes
7eb84dfa3f Add CHANGELOG.md generator 2025-02-02 17:46:55 +01:00
PhilKes
5ce329133a Update .gitignore 2025-02-02 17:16:01 +01:00
Phil
aa98179acf
Merge pull request #365 from PhilKes/translation/update
Update italian translations and add italian fastlane metadata
2025-02-02 17:04:40 +01:00
PhilKes
28b20ce504 Add italian fastlane metadata 2025-02-02 17:02:35 +01:00
PhilKes
a3bc7c9797 Update it/strings.xml 2025-02-02 16:35:49 +01:00
PhilKes
2e46527372 Bump versionCode 7007 2025-02-02 16:02:22 +01:00
Phil
17fe0038b6
Merge pull request #363 from PhilKes/fix/move-child-item
Fix child item startDrag call
2025-02-02 16:01:53 +01:00
PhilKes
c89ec57534 Fix child item startDrag call 2025-02-02 16:00:56 +01:00
PhilKes
55c091d28c Add drag child item to end of list test 2025-02-02 13:16:32 +01:00
PhilKes
93ce1c32d8 Bump versionCode 7006 2025-02-02 12:13:53 +01:00
Phil
acdfa7003a
Merge pull request #360 from PhilKes/fix/list-item-drag
Fix ListItem drag reset isDragged flag
2025-02-02 12:13:26 +01:00
PhilKes
dfafd22775 Fix ListItem drag reset isDragged flag 2025-02-02 12:11:46 +01:00
PhilKes
f00ce70cea Add all ErrorActivity translations 2025-02-02 11:45:55 +01:00
PhilKes
db6afd01b6 Bump versionCode 7005 2025-02-01 19:33:42 +01:00
Phil
45eca07d74
Merge pull request #355 from PhilKes/fix/new-item
Fix add new item after current on next pressed
2025-02-01 19:33:11 +01:00
PhilKes
111aabd249 Fix add new item after current on next pressed 2025-02-01 19:30:04 +01:00
PhilKes
feb0764303 Bump versionCode 7004 2025-02-01 17:56:02 +01:00
Phil
a2f14dfae7
Merge pull request #353 from PhilKes/fix/move-checked-autosort
Fix ListItem order updates when dragging
2025-02-01 17:55:36 +01:00
PhilKes
9c7588d19c Fix ListItem order updates when dragging 2025-02-01 17:50:50 +01:00
Phil
1627226765
Merge pull request #350 from PhilKes/feat/pure-dark-mode
Make dark mode pitch black
2025-02-01 17:10:28 +01:00
PhilKes
ec25080056 Make dark mode pitch black 2025-02-01 17:09:02 +01:00
PhilKes
4125572a42 Add v7.1.0 changelogs 2025-02-01 16:37:42 +01:00
PhilKes
f819e4a0a0 Update phoneScreenshots and featureGraphic 2025-02-01 16:31:18 +01:00
Phil
5738330726
Merge pull request #349 from PhilKes/fix/delete-color-title
Fix wrong title/message in delete color dialog
2025-02-01 14:55:43 +01:00
PhilKes
dd90e2b9d9 Fix wrong title/message in delete color dialog 2025-02-01 14:49:16 +01:00
PhilKes
419d2acaa7 Bump versionCode 7003 2025-02-01 13:21:44 +01:00
Phil
b5248f8f5a
Merge pull request #346 from PhilKes/translation/update
Update french + italian + spanish + german translations
2025-02-01 13:20:48 +01:00
PhilKes
914bf07174 Update de/strings.xml 2025-02-01 13:16:33 +01:00
PhilKes
465f7cf69b Update es/strings.xml 2025-02-01 13:08:35 +01:00
PhilKes
c1e926c402 Update it/strings.xml 2025-02-01 13:05:00 +01:00
PhilKes
87cacf4ce8 Update fr/strings.xml 2025-02-01 13:03:45 +01:00
Phil
9e0a3f948c
Merge pull request #345 from PhilKes/fix/drag-into-checked
Fix item orders when dragging unchecked into checked
2025-02-01 12:54:01 +01:00
PhilKes
6c88f0c281 Fix item orders when dragging unchecked into checked 2025-02-01 12:53:51 +01:00
Phil
369c8fa393
Merge pull request #343 from PhilKes/feat/back-press-startview
Navigate to startView on back press and make ColorEditDialog full size
2025-02-01 12:31:37 +01:00
PhilKes
2c86fbcd8a Navigate to startView on back press 2025-02-01 12:31:14 +01:00
PhilKes
a86932a463 Make ColorEditDialog full size 2025-02-01 11:58:39 +01:00
PhilKes
d7c67d9875 Bump versionCode 7002 2025-01-31 17:25:06 +01:00
Phil
157d6a77f7 Merge pull request #335 from PhilKes/feat/unlabeled-view
Add Unlabeled notes view and option to start app in specified notes view
2025-01-31 18:02:44 +01:00
PhilKes
9c5731a006 Add UnlabeledFragment to view note without labels 2025-01-31 18:01:12 +01:00
PhilKes
9fd6a4c745 Add setting to configure start view 2025-01-31 17:59:33 +01:00
PhilKes
eaef290780 Move Max labels in Navigation to content density settings 2025-01-31 17:59:26 +01:00
Phil
694c0f77a9 Merge pull request #334 from PhilKes/feat/custom-colors
Allow to choose custom notes colors
2025-01-31 17:58:30 +01:00
PhilKes
d47bd2a676 Allow to choose custom notes colors 2025-01-31 17:57:47 +01:00
PhilKes
603fb40961 Display default color options 2025-01-31 17:55:13 +01:00
PhilKes
97aea76b50 Allow to change any notes color 2025-01-31 17:41:13 +01:00
PhilKes
1b56b9e9cc Migrate Color Enum to string hex values 2025-01-31 17:38:13 +01:00
Phil
e49686d2da Merge pull request #333 from PhilKes/fix/undo-delete-checked
Simplify DeleteCheckedChange and ChangeCheckedForAllChange
2025-01-31 17:35:39 +01:00
PhilKes
3f3e16a66b Simplify DeleteCheckedChange and ChangeCheckedForAllChange 2025-01-31 17:33:50 +01:00
Phil
71ab55abe5 Merge pull request #332 from PhilKes/fix/import-settings-theme
Fix backups folder dialog when theme changes on settings import
2025-01-31 17:31:45 +01:00
PhilKes
ec9b9984a3 Fix dataInPublicfolder reload on reset 2025-01-31 17:12:15 +01:00
PhilKes
e68bfc33c7 Fix refresh backups folder dialog after theme change 2025-01-31 17:06:24 +01:00
PhilKes
c749ff1018 Fix ErrorActivity report bug 2025-01-31 17:03:48 +01:00
PhilKes
ceaf4cc3a3 Clearify send feedback and crash buttons 2025-01-30 18:19:12 +01:00
PhilKes
26b46c8fb3 Add donation button in settings 2025-01-30 18:19:12 +01:00
Phil
12131fafa2 Merge pull request #329 from PhilKes/feat/export-from-note
Add Export option to Note more options
2025-01-30 18:01:16 +01:00
PhilKes
22ecb5dcf2 Add Export option to Note more options 2025-01-29 20:03:28 +01:00
Phil
0f549f88e5 Merge pull request #328 from PhilKes/feat/widget-note-color
Color widgets in note's color
2025-01-29 20:03:18 +01:00
PhilKes
724fe1b241 Color widgets in note's color 2025-01-29 19:05:54 +01:00
PhilKes
f9f7aee5da Update fr/strings.xml 2025-01-29 18:23:15 +01:00
PhilKes
0c1d9e1181 Fix dis-/enable public folder database copy 2025-01-29 18:21:30 +01:00
PhilKes
24b54b066b Bump versionCode 7001 2025-01-29 17:50:35 +01:00
Phil
5508d96917 Merge pull request #326 from PhilKes/fix/public-data-biometric
Fix database file path when data in public folder enabled
2025-01-29 17:49:30 +01:00
PhilKes
1a4c28818c Fix database file path when data in public folder enabled 2025-01-29 17:49:21 +01:00
Phil
c75a33dd1a Merge pull request #320 from PhilKes/feat/list-checked-sort
Add option to auto-sort checked ListItems to end
2025-01-29 17:49:12 +01:00
PhilKes
62104e0878 Fix notifies on List move and checked change 2025-01-29 17:49:00 +01:00
PhilKes
bb9886e7e8 Fix moving parent with children into other parent 2025-01-29 17:49:00 +01:00
PhilKes
33f60ac7bc Unhide option to choose sort List items 2025-01-29 17:49:00 +01:00
Phil
176f1d54e3 Merge pull request #321 from PhilKes/fix/empty-list-preview
Show first item if list has no title
2025-01-29 17:48:48 +01:00
PhilKes
b9ad92b33a Show first item if list has no title 2025-01-28 18:30:12 +01:00
PhilKes
2438b42115 Temporarily disable flaky test in ListManagerWithChangeHistoryTest 2025-01-27 17:50:33 +01:00
PhilKes
4c90096dd2 Bump v7.0.0 2025-01-27 17:42:38 +01:00
Phil
165799d12f Merge pull request #318 from PhilKes/translation/update
Update german + french + czech translations
2025-01-27 17:37:21 +01:00
PhilKes
7fd074bff1 Update fr/strings.xml 2025-01-27 17:35:20 +01:00
PhilKes
d882187227 Update cs/strings.xml 2025-01-27 17:33:34 +01:00
PhilKes
1ef391f7e8 Update de/strings.xml 2025-01-27 17:31:21 +01:00
Phil
9fc29d5d3b Merge pull request #313 from PhilKes/fix/import-backups-folder
Prompt user to choose backupsFolder on import
2025-01-26 18:15:41 +01:00
PhilKes
c4d6cb0e63 Prompt user to choose backupsFolder on import 2025-01-26 18:13:35 +01:00
PhilKes
7e13bb5935 Update dataOnExternalStorage naming in BaseNoteModel 2025-01-26 16:08:48 +01:00
Phil
12b995f8fa
Merge pull request #308 from PhilKes/fix/import-settings
Reload settings after import
2025-01-26 16:06:29 +01:00
PhilKes
7442aec2fa Reload settings after import 2025-01-26 16:04:56 +01:00
PhilKes
96141b4c8a Bump versionCode 648 2025-01-26 15:09:47 +01:00
Phil
b4bb45deb8
Merge pull request #306 from PhilKes/translation/update
Update es/strings.xml
2025-01-26 15:09:19 +01:00
PhilKes
822762a336 Update es/strings.xml 2025-01-26 15:08:47 +01:00
Phil
667d8282f7
Merge pull request #305 from PhilKes/fix/remove-link
Increase input dialog sizes to fit large keyboards
2025-01-26 15:04:34 +01:00
PhilKes
19f22d0e91 Make Label dialogs use full size 2025-01-26 14:54:47 +01:00
PhilKes
9576051fe1 Remove link also removes text only for text note or full urls 2025-01-26 14:48:58 +01:00
PhilKes
39a9c15626 Remove background insets for text input dialogs 2025-01-26 14:42:44 +01:00
PhilKes
06a81256a1 Update fastlane documentation 2025-01-26 14:40:34 +01:00
Phil
c2642103fa
Merge pull request #301 from PhilKes/translation/update
Update french and czech translations
2025-01-26 10:48:04 +01:00
PhilKes
960de6a849 Update fr/strings.xml 2025-01-26 10:46:51 +01:00
PhilKes
5d49e52db7 Update cs/strings.xml 2025-01-26 10:45:59 +01:00
PhilKes
917d2a9b06 Update de/strings.xml 2025-01-25 16:00:39 +01:00
PhilKes
22c0e7dd97 Bump versionCode 647 2025-01-25 15:38:21 +01:00
Phil
50c74f8a1e
Merge pull request #297 from PhilKes/feat/reminders-navigation
Add Reminders View to list Notes with Reminders
2025-01-25 15:34:43 +01:00
PhilKes
24279e6ba0 Add RemindersFragment to list notes with reminders 2025-01-25 15:30:29 +01:00
PhilKes
0db04c9fed Show reminder icon next to note title 2025-01-25 13:22:34 +01:00
Phil
ef1de6261a
Merge pull request #296 from PhilKes/fix/cursor-on-orientation-change
Re-set cursor and scroll position on orientation change
2025-01-25 12:57:29 +01:00
PhilKes
403b2e712a Re-set cursor and scroll position on orientation change 2025-01-25 12:55:30 +01:00
Phil
2b4a51cd0a
Merge pull request #295 from PhilKes/translation/update
Update cs/strings.xml
2025-01-25 11:38:46 +01:00
PhilKes
eb416a81f5 Update cs/strings.xml 2025-01-25 11:38:06 +01:00
PhilKes
66197fe3eb Bump versionCode 646 2025-01-24 18:13:05 +01:00
Phil
846937dc24
Merge pull request #291 from PhilKes/fix/autobackup-empty-note
Fix do not checkAutoSave if empty note was deleted
2025-01-24 18:09:31 +01:00
PhilKes
b11b07f45b Fix do not checkAutoSave if empty note was deleted 2025-01-24 18:07:28 +01:00
Phil
fbd2e9d327
Merge pull request #290 from PhilKes/fix/listitem
Fix glitchy SwipeLayout and reload of note on orientation change
2025-01-24 18:07:06 +01:00
PhilKes
924d984dc8 Bump android-translations-converter v1.0.4 2025-01-24 17:58:17 +01:00
PhilKes
fa3a335ea7 Fix reloading state when EditActivity is recreated 2025-01-24 16:58:47 +01:00
PhilKes
eb9c598e4c Fix PeriodicBackupsMax disable when BackupsFolder is empty 2025-01-24 16:58:47 +01:00
PhilKes
81483f5f14 Simplify undo check ListItem since its too complex 2025-01-24 16:58:47 +01:00
PhilKes
54a68a76e0 Simplify undo move since its too complex 2025-01-24 16:58:47 +01:00
PhilKes
d9b486d4ce Fix ErrorActivity launch fails due to WorkManager uninitialized 2025-01-24 16:58:47 +01:00
PhilKes
2d9bc8d0d2 Fix ListItem undo move with children 2025-01-24 16:58:47 +01:00
PhilKes
0dcfc2bcff Fix ListItem children init when entering EditListActivity 2025-01-24 16:58:47 +01:00
PhilKes
e98645b736 Replace zerobranch.SwipeLayout with Leaqi.SwipeDrawer 2025-01-24 16:58:47 +01:00
Phil
8f3de20da0
Merge pull request #289 from PhilKes/translation/update
Update fr/strings.xml
2025-01-24 16:54:12 +01:00
PhilKes
3ae2dd2b0f Update fr/strings.xml 2025-01-24 16:53:33 +01:00
PhilKes
f05d45c019 Remove removed translations from cs/strings.xml 2025-01-23 19:34:07 +01:00
PhilKes
a5a0a26d63 Bump versionCode 643 2025-01-23 19:24:55 +01:00
Phil
94e7075f1d
Merge pull request #284 from PhilKes/feat/backup-on-save
Add option for auto backup on note save + refactor backup settings
2025-01-23 19:24:06 +01:00
PhilKes
1983262262 Add option for auto backup on note save 2025-01-23 18:09:10 +01:00
PhilKes
41ba1e7c9b Split backups folder preference from periodic backups 2025-01-23 18:00:13 +01:00
Phil
6bfde1bf32
Merge pull request #218 from PhilKes/feat/date-format-note-view
Add setting to optionally apply date format to note view
2025-01-23 17:57:51 +01:00
PhilKes
4a494a8ca2 Add setting to optionally apply date format to note view 2025-01-23 17:56:29 +01:00
Phil
fe69699b43
Merge pull request #283 from PhilKes/translation/update
Update french and czech translations
2025-01-23 17:34:38 +01:00
PhilKes
9ad85ed459 Update fr/strings.xml 2025-01-23 17:30:54 +01:00
PhilKes
0b02391209 Update cs/strings.xml 2025-01-23 17:30:00 +01:00
PhilKes
199f2d5bed Set output APK names for all build variants 2025-01-23 17:26:23 +01:00
PhilKes
d5f3846946 Fix WorkManager not initialized yet 2025-01-23 11:38:25 +01:00
Phil
8e4f3fe58e
Merge pull request #278 from PhilKes/feat/reminders
Add ability to set reminders for a note + AutoBackup fixes
2025-01-22 19:09:09 +01:00
PhilKes
b70f7b173a Fix Autobackup scheduling 2025-01-22 18:24:39 +01:00
PhilKes
e75c8b3ada Show notification if auto backup fails 2025-01-22 18:23:56 +01:00
PhilKes
61c851fad0 Add ability to set reminders for a note 2025-01-22 18:23:56 +01:00
PhilKes
da000ea914 Log how many notes exported in AutoBackupWorker 2025-01-22 18:03:44 +01:00
PhilKes
8fc493385a Remove gravity top from any Chips according to docs 2025-01-22 17:59:27 +01:00
Phil
abc82ec0da
Merge pull request #274 from PhilKes/fix/google-keep-import
Support Google Keep import in any languages
2025-01-21 21:09:56 +01:00
PhilKes
434ee5f3ca Update google_keep_help translations 2025-01-21 18:57:27 +01:00
PhilKes
7234c1711b Generify Google Keep import for any language 2025-01-21 18:57:27 +01:00
PhilKes
d0b05872bc Bump android-translations-converter v1.0.3 2025-01-21 18:05:59 +01:00
PhilKes
de3accd066 Add file logs to AutoBackupWorker 2025-01-21 18:01:27 +01:00
PhilKes
089403acb0 Kotlinify util classes and adjust intent extra names 2025-01-21 17:55:26 +01:00
PhilKes
f076888643 Fix translations formatting parameters 2025-01-21 17:51:26 +01:00
Phil
b62905d0e0
Merge pull request #272 from PhilKes/fix/links
Fix insert link save and use full width for Link dialog
2025-01-20 19:08:03 +01:00
PhilKes
41078d8bcc Fix insert link save and use full width for Link dialog 2025-01-20 19:04:24 +01:00
Phil
a6ba47e435
Merge pull request #271 from PhilKes/fix/refresh-labels-hidden
Add labelsHiddenInOverview to NotallyXPreferences.reload
2025-01-20 18:43:08 +01:00
PhilKes
b056eb862a Add labelsHiddenInOverview to NotallyXPreferences.reload 2025-01-20 18:40:25 +01:00
PhilKes
65795eaf07 Set disabled state colors in setControlsColorForAllViews 2025-01-20 18:15:03 +01:00
PhilKes
ff4ca9e733 Add beta BuildType 2025-01-19 15:11:31 +01:00
Phil
55a00e1185
Merge pull request #265 from PhilKes/feat/note-full-color
Display entire interface in note's color
2025-01-19 14:53:35 +01:00
PhilKes
fe66db4f56 Display entire interface in note's color 2025-01-19 14:45:28 +01:00
PhilKes
a70bc19807 Bump v6.4.1 2025-01-17 22:08:59 +01:00
Phil
05c4607b48
Merge pull request #258 from PhilKes/translation/update
Update fr/strings.xml
2025-01-17 22:00:33 +01:00
PhilKes
1aea96a8a8 Update fr/strings.xml 2025-01-17 22:00:16 +01:00
Phil
0809a3cd0a
Merge pull request #257 from PhilKes/fix/6.4.0-fixes
Fix undo/redo initialization + recover if biometric lock and databas encryption mismatch
2025-01-17 21:57:35 +01:00
PhilKes
6b6354f4ea Recover from biometric lock and database encryption mismatch 2025-01-17 21:52:40 +01:00
PhilKes
e1f12dfa47 Fix undo/redo initialization 2025-01-17 21:27:07 +01:00
PhilKes
bc3c1f7373 Bump v6.4.0 2025-01-17 18:41:33 +01:00
Phil
ee301bd60f
Merge pull request #253 from PhilKes/fix/share-large-text
Limit sharing to 150000 characters due not exceed builtin limit
2025-01-17 18:32:45 +01:00
PhilKes
49c85868dd Limit sharing to 150000 characters due not exceed builtin limit 2025-01-17 18:28:44 +01:00
Phil
5f9583868a
Merge pull request #252 from PhilKes/fix/search-text-changes
Fix search results when text changes in search mode
2025-01-17 18:28:22 +01:00
PhilKes
b6e9ad7db3 Fix search results when text changes in search mode 2025-01-17 18:25:44 +01:00
PhilKes
1ee00e685c Use android-translations-converter for excel translations.xlsx generation 2025-01-17 18:04:45 +01:00
PhilKes
b64566af2b Migrate build.gradle files to Kotlin 2025-01-16 22:31:04 +01:00
Phil
5d98773373
Merge pull request #239 from PhilKes/fix/dataonexternalstorage-on-import
Trigger moving database if dataOnExternalStorage changed by import
2025-01-16 22:09:43 +01:00
PhilKes
02e97768ce Trigger moving database if dataOnExternalStorage changed by import 2025-01-16 22:09:34 +01:00
Phil
b55c01c94a
Merge pull request #238 from PhilKes/fix/user-unenrolls-biometric
Handle user un-enrolling device biometrics while biometric lock is enabled
2025-01-16 22:09:19 +01:00
PhilKes
3d4e5ff672 Handle if user un-enrolls device biometrics while biometric lock is enabled 2025-01-14 19:07:41 +01:00
Phil
eb602cc482
Merge pull request #237 from PhilKes/translations/update
Update fr/strings.xml
2025-01-14 18:55:17 +01:00
PhilKes
1a80a7bcfc Update fr/strings.xml 2025-01-14 18:53:12 +01:00
Phil
864ab3a176 Update README.md 2025-01-14 18:05:13 +01:00
Phil
c19cb25aad
Merge pull request #235 from PhilKes/translations/helper
Add translation helpers
2025-01-14 17:50:06 +01:00
PhilKes
686125298c Fix app shortcut icons 2025-01-14 17:41:29 +01:00
PhilKes
8116b69631 Add translation github issue template 2025-01-14 17:41:29 +01:00
PhilKes
531755c542 Add Android-Excel-Converter for managing all translations 2025-01-14 17:41:29 +01:00
Phil
1fc8b4e40d
Merge pull request #233 from PhilKes/fix/overview-fastscroll
Use builtin fastscroll of RecyclerView for notes overview
2025-01-13 20:12:10 +01:00
PhilKes
30575e371a Use builtin fastscroll of RecyclerView for notes overview 2025-01-13 18:52:37 +01:00
Phil
6e0375c9f4
Merge pull request #232 from PhilKes/fix/intent-choosers
Add IntentChooser to all external app Intents
2025-01-13 18:52:06 +01:00
PhilKes
6238e3d0c1 Add IntentChooser to all external app Intents 2025-01-13 18:11:16 +01:00
Phil
85ed0d57ab
Merge pull request #226 from PhilKes/feat/plain-text-import-improvments
Import either single text file or entire folder + restrict plain text import mimetypes
2025-01-13 18:07:40 +01:00
PhilKes
dcf25f5cdd Restrict plain text import mimetypes 2025-01-13 18:07:09 +01:00
PhilKes
716538308b Choose either single file or folder for plain text import 2025-01-13 18:07:09 +01:00
Phil
5875d03a0a
Merge pull request #224 from PhilKes/feat/clarify-menus
Move top more menu actions to bottom in EditActivity
2025-01-13 18:06:11 +01:00
PhilKes
9000fdbd36 Move top more menu actions to bottom in EditActivity 2025-01-12 14:45:06 +01:00
Phil
3e37d5751f
Merge pull request #225 from PhilKes/feat/ellipsize-basenotevh
Add end-ellipsize for Title and Note in BaseNoteVH
2025-01-12 11:52:27 +01:00
PhilKes
54df38fa9d Add end-ellipsize for Title and Note in BaseNoteVH 2025-01-12 11:50:16 +01:00
PhilKes
991f2e5f75 Fix fr/strings escaping quotation marks 2025-01-12 11:46:40 +01:00
Phil
0a478fe7c7
Merge pull request #223 from PhilKes/fix/labels-dialog
Fix CheckBox clickable in Labels dialog
2025-01-12 11:19:30 +01:00
PhilKes
f0e1f22b3a Fix CheckBox clickable in Labels dialog 2025-01-12 11:19:08 +01:00
Phil
28e58bae77
Merge pull request #217 from andiandi13/main
[French translation] New strings + small adjustments
2025-01-12 11:15:24 +01:00
andiandi13
6820d8c7ff New strings + small adjustments 2025-01-12 11:15:07 +01:00
Phil
8356b9af7e
Merge pull request #222 from PhilKes/fix/link-dialog-height
Make DialogTextInput2 scrollable vertically
2025-01-12 11:14:27 +01:00
PhilKes
f4b6b948b8 Make DialogTextInput2 scrollable vertically 2025-01-12 11:12:40 +01:00
Phil
1db35539fc
Merge pull request #216 from PhilKes/fix/note-list-icon
Fix display of list icon in BaseNoteVH
2025-01-11 15:50:10 +01:00
PhilKes
38218476e0 Fix display of list icon in BaseNoteVH 2025-01-11 15:42:44 +01:00
PhilKes
1b3e5b0ebc Update README.md 2025-01-11 15:38:27 +01:00
PhilKes
6a57d32d1f Update .gitignore 2025-01-11 15:35:13 +01:00
PhilKes
4e267e0721 Bump v6.4.0-BETA 2025-01-11 14:49:33 +01:00
PhilKes
7f546b8662 Fix backup_password_hint key in fr/strings.xml 2025-01-11 14:27:50 +01:00
Phil
c0caf7fde2
Merge pull request #214 from PhilKes/feat/bottom-appbar-scaling
Fix bottom appbar cutoff + add setting to hide labels in notes overview
2025-01-11 14:20:51 +01:00
PhilKes
3f3f2cb521 Add setting to hide labels in overview 2025-01-11 13:03:25 +01:00
PhilKes
76fbf98437 Decrease bottom appbar height and icon paddings 2025-01-11 11:27:09 +01:00
Phil
3c3d5b51a6
Merge pull request #210 from PhilKes/feat/fastscroll
Add fast scrollbar to overview and EditActivity
2025-01-11 11:26:50 +01:00
PhilKes
03b3fd44c4 Add fast scrollbar to overview and EditActivity 2025-01-11 11:23:28 +01:00
Phil
cae0307d9b
Merge pull request #211 from PhilKes/feat/import-export-settings
Add import/export/reset settings + refactor SettingsFragment
2025-01-11 11:20:57 +01:00
PhilKes
204fe89b55 Add import/export/reset settings + refactor SettingsFragment 2025-01-10 17:26:35 +01:00
Phil
ec0880463b
Merge pull request #195 from PhilKes/feat/max-lines-0
Allow max lines and items to be set to 0
2025-01-10 16:58:36 +01:00
PhilKes
45fcbd4c41 Display checkbox before list title if no items should be displayed 2025-01-10 16:47:59 +01:00
PhilKes
b0a7d9927f Allow max lines and items to be set to 0 2025-01-10 16:47:59 +01:00
Phil
8a175bb3c1
Merge pull request #196 from PhilKes/fix/settings-slider
Fix settings Slider debounce
2025-01-10 16:45:21 +01:00
PhilKes
69fa420da4 Fix settings Slider debounce 2025-01-10 16:45:08 +01:00
Phil
6863608412
Merge pull request #205 from andiandi13/main
Full french translation
2025-01-10 16:44:49 +01:00
andiandi13
baebc3bfe6 Full french translation
Well, I guess I translated all missing strings (some of them are not use by the app so I didn't add them)
2025-01-10 16:44:33 +01:00
Phil
575db7ec53
Merge pull request #197 from PhilKes/feat/select-all-notes
Add select all notes menu option
2025-01-10 16:44:23 +01:00
PhilKes
6e4dc48213 Add select all notes menu option 2025-01-08 18:25:41 +01:00
Phil
f44a2a904b
Merge pull request #193 from PhilKes/fix/bottom-appbar
Fix BottomAppBar overlap in EditActivity
2025-01-08 18:08:25 +01:00
PhilKes
7480e47977 Fix BottomAppBar overlap in EditActivity 2025-01-08 18:08:13 +01:00
PhilKes
f5b28efe76 Fix it/strings.xml quotation mark escaping 2025-01-08 18:08:13 +01:00
Phil
d88dee636d
Merge pull request #191 from andiandi13/main
Update strings.xml
2025-01-08 16:54:01 +01:00
andiandi13
058bb1743d
Update strings.xml 2025-01-07 13:27:28 +01:00
Phil
4778d301c4
Merge pull request #179 from mosiser/main
Update Italian translation
2024-12-29 17:20:13 +01:00
mosiser
c9382c2733
Update Italian translation
Translated into Italian all new strings, and edit some of the existing ones
2024-12-29 12:00:58 +01:00
PhilKes
30d5ee0a9e Bump v6.3.0 2024-12-23 11:41:02 +01:00
Pranshul
4529e3ffa4
Fix biometric lock issue on devices running Android 10 or 9 (#173) 2024-12-23 11:31:20 +01:00
Phil
a8d79e15d8
Merge pull request #174 from PhilKes/feat/paste-with-multiple-urls
Add clickable spans when text containing urls is pasted
2024-12-23 10:52:36 +01:00
PhilKes
a10fb399cb Add clickable spans when text containing urls is pasted 2024-12-23 10:49:24 +01:00
Phil
9a936774dc
Update README.md 2024-12-22 17:29:34 +01:00
Phil
f73acbca3a
Merge pull request #172 from PhilKes/feat/link-unnamed-note
Show edit link dialog when note without title is linked
2024-12-22 17:17:27 +01:00
PhilKes
4b08daa976 Show edit link dialog when note without title is linked 2024-12-22 17:15:16 +01:00
Phil
1efc195417
Merge pull request #171 from PhilKes/chore/error-activity
Add cat.ereza:customactivityoncrash to handle app crashes
2024-12-22 16:35:11 +01:00
PhilKes
37254a4948 Add cat.ereza:customactivityoncrash to handle app crashes 2024-12-22 16:31:15 +01:00
Phil
8c45728fb3
Merge pull request #169 from PhilKes/chore/new-theme
Clean Material 3 Theme
2024-12-22 15:39:13 +01:00
PhilKes
b353bc07c7 Update phoneScreenshots and featureGraphic 2024-12-21 19:59:42 +01:00
PhilKes
23574e52f1 Fix NotallyModel.isModified if only ListItem body changes 2024-12-21 19:59:42 +01:00
PhilKes
ca03ece684 Create clean Material 3 theme 2024-12-21 19:59:42 +01:00
Phil
22adfb8061
Merge pull request #159 from PhilKes/feat/bottom-navigation
Bottom menu inside Note for one-handed usage
2024-12-21 12:06:46 +01:00
PhilKes
cc24b9befa Bottom menu inside Note for one-handed usage 2024-12-21 12:02:01 +01:00
Phil
5702ffd103
Merge pull request #139 from PhilKes/feat/search-in-note
Add Search action in EditNoteActivity
2024-12-14 11:49:37 +01:00
PhilKes
8c31acaca6 Add Search action in EditListActivity 2024-12-14 11:43:01 +01:00
PhilKes
b03bba608b Add Search action in EditNoteActivity 2024-12-14 11:31:30 +01:00
PhilKes
766aedb923 Bump v6.2.2 2024-12-09 19:03:23 +01:00
Phil
88274485e4
Merge pull request #154 from PhilKes/feat/paste-list-text
Parse list syntax on paste in list note
2024-12-09 18:52:55 +01:00
PhilKes
d453e48473 Parse list syntax on paste in list note 2024-12-09 18:39:56 +01:00
Phil
16201e6a37
Merge pull request #155 from PhilKes/fix/del-empty-list-item
Fix delete list item on DEL key pressed
2024-12-09 18:39:39 +01:00
PhilKes
e968d192bc Fix delete list item on DEL key pressed 2024-12-09 18:39:13 +01:00
PhilKes
adfa094444 Update german translations 2024-12-09 18:38:41 +01:00
Phil
583b8061c4
Merge pull request #153 from PhilKes/chore/update-chinese
Update chinese translations
2024-12-09 16:58:42 +01:00
PhilKes
6125d41e05 Update chinese translations 2024-12-09 16:57:48 +01:00
PhilKes
df2cd719f2 Add audio notes description to app's description 2024-12-09 16:39:50 +01:00
PhilKes
c228eb341d Bump v6.2.1 2024-12-06 18:51:55 +01:00
Phil
e47f928f43
Merge pull request #146 from PhilKes/chore/material3-theme
Migrate theme to Material 3
2024-12-06 18:44:24 +01:00
PhilKes
d31404220d Migrate theme to Material 3 2024-12-06 17:28:35 +01:00
Phil
f6824c94af
Merge pull request #145 from PhilKes/fix/note-export-name
Note export file name fixes
2024-12-06 17:28:11 +01:00
PhilKes
5c97517692 Do not overwrite existing files when exporting notes 2024-12-06 17:21:15 +01:00
PhilKes
f20312a4b6 Fix file name for single note export 2024-12-06 17:21:15 +01:00
Phil
f558392c6d
Merge pull request #141 from PhilKes/feat/change-color-note-view
Add change color action to EditNoteActivity
2024-12-06 17:20:23 +01:00
PhilKes
5ba26e824a Add change color action to EditNoteActivity 2024-12-06 17:20:13 +01:00
PhilKes
aa5a14d962 Bump v6.2.0 2024-12-03 17:47:59 +01:00
Phil
8ba6adcac5
Merge pull request #138 from PhilKes/feat/label-new-note
Allow adding new note in Label View
2024-12-01 13:37:41 +01:00
PhilKes
a185443cab Allow adding new note in Label View 2024-12-01 13:23:06 +01:00
Phil
3c2f3d9cfb
Merge pull request #137 from PhilKes/fix/link-note-order
Display Link Note after Select All option
2024-12-01 13:10:30 +01:00
PhilKes
eac4545b3d Display Link Note after Select All option 2024-12-01 13:08:35 +01:00
Phil
94f47f4395
Merge pull request #122 from PhilKes/feat/import-txt
Add plain text importer + export multiple notes
2024-12-01 12:42:35 +01:00
PhilKes
a0572b2d73 Add exports for multiple selected notes 2024-12-01 12:41:30 +01:00
PhilKes
21a75ff2f0 Add plain text importer 2024-12-01 12:41:30 +01:00
Phil
750d2c53c9
Merge pull request #121 from PhilKes/feat/data-external-storage
Add setting to store all data on external storage
2024-12-01 12:41:18 +01:00
PhilKes
9cf0756417 Add setting to store all data on external storage 2024-12-01 12:39:43 +01:00
PhilKes
b8a6cbf3bf Bump v6.1.2 2024-11-19 18:21:55 +01:00
Phil
69bd1e8eda
Merge pull request #127 from PhilKes/fix/edittext-changehistory
Save note if any BaseNote fields changed + fix cursor position on undo/redo
2024-11-16 12:39:11 +01:00
PhilKes
b9235d8486 Fix cursor position on undo/redo 2024-11-16 12:37:42 +01:00
PhilKes
eb176fa1cb Fix saving model if any contents or metadata changed instead of using ChangeHistory.canUndo 2024-11-16 12:37:42 +01:00
PhilKes
c7c0c44bb4 Update README.md 2024-11-16 12:25:36 +01:00
Phil
eae6f816d5
Update README.md 2024-11-16 12:19:32 +01:00
PhilKes
c60221a609 Ensure unit tests are run before each apk/bundle build 2024-11-15 16:31:28 +01:00
PhilKes
8c32180330 Add v6.1.1 changelogs 2024-11-14 17:30:22 +01:00
PhilKes
702ddf548e Bump v6.1.1 2024-11-14 17:27:57 +01:00
PhilKes
ab9f2496e2 Add missing content descriptions and min height for touch targets 2024-11-10 20:36:44 +01:00
PhilKes
5f84c6449b Bump v6.1 2024-11-07 18:30:41 +01:00
PhilKes
eb2168b38a Set model Folder.NOTES in DisplayLabelFragment 2024-11-07 18:11:51 +01:00
Phil
4e3f69220b
Merge pull request #119 from PhilKes/fix/delete-empty-notes
Fix delete empty notes
2024-11-07 17:37:24 +01:00
PhilKes
d9ecf4f8ea Fix delete selected notes ids 2024-11-07 17:35:38 +01:00
PhilKes
e877ffb78d Rearrange folders' action menu items 2024-11-07 17:32:31 +01:00
PhilKes
972277ecac Fix fastlane titles + german locale code to de-DE 2024-11-07 17:30:03 +01:00
PhilKes
3dff81c8ee Bump v6.1-RC4 2024-11-06 20:45:18 +01:00
Phil
b1e7158f06
Merge pull request #116 from PhilKes/fix/auto-backup
Dont observe BiometricLock in zip auto-backup
2024-11-06 20:42:10 +01:00
PhilKes
aa069cef9d Dont observe BiometricLock in zip auto-backup 2024-11-06 20:41:30 +01:00
Phil
2357e6dca7
Merge pull request #114 from PhilKes/fix/android-navbar-color
Theme adjusts Android navbar color
2024-11-06 18:03:01 +01:00
PhilKes
b9dbdd31f8 Theme adjusts Android navbar color 2024-11-05 18:51:24 +01:00
PhilKes
051bb4baec Use BundleCompat and IntentCompat instead of util methods 2024-11-05 18:17:49 +01:00
PhilKes
3406991f3a Add signingConfigs to build.gradle 2024-11-05 18:17:49 +01:00
Phil
92220e9367
Merge pull request #113 from CodeNomadHQ/main
Translate Dutch Language to v6.1
2024-11-05 17:53:23 +01:00
CodeNomad
014ce555b9
Update strings.xml 2024-11-05 14:44:36 +01:00
PhilKes
e6de38a9b4 Remove github from nl/strings.xml 2024-11-04 18:32:15 +01:00
PhilKes
5c980f94cd Bump v6.1-RC3 2024-11-04 18:27:10 +01:00
Phil
6a01e69d1e
Merge pull request #107 from PhilKes/feat/hide-labels
Ability to hide labels in Navigation
2024-11-04 18:22:53 +01:00
PhilKes
b5d92d05a3 Refactor send feedback via mail/github 2024-11-04 18:22:05 +01:00
PhilKes
f7bfa58300 Add max labels to display in navigation preference 2024-11-04 17:55:54 +01:00
PhilKes
f42ce85938 Add navigation visibility toggle for Labels 2024-11-04 17:54:17 +01:00
Phil
58b625002d
Merge pull request #106 from PhilKes/chore/fastlane-google-play
Chore/fastlane google play
2024-11-04 17:54:02 +01:00
PhilKes
e7415653e6 Add v6.1 changelogs 2024-11-04 13:48:58 +01:00
PhilKes
1ae2a41b40 Clear data also deletes all Labels 2024-11-04 17:47:58 +01:00
PhilKes
f6e623341c Migrate to targetSdk 34 2024-11-04 17:44:55 +01:00
PhilKes
4e7fb47c5f Add fastlane featureGraphic.png 2024-11-04 17:42:34 +01:00
PhilKes
921abb166c Fix fastlane icon size 2024-11-04 17:41:34 +01:00
PhilKes
8a9c6a2483 Add fastlane files to .gitignore 2024-11-04 13:44:34 +01:00
PhilKes
bd042d53f4 Fix AutoBackup scheduling at startup 2024-11-04 13:44:24 +01:00
PhilKes
bbcd2cd562 Correctly cancel AutoBackup if preference changed 2024-11-04 13:44:24 +01:00
Phil
426293177b
Merge pull request #99 from PhilKes/feat/labels-navigation
Add navigation items for every label + refactor editing labels
2024-11-03 12:35:08 +01:00
PhilKes
9fb1c73144 Add navigation items for every label + refactor editing labels 2024-11-03 12:34:56 +01:00
Phil
c22337a7a2
Merge pull request #98 from PhilKes/feat/clear-search
Clear previous search term
2024-11-03 10:56:18 +01:00
PhilKes
533d620624 Clear previous search term 2024-11-03 10:56:12 +01:00
Phil
bc870955bb
Merge pull request #97 from PhilKes/feat/multi-selection
Long click notes to multi-select
2024-11-03 10:56:00 +01:00
PhilKes
fb35b4bdd3 Long click notes to multi-select 2024-11-03 10:55:55 +01:00
Phil
c21c847a83
Add F-Droid download link 2024-11-03 10:52:07 +01:00
Phil
193022078e
Merge pull request #94 from PhilKes/feat/label-pin-multiple
Allow to pin/label multiple notes
2024-11-02 11:40:01 +01:00
PhilKes
6ef6daa8c1 Allow to pin/label multiple notes 2024-11-01 15:20:15 +01:00
Phil
037418237b
Merge pull request #93 from PhilKes/feat/search-visible-everywhere
Add Search to Deleted and Archived Tabs
2024-11-01 15:03:30 +01:00
PhilKes
4dc1fbde6b Add Search to Deleted and Archived Tabs 2024-11-01 11:13:08 +01:00
Phil
418e226e02
Merge pull request #92 from PhilKes/chore/preferences-refactor
Refactor Preferences from Strings into Enums
2024-11-01 11:10:50 +01:00
PhilKes
231089a7e5 Fix pre-commit git add after ktfmt 2024-11-01 11:10:21 +01:00
PhilKes
e38e14bdd4 Refactor Preferences from objects to Enums 2024-11-01 11:10:21 +01:00
Phil
87279902ca
Merge pull request #87 from PhilKes/feat/lock-widget
Lock widget if app is locked
2024-11-01 10:42:16 +01:00
PhilKes
82215860bf Lock widget if app is locked 2024-11-01 10:41:52 +01:00
Phil
54d971334e
Add Privacy-Policy.md 2024-10-30 23:01:53 +01:00
Phil
a61f27575d
Merge pull request #88 from PhilKes/feat/delete-empty-note
When exiting a note delete it if it's empty
2024-10-30 22:29:29 +01:00
PhilKes
e84a5409e4 When exiting a note delete it if it's empty 2024-10-30 22:29:19 +01:00
Phil
3a16d3bb6a
Merge pull request #89 from PhilKes/chore/deprecations
Migrate startActivityForResult and other minor deprecations
2024-10-30 22:28:22 +01:00
PhilKes
e9e2221510 Migrate startActivityForResult and other minor deprecations 2024-10-30 22:28:12 +01:00
Phil
611b571f89
Add FUNDING.yml 2024-10-30 17:17:51 +01:00
PhilKes
0a34069be7 Bump v6.1-RC1 2024-10-29 18:10:17 +01:00
Phil
90d66a2966
Merge pull request #83 from PhilKes/feat/importers
Import for GoogleKeep and Evernote
2024-10-29 17:55:15 +01:00
PhilKes
edc7cc6812 Fix ktfmt pre-commit hook only add staged files 2024-10-29 17:47:29 +01:00
PhilKes
014b4f5f11 Show Import progress as Dialog 2024-10-29 17:40:29 +01:00
PhilKes
df8d91e0f6 Add Evernote Importer 2024-10-29 17:37:29 +01:00
PhilKes
5fde605d63 Add missing german translations + ImportSource icon 2024-10-29 17:37:29 +01:00
PhilKes
36403595f0 Add Google Keep Importer 2024-10-29 17:37:29 +01:00
Phil
c16f6ee35b
Merge pull request #80 from PhilKes/feat/remove-notification-permission
Remove notifications for record audio and delete files
2024-10-29 17:36:35 +01:00
PhilKes
adb37d82fa Remove notifications for record audio and delete files 2024-10-29 17:31:30 +01:00
Phil
7ba37acea0
Merge pull request #81 from PhilKes/feat/link-note
Add Link Note action + refactor linking URL
2024-10-29 00:03:52 +01:00
PhilKes
719cab8856 Add Link Note action + refactor linking URL 2024-10-28 18:00:27 +01:00
Phil
a515578598
Merge pull request #70 from PhilKes/feat/date-display
Align displayed date with sort by preference
2024-10-28 17:43:42 +01:00
PhilKes
da87c81b16 Hide date if sorted by title 2024-10-28 17:42:53 +01:00
PhilKes
b939f7e428 Remove date display from Widget 2024-10-28 17:42:53 +01:00
PhilKes
dd0998f91f ConfigureWidgetActivity also uses sorting preference 2024-10-28 17:42:53 +01:00
PhilKes
f084c6f56f Sort by preference controls which date is displayed 2024-10-28 17:42:53 +01:00
Phil
2033bc0e45
Merge pull request #69 from PhilKes/feat/swipe-drag-handle
Allow to swipe on ListItemVH DragHandle
2024-10-28 17:42:39 +01:00
PhilKes
b862cdfee3 Allow to swipe on ListItemVH DragHandle 2024-10-28 17:42:07 +01:00
PhilKes
d62edcac61 Disable dependency metadata in apk and app bundle 2024-10-28 11:49:41 +01:00
Phil
794b26c784
Update README.md 2024-10-27 23:02:51 +01:00
PhilKes
904d5a246f Fix gradle-wrapper.properties distributionSha256Sum 2024-10-27 17:00:39 +01:00
Phil
33e99d6058
Merge pull request #65 from PhilKes/fix/failed-lock-exit
Finish LockedActivity for any authentication error
2024-10-27 11:18:31 +01:00
PhilKes
32c68be85d Finish LockedActivity for any authentication error 2024-10-27 11:18:12 +01:00
Phil
8d5e0a0764
Merge pull request #64 from PhilKes/fix/title-change-history
Add EditActivity title EditText to ChangeHistory
2024-10-26 13:23:27 +02:00
PhilKes
9cdc151fea Add EditActivity title EditText to ChangeHistory 2024-10-25 19:21:37 +02:00
PhilKes
b550eca115 Always align right select note button in Widget 2024-10-25 19:20:17 +02:00
Phil
a17d6bf5d1
Merge pull request #56 from PhilKes/feat/encrypt-backups
Add Backup Password preference + encrypt ZIP Backups
2024-10-25 19:18:54 +02:00
PhilKes
7deb374651 Add zip4j in libraries list 2024-10-25 19:18:43 +02:00
PhilKes
2dce131f74 Encrypt zip backups + add backup password preference 2024-10-25 19:18:43 +02:00
PhilKes
bf53853a05 Add clear button in change URLSpan dialog 2024-10-25 19:18:43 +02:00
PhilKes
3b839162b6 Add clear data preference action 2024-10-25 19:18:43 +02:00
PhilKes
db9bc5df98 Refactor bug report template + send feedback actions 2024-10-25 19:18:43 +02:00
Phil
a0e09aeef1
Fix gradle-wrapper version mismatch + fastlane documentation (#57) 2024-10-24 17:57:50 +02:00
CodeNomad
58ef714e2a
Updated Dutch Language for Version 6.0 (#55) 2024-10-22 17:57:24 +02:00
PhilKes
f924c203f3 Release v6.0 2024-10-21 18:12:18 +02:00
Phil
c39be4a224
Merge pull request #52 from PhilKes/release/6.0
Release 6.0
2024-10-21 18:10:41 +02:00
PhilKes
165bfff024 Temporarily hide app feedback button 2024-10-21 18:06:36 +02:00
PhilKes
19b7d53e5a Fix EditText.createTextWatcherWithHistory redo 2024-10-21 17:59:27 +02:00
PhilKes
462584cc03 Update documentation + add german docs 2024-10-21 17:47:12 +02:00
PhilKes
9d1814518a Update fastlane documentation 2024-10-21 17:47:12 +02:00
PhilKes
2bab2ae8fd Add updated screenshots 2024-10-21 17:47:12 +02:00
PhilKes
4e1e373f36 Fix send feedback links and update libraries 2024-10-21 17:47:11 +02:00
PhilKes
a81b3270cd Fix ListItemVH onKeyListener to not ignore keyboard input 2024-10-21 17:47:11 +02:00
Phil
9345a8133b
Merge pull request #51 from PhilKes/feat/rework-paste
Rework pasting Link and editing
2024-10-21 17:46:46 +02:00
PhilKes
a94a653aa5 Rework pasting Link and editing 2024-10-21 17:46:40 +02:00
PhilKes
d0378aa49b Add sqlcipher to proguard-rules.pro 2024-10-20 15:57:58 +02:00
PhilKes
dbc585b0e2 Bump v6.0-RC3 2024-10-20 13:23:05 +02:00
PhilKes
8bedc53650 Display app version on bottom of NavigationView 2024-10-20 13:18:13 +02:00
Phil
cb26a69b5c
Merge pull request #42 from PhilKes/feat/biometrics-lock
Add biometric/pin lock with database encryption
2024-10-20 13:11:06 +02:00
PhilKes
23cd04d563 Encrypt database with biometric/pin lock 2024-10-20 13:09:18 +02:00
PhilKes
3c436fa849 Lock app via Biometric/PIN after device locked 2024-10-20 13:04:35 +02:00
PhilKes
abff86d179 Add biometric/PIN lock preference 2024-10-20 13:03:20 +02:00
Phil
6eaf829670
Merge pull request #27 from PhilKes/fix/fast-toggle-checkbox
Fix ListItem.checked updates if toggled very fast
2024-10-20 13:01:28 +02:00
PhilKes
50c0d03781 Rename MakeListVH to ListItemVH 2024-10-20 12:58:52 +02:00
PhilKes
c5188ada3d Fix ListItem.checked updates if toggled very fast 2024-10-20 12:57:57 +02:00
Phil
cc962f67f3
Merge pull request #48 from PhilKes/fix/text-format-changehistory
Add text formatting to ChangeHistory and fix Clear Formatting action
2024-10-20 12:57:06 +02:00
PhilKes
aa8c5b0def Focus note body when clicking outside of EditText 2024-10-20 12:56:59 +02:00
PhilKes
5aa3d58158 Add text formatting to ChangeHistory 2024-10-20 12:56:59 +02:00
Phil
0b291908b7
Merge pull request #46 from PhilKes/chore/update-app-icon
Update app icon + colors + add monochrome version
2024-10-20 12:56:46 +02:00
PhilKes
17e010cbaa Update app icon + colors + add monochrome version 2024-10-20 12:56:39 +02:00
Phil
b76cfe9d20
Add feature request issue template 2024-10-19 15:52:31 +02:00
Phil
35ab650f74
Add github issue templates 2024-10-19 15:50:53 +02:00
Phil
82f2599e19
Merge pull request #38 from PhilKes/feat/widget-change-note
Add change note button in Widget
2024-10-19 12:50:17 +02:00
PhilKes
656506af2d Add change note button in Widget 2024-10-19 12:50:01 +02:00
Phil
433a7ab9b4
Merge pull request #45 from PhilKes/feat/sort-options
Add preference to sort notes by modified/created or title
2024-10-19 12:49:43 +02:00
PhilKes
5b9f9680fc Add preference to sort notes by modified/created or title 2024-10-15 18:36:52 +02:00
PhilKes
1556036b40 Temporarily hide ListItem sorting preference 2024-10-14 18:47:02 +02:00
Phil
c658a7875d
Merge pull request #43 from PhilKes/feat/undo-move-notes
Show snackbar to undo moving notes
2024-10-14 18:44:42 +02:00
PhilKes
16cab66a90 Show snackbar to undo moving notes 2024-10-14 18:10:50 +02:00
Phil
49e3e8dadc
Merge pull request #39 from PhilKes/feat/rolling-backups
Add preferences for rolling auto-backups and backup period
2024-10-13 14:51:55 +02:00
PhilKes
24c89ca217 Add preferences for rolling auto-backups and backup period 2024-10-12 18:47:28 +02:00
Phil
4a79cf8eed
Merge pull request #35 from PhilKes/feat/widget-checked-item
Strike through checked item in Widget
2024-10-12 12:53:09 +02:00
PhilKes
4f3c569ac0 Strike through checked item in Widget 2024-10-11 16:48:57 +02:00
PhilKes
08242399c6 Re-add pre-commit hook to ktfmt all changed kotlin files 2024-10-11 16:45:10 +02:00
PhilKes
ed212b161b Add app/release to .gitignore 2024-10-11 16:40:19 +02:00
Phil
1d84a1bf47
Merge pull request #28 from PhilKes/feat/display-image-position
Display image preview position in top right corner
2024-10-10 18:44:25 +02:00
PhilKes
a322182cc4 Display image preview position in top right corner 2024-10-10 18:44:18 +02:00
Phil
0ba624c1bf
Merge pull request #26 from CodeNomadHQ/main
Upgraded the dependencies
2024-10-10 18:43:49 +02:00
CodeNomad
df3911513c Replace buildDir with layout.buildDirectory.asFile to avoid using deprecated code 2024-10-10 12:49:50 +02:00
CodeNomad
0018b62a79 Changed org.jetbrains.kotlin.gradle.tasks.KotlinCompile to KotlinCompile 2024-10-09 00:10:36 +02:00
CodeNomad
6b142fac5a Updated to configureEach for Kotlin compile tasks to improve build performance 2024-10-09 00:01:13 +02:00
CodeNomad
a0143a91d8 Use tasks.register for better efficiency. 2024-10-08 23:40:32 +02:00
CodeNomad
f281b62096 Removed JCenter repository as it is no longer receiving updates. 2024-10-08 23:37:42 +02:00
CodeNomad
e7a582a6ee Replace Transformations.map with the map extension function directly on the LiveData 2024-10-08 23:31:44 +02:00
CodeNomad
da477e0ec1 Upgraded the dependencies 2024-10-08 21:21:53 +02:00
CodeNomad
f800028eea Upgraded Android Gradle Plugin from version 8.4.1 to 8.7.0 2024-10-08 21:19:06 +02:00
PhilKes
465d747e12 Bump v6.0-RC2 2024-10-08 20:57:06 +02:00
Phil
7deaf23651
Merge pull request #25 from PhilKes/rename-project
Rename project to NotallyX
2024-10-08 20:55:29 +02:00
PhilKes
82179669b7 Refactor kotlin code 2024-10-08 20:53:15 +02:00
PhilKes
e8e2d25c8a Refactor package structure 2024-10-08 20:53:15 +02:00
PhilKes
9e4df9964c Rename project to NotallyX 2024-10-08 20:53:15 +02:00
Phil
7b8cc217be
Merge pull request #22 from PhilKes/feat/display-amount-images
Add display amount of images
2024-10-08 18:48:00 +02:00
PhilKes
8e658cb139 Cleanup and refactor BaseNoteVH 2024-10-08 18:47:42 +02:00
PhilKes
efa94c4641 Show how many images in main view 2024-10-08 18:47:42 +02:00
Phil
9a4447b974
Merge pull request #23 from PhilKes/fix/open-file-activity
Show appchooser when opening file for which there is no suitable app installed
2024-10-08 18:47:32 +02:00
PhilKes
56712d8204 Show appchooser when opening file for which there is no suitable app installed 2024-10-08 18:47:25 +02:00
Phil
7413d5274a
Merge pull request #21 from PhilKes/fix/first-item-child
Fix if first item is child force it to be a parent
2024-10-08 18:47:01 +02:00
PhilKes
c2c4e3c877 Fix if first item is child force it to be a parent 2024-10-08 18:44:37 +02:00
Phil
4f24fcddd7
Merge pull request #25 from PhilKes/fix/editext-swipe-back
Clear focus on EditText when back is pressed/swiped
2024-10-08 18:18:31 +02:00
PhilKes
7918012fca Bump v6.0-RC1 2024-10-07 19:58:48 +02:00
Phil
b69a370bff
Merge pull request #24 from PhilKes/feat/file-attachment
Support adding any files as attachments
2024-10-07 19:57:36 +02:00
PhilKes
b6480aa62f Optimize file attachment Views 2024-10-07 19:57:16 +02:00
PhilKes
8c3fb4173c Add file attachment translations 2024-10-07 19:57:16 +02:00
PhilKes
d9dd395f2a Disable installLocalGitHooks until optimized 2024-10-07 19:57:16 +02:00
PhilKes
00a6f22fe2 Add delete file attachment dialog on long click 2024-10-07 19:57:16 +02:00
PhilKes
7efbb47290 Add attached files to backups 2024-10-07 19:57:16 +02:00
PhilKes
1d0cb42a06 Add Converters.jsonToFiles test 2024-10-07 19:57:16 +02:00
PhilKes
a1cc142175 Support adding any files as attachments 2024-10-07 19:57:16 +02:00
PhilKes
7cdfd61d56 Clear focus on EditText when back is pressed/swiped 2024-10-07 19:44:57 +02:00
Phil
5e99326862
Merge pull request #22 from PhilKes/fix/notally-activity-restore
Fix NotallyActivity restore state by moving NotallyModel.isFirstInstance
2024-10-07 19:44:04 +02:00
PhilKes
6d514b6dda Fix NotallyActivity restore state by moving NotallyModel.isFirstInstance 2024-10-07 19:43:46 +02:00
Phil
91e7fa8352
Support ListItem children in widget (#23) 2024-10-07 19:43:23 +02:00
Phil
4194f46ba7
Fix order values when opening a note (#16)
* Fix ListItem orders when opening a note

* When opening a note add parents before children

* Fix ListItem orders when opening a note

* When opening a note add parents before children

* Use SortedList.replaceAll when auto-sort is enabled
2024-10-06 18:38:43 +02:00
PhilKes
0a89f53d62 Add ktfmtFormat pre-commit hook 2024-10-06 13:08:01 +02:00
PhilKes
e77d347460 Add .idea to .gitignore 2024-10-05 13:23:13 +02:00
Phil
04119a7b2e
Merge pull request #13 from PhilKes/fix/change-history-fixes
Change history fixes + refactor packages
2024-10-05 13:05:01 +02:00
PhilKes
6f8f97c4bf Fix drag ListListItem tests 2024-10-05 13:00:24 +02:00
PhilKes
b473a28c9c Fix dragging with children 2024-10-04 18:42:19 +02:00
PhilKes
a8fc3ddfa4 Refactored ListItemSortedList.moveItemRange to use only move notifications 2024-10-04 17:39:28 +02:00
PhilKes
981bb18d05 Refactor package structure 2024-10-04 17:39:28 +02:00
PhilKes
bddf7fad30 Rename ListItem.sortingPosition to order 2024-10-04 17:39:28 +02:00
PhilKes
4e66cff1a6 Fix ChangeHistory undo/redos 2024-10-04 17:39:27 +02:00
PhilKes
e199210f4d Refactor ChangedCheckForAllChange to use item ids instead of positions before/after 2024-10-04 12:06:09 +02:00
PhilKes
369066ce94 Test fix sorting 2024-10-04 11:56:15 +02:00
613 changed files with 333443 additions and 14374 deletions

2
.github/FUNDING.yml vendored
View file

@ -1 +1 @@
patreon: omgodse ko_fi: philkes

36
.github/ISSUE_TEMPLATE/bug_report.yml vendored Normal file
View file

@ -0,0 +1,36 @@
name: Bug Report
description: Create a report to help us improve
labels: ["bug"]
projects: []
body:
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
value: "A bug happened!"
validations:
required: true
- type: input
id: version
attributes:
label: App Version
description: What version of the app are you running?
validations:
required: true
- type: input
id: android-version
attributes:
label: Android Version (API Level)
description: What Android version are you using?
- type: textarea
id: logs
attributes:
label: (Optional) Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!

View file

@ -0,0 +1,14 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''
---
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Additional context**
Add any other context or screenshots about the feature request here.

10
.github/ISSUE_TEMPLATE/translation.md vendored Normal file
View file

@ -0,0 +1,10 @@
---
name: Translation Update
about: Update translations by uploading updated translations.xlsx
title: '<INSERT LANGUAGE HERE> translations update'
labels: translations
assignees: ''
---
Drag'n'drop your updated translations.xlsx file here 🙂

56
.github/workflows/deploy.yaml vendored Normal file
View file

@ -0,0 +1,56 @@
name: Deploy to GitHub Pages
on:
push:
branches:
- main
paths:
- documentation/**
# Review gh actions docs if you want to further define triggers, paths, etc
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#on
jobs:
build:
name: Build Docusaurus
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: 18
cache-dependency-path: documentation/yarn.lock
cache: yarn
- name: Install dependencies
working-directory: documentation
run: yarn install --frozen-lockfile
- name: Build website
working-directory: documentation
run: yarn build
- name: Upload Build Artifact
uses: actions/upload-pages-artifact@v3
with:
path: documentation/build
deploy:
name: Deploy to GitHub Pages
needs: build
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
pages: write # to deploy to Pages
id-token: write # to verify the deployment originates from an appropriate source
# Deploy to the github-pages environment
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

14
.gitignore vendored
View file

@ -1,14 +1,16 @@
*.iml *.iml
.gradle .gradle
/local.properties /local.properties
/.idea/caches /.idea/
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store .DS_Store
/build /build
/captures /captures
.externalNativeBuild .externalNativeBuild
.cxx .cxx
*/.attach_pid*
fastlane/*
!fastlane/join-testers.png
!fastlane/metadata
Gemfile*
*.sh
!generate-changelogs.sh

25
.scripts/pre-commit Executable file
View file

@ -0,0 +1,25 @@
#!/bin/sh
# Capture the list of initially staged Kotlin files
initial_staged_files=$(git diff --name-only --cached -- '*.kt')
if [ -z "$initial_staged_files" ]; then
echo "No Kotlin files staged for commit."
exit 0
fi
formatted_files=$(echo "$initial_staged_files" | sed 's|^app/||' | paste -sd "," -)
echo "Formatting Kotlin files: $formatted_files"
./gradlew ktfmtPrecommit --include-only="$formatted_files"
if [ $? -ne 0 ]; then
echo "Kotlin formatting failed. Please fix the issues."
exit 1
fi
# Re-stage only the initially staged Kotlin files
for file in $initial_staged_files; do
git add "$file"
done
echo "Kotlin files formatted"

35
.scripts/pre-commit.bat Normal file
View file

@ -0,0 +1,35 @@
@echo off
setlocal enabledelayedexpansion
rem Capture the list of initially staged Kotlin files
set "initial_staged_files="
for /f "delims=" %%f in ('git diff --name-only --cached -- "*.kt"') do (
set "initial_staged_files=!initial_staged_files! %%f,"
)
rem Check if there are any staged Kotlin files
if "%initial_staged_files%"=="" (
echo No Kotlin files staged for commit.
exit /b 0
)
rem Remove the trailing comma from the list of formatted files
set "formatted_files=%initial_staged_files:~0,-1%"
echo Formatting Kotlin files: %formatted_files%
call gradlew ktfmtPrecommit --include-only="%formatted_files%"
rem Check if the formatting command was successful
if errorlevel 1 (
echo Kotlin formatting failed. Please fix the issues.
exit /b 1
)
rem Re-stage only the initially staged Kotlin files
for %%f in (%initial_staged_files%) do (
git add "%%f"
)
echo Kotlin files formatted
exit /b 0

371
CHANGELOG.md Normal file
View file

@ -0,0 +1,371 @@
# Changelog
## [v7.4.0](https://github.com/PhilKes/NotallyX/tree/v7.4.0) (2025-04-18)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v7.3.1...v7.4.0)
### Added Features
- Don't force capitalization when adding a label [\#532](https://github.com/PhilKes/NotallyX/issues/532)
- Add a screen protection against screenshot attempts [\#386](https://github.com/PhilKes/NotallyX/issues/386)
### Fixed Bugs
- Share pure text note error [\#544](https://github.com/PhilKes/NotallyX/issues/544)
- Crash when deleting checked items in a list [\#539](https://github.com/PhilKes/NotallyX/issues/539)
- Keyboard don't open after closing it on Android 7 [\#537](https://github.com/PhilKes/NotallyX/issues/537)
- Unable to open links before changing view mode [\#527](https://github.com/PhilKes/NotallyX/issues/527)
- Reminder popup cut on small screens [\#522](https://github.com/PhilKes/NotallyX/issues/522)
- Auto Backup failed [\#514](https://github.com/PhilKes/NotallyX/issues/514)
## [v7.3.1](https://github.com/PhilKes/NotallyX/tree/v7.3.1) (2025-04-08)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v7.3.0...v7.3.1)
### Fixed Bugs
- Button to close note search doesn't work [\#519](https://github.com/PhilKes/NotallyX/issues/519)
- app crashes when pressing label [\#517](https://github.com/PhilKes/NotallyX/issues/517)
## [v7.3.0](https://github.com/PhilKes/NotallyX/tree/v7.3.0) (2025-04-07)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v7.2.1...v7.3.0)
### Added Features
- Persist viewMode of each note individually [\#497](https://github.com/PhilKes/NotallyX/issues/497)
- Read-only mode by default and new notes [\#495](https://github.com/PhilKes/NotallyX/issues/495)
- Hide notes based on labels [\#401](https://github.com/PhilKes/NotallyX/issues/401)
- An archived note should be visible in its label's folder. [\#398](https://github.com/PhilKes/NotallyX/issues/398)
- Sharing notes from the app [\#380](https://github.com/PhilKes/NotallyX/issues/380)
- Add support for json notes import [\#377](https://github.com/PhilKes/NotallyX/issues/377)
- Sharing images to the app [\#281](https://github.com/PhilKes/NotallyX/issues/281)
- Strikethrough checked items lists [\#250](https://github.com/PhilKes/NotallyX/issues/250)
- Click on list element to check it [\#248](https://github.com/PhilKes/NotallyX/issues/248)
- Add long press actions to undo/redo buttons [\#244](https://github.com/PhilKes/NotallyX/issues/244)
- Convert Note \<=\> List [\#190](https://github.com/PhilKes/NotallyX/issues/190)
- Edit labels inside notes [\#180](https://github.com/PhilKes/NotallyX/issues/180)
- Support Wallpaper color themes [\#175](https://github.com/PhilKes/NotallyX/issues/175)
- View Mode [\#76](https://github.com/PhilKes/NotallyX/issues/76)
### Fixed Bugs
- Android 7.0 Navigation bar color issue [\#515](https://github.com/PhilKes/NotallyX/issues/515)
- Search Mode loop for Android \< 9.0 [\#508](https://github.com/PhilKes/NotallyX/issues/508)
- BaseNote.viewMode database migration error [\#505](https://github.com/PhilKes/NotallyX/issues/505)
- New list items can't be added with linebreak/enter [\#496](https://github.com/PhilKes/NotallyX/issues/496)
- Undo changes more than the last changed character [\#472](https://github.com/PhilKes/NotallyX/issues/472)
- Auto Backup failed [\#468](https://github.com/PhilKes/NotallyX/issues/468)
- Amount of backups to keep in periodic backups are not respected if nextcloud mount is used. [\#133](https://github.com/PhilKes/NotallyX/issues/133)
## [v7.2.1](https://github.com/PhilKes/NotallyX/tree/v7.2.1) (2025-03-18)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v7.2.0...v7.2.1)
### Added Features
- Note not automatically saved when App is killed by system [\#446](https://github.com/PhilKes/NotallyX/issues/446)
### Fixed Bugs
- Auto Backup failed [\#456](https://github.com/PhilKes/NotallyX/issues/456)
## [v7.2.1](https://github.com/PhilKes/NotallyX/tree/v7.2.1) (2025-03-18)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v7.2.0...v7.2.1)
### Added Features
- Note not automatically saved when App is killed by system [\#446](https://github.com/PhilKes/NotallyX/issues/446)
### Fixed Bugs
- Auto Backup failed [\#456](https://github.com/PhilKes/NotallyX/issues/456)
## [v7.2.0](https://github.com/PhilKes/NotallyX/tree/v7.2.0) (2025-03-08)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v7.1.0...v7.2.0)
### Added Features
- Sort notes by color [\#442](https://github.com/PhilKes/NotallyX/issues/442)
### Fixed Bugs
- Unable to locate the 'Uncheck all' option [\#444](https://github.com/PhilKes/NotallyX/issues/444)
- List crash when last unchecked item moved [\#436](https://github.com/PhilKes/NotallyX/issues/436)
- Pasting multi line text in empty lists crash [\#434](https://github.com/PhilKes/NotallyX/issues/434)
- Quickly tapping delete button crash [\#428](https://github.com/PhilKes/NotallyX/issues/428)
- First list item can keep parent property [\#427](https://github.com/PhilKes/NotallyX/issues/427)
- \(List\) Move last unchecked item above parent bug [\#425](https://github.com/PhilKes/NotallyX/issues/425)
- Dragging child item to same position breaks parent association [\#422](https://github.com/PhilKes/NotallyX/issues/422)
- Disabling list auto sorting crash [\#421](https://github.com/PhilKes/NotallyX/issues/421)
- Crash while indenting a checklist item [\#419](https://github.com/PhilKes/NotallyX/issues/419)
- List swipe as subtask crash [\#418](https://github.com/PhilKes/NotallyX/issues/418)
- List crash [\#413](https://github.com/PhilKes/NotallyX/issues/413)
- Checked parent + subtask places between item [\#410](https://github.com/PhilKes/NotallyX/issues/410)
- App crashed while screen was off [\#408](https://github.com/PhilKes/NotallyX/issues/408)
- Unchecked items can't be deleted [\#407](https://github.com/PhilKes/NotallyX/issues/407)
- Some list items can't be set to subtask after unchecked [\#406](https://github.com/PhilKes/NotallyX/issues/406)
- List items deleted [\#405](https://github.com/PhilKes/NotallyX/issues/405)
- List item parent task becomes subtask [\#404](https://github.com/PhilKes/NotallyX/issues/404)
- Check empty item crash [\#403](https://github.com/PhilKes/NotallyX/issues/403)
- Drag problem in long checklist [\#396](https://github.com/PhilKes/NotallyX/issues/396)
- List swap items bug [\#395](https://github.com/PhilKes/NotallyX/issues/395)
- Background crashes [\#323](https://github.com/PhilKes/NotallyX/issues/323)
## [v7.1.0](https://github.com/PhilKes/NotallyX/tree/v7.1.0) (2025-02-20)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v7.0.0...v7.1.0)
### Added Features
- Dark mode for note colors [\#352](https://github.com/PhilKes/NotallyX/issues/352)
- Add "new color" option when deleting a color [\#347](https://github.com/PhilKes/NotallyX/issues/347)
- Make "Start view" as default view [\#339](https://github.com/PhilKes/NotallyX/issues/339)
- Display first item as title for lists without title [\#317](https://github.com/PhilKes/NotallyX/issues/317)
- Remove delete option from top bar since it's already in the bottom more menu [\#316](https://github.com/PhilKes/NotallyX/issues/316)
- Add "Export" to bottom menu [\#315](https://github.com/PhilKes/NotallyX/issues/315)
- Move "Hide labels" switch up below the labels slider [\#311](https://github.com/PhilKes/NotallyX/issues/311)
- Display widgets with the notes' colors [\#300](https://github.com/PhilKes/NotallyX/issues/300)
- Allow Pinning a Specific Label as the Starting Page [\#269](https://github.com/PhilKes/NotallyX/issues/269)
- Move checked / unchecked items in list [\#251](https://github.com/PhilKes/NotallyX/issues/251)
- Moving all labels to the sidebar [\#240](https://github.com/PhilKes/NotallyX/issues/240)
- Add "no label" category [\#219](https://github.com/PhilKes/NotallyX/issues/219)
- Manual color selection [\#187](https://github.com/PhilKes/NotallyX/issues/187)
- Pure Dark Mode [\#16](https://github.com/PhilKes/NotallyX/issues/16)
### Fixed Bugs
- Moving group of task at first position wrong order [\#392](https://github.com/PhilKes/NotallyX/issues/392)
- Parent task not checked in specific case [\#391](https://github.com/PhilKes/NotallyX/issues/391)
- Add auto-backup no error notification [\#381](https://github.com/PhilKes/NotallyX/issues/381)
- Backup on save setting not restored [\#373](https://github.com/PhilKes/NotallyX/issues/373)
- Start View setting not restored [\#367](https://github.com/PhilKes/NotallyX/issues/367)
- \(List\) Child item can't be place after the item below it [\#362](https://github.com/PhilKes/NotallyX/issues/362)
- Android 9 Crash java.lang.NoSuchMethodError: getTextSelectHandleLeft\(\) [\#358](https://github.com/PhilKes/NotallyX/issues/358)
- List items order bug [\#357](https://github.com/PhilKes/NotallyX/issues/357)
- Lists parent-child items crash [\#356](https://github.com/PhilKes/NotallyX/issues/356)
- List new items wrong position [\#354](https://github.com/PhilKes/NotallyX/issues/354)
- Replacement color message title limited to 2 lines [\#348](https://github.com/PhilKes/NotallyX/issues/348)
- \(Lists\) Delete checked items and undo crash [\#331](https://github.com/PhilKes/NotallyX/issues/331)
- Sort List items strange bug [\#330](https://github.com/PhilKes/NotallyX/issues/330)
- Backup folder re-select prompt closes automatically [\#324](https://github.com/PhilKes/NotallyX/issues/324)
- Biometric lock can't be enabled [\#259](https://github.com/PhilKes/NotallyX/issues/259)
## [v7.0.0](https://github.com/PhilKes/NotallyX/tree/v7.0.0) (2025-01-27)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.4.1...v7.0.0)
### Added Features
- Add Reminders menu to navigation panel [\#294](https://github.com/PhilKes/NotallyX/issues/294)
- Extend notes colors to full screen [\#264](https://github.com/PhilKes/NotallyX/issues/264)
- Auto-backup on note modification [\#203](https://github.com/PhilKes/NotallyX/issues/203)
- Option to show full date inside the note regardless of chosen date format [\#111](https://github.com/PhilKes/NotallyX/issues/111)
- Reminder for Notes [\#85](https://github.com/PhilKes/NotallyX/issues/85)
### Fixed Bugs
- Restoring settings and backup folder [\#310](https://github.com/PhilKes/NotallyX/issues/310)
- Settings can't be imported [\#307](https://github.com/PhilKes/NotallyX/issues/307)
- Label create/edit dialog broken [\#302](https://github.com/PhilKes/NotallyX/issues/302)
- Rotating screen moves the cursor to the end of note [\#293](https://github.com/PhilKes/NotallyX/issues/293)
- Creating an empty note corrupts auto backup archive [\#288](https://github.com/PhilKes/NotallyX/issues/288)
- Changes to check lists \(checking items and removing items\) reverts when screen rotatates [\#287](https://github.com/PhilKes/NotallyX/issues/287)
- Auto-backups stop exporting after set limit is reached [\#270](https://github.com/PhilKes/NotallyX/issues/270)
- Link is not saved if it's the last edit [\#267](https://github.com/PhilKes/NotallyX/issues/267)
- Labels hidden in overview not applied when importing JSON [\#266](https://github.com/PhilKes/NotallyX/issues/266)
- An unexpected error occurred. Sorry for the inconvenience [\#262](https://github.com/PhilKes/NotallyX/issues/262)
- List subtasks bugs [\#207](https://github.com/PhilKes/NotallyX/issues/207)
- Remove link also remove text [\#201](https://github.com/PhilKes/NotallyX/issues/201)
- Biometric Lock crash [\#177](https://github.com/PhilKes/NotallyX/issues/177)
- Import from Evernote and Google Keep not working [\#134](https://github.com/PhilKes/NotallyX/issues/134)
## [v6.4.1](https://github.com/PhilKes/NotallyX/tree/v6.4.1) (2025-01-17)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.4.0...v6.4.1)
### Added Features
- Bottom AppBar cutoff + chinese translations [\#176](https://github.com/PhilKes/NotallyX/issues/176)
### Fixed Bugs
- Crash loop when enabling biometrics [\#256](https://github.com/PhilKes/NotallyX/issues/256)
- Crash when creating notes in 6.4.0 [\#255](https://github.com/PhilKes/NotallyX/issues/255)
## [v6.4.0](https://github.com/PhilKes/NotallyX/tree/v6.4.0) (2025-01-17)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.3.0...v6.4.0)
### Added Features
- Prevent word wrap in titles [\#220](https://github.com/PhilKes/NotallyX/issues/220)
- Move more top menu to bottom appbar [\#206](https://github.com/PhilKes/NotallyX/issues/206)
- App settings backup [\#204](https://github.com/PhilKes/NotallyX/issues/204)
- Add a touch bar to scroll quickly [\#202](https://github.com/PhilKes/NotallyX/issues/202)
- Select all notes menu button [\#186](https://github.com/PhilKes/NotallyX/issues/186)
- One line entries in main menu [\#185](https://github.com/PhilKes/NotallyX/issues/185)
- Some suggestions [\#183](https://github.com/PhilKes/NotallyX/issues/183)
### Fixed Bugs
- Cutting text during search causes app crash [\#245](https://github.com/PhilKes/NotallyX/issues/245)
- Long notes can't be shared [\#243](https://github.com/PhilKes/NotallyX/issues/243)
- Trigger disable/enable dataOnExternalStorage on settings import [\#231](https://github.com/PhilKes/NotallyX/issues/231)
- Fast scrollbar in notes overview lags [\#230](https://github.com/PhilKes/NotallyX/issues/230)
- Handle user unenrolling device biometrics while biometric lock is enabled [\#229](https://github.com/PhilKes/NotallyX/issues/229)
- Crash on import if no file explorer app installed [\#227](https://github.com/PhilKes/NotallyX/issues/227)
- Assign label inactive checkboxes [\#221](https://github.com/PhilKes/NotallyX/issues/221)
- List icon bug in main view [\#215](https://github.com/PhilKes/NotallyX/issues/215)
- Import plain text issues [\#209](https://github.com/PhilKes/NotallyX/issues/209)
- "Auto backup period in days" cursor buggy [\#192](https://github.com/PhilKes/NotallyX/issues/192)
- Unable to view full link while editing [\#181](https://github.com/PhilKes/NotallyX/issues/181)
- Scrollbar missing ... [\#178](https://github.com/PhilKes/NotallyX/issues/178)
- Widget is invisible when placed [\#156](https://github.com/PhilKes/NotallyX/issues/156)
**Closed issues:**
- Items in Lists [\#184](https://github.com/PhilKes/NotallyX/issues/184)
## [v6.3.0](https://github.com/PhilKes/NotallyX/tree/v6.3.0) (2024-12-23)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.2.2...v6.3.0)
### Added Features
- Possibility to directly report bug when crash occurs [\#170](https://github.com/PhilKes/NotallyX/issues/170)
- "Link Note" text for notes without a title [\#166](https://github.com/PhilKes/NotallyX/issues/166)
- Improve app theme's color contrasts [\#163](https://github.com/PhilKes/NotallyX/issues/163)
- Paste text containing link does not convert to clickable link + polish translation [\#157](https://github.com/PhilKes/NotallyX/issues/157)
- Bottom navigation to increase accessibility for one handed usage [\#129](https://github.com/PhilKes/NotallyX/issues/129)
- Search in selected note [\#108](https://github.com/PhilKes/NotallyX/issues/108)
### Fixed Bugs
- App crashes when enabling biometric lock [\#168](https://github.com/PhilKes/NotallyX/issues/168)
- Barely visible Navigation buttons on Motorola devices in Light Theme [\#161](https://github.com/PhilKes/NotallyX/issues/161)
## [v6.2.2](https://github.com/PhilKes/NotallyX/tree/v6.2.2) (2024-12-09)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.2.1...v6.2.2)
### Added Features
- Encrypted backups [\#151](https://github.com/PhilKes/NotallyX/issues/151)
- Parse list items when pasting a list formatted text into a list note [\#150](https://github.com/PhilKes/NotallyX/issues/150)
- Chinese display of options interface [\#149](https://github.com/PhilKes/NotallyX/issues/149)
### Fixed Bugs
- List notes deleting item even though text is not empty on backspace pressed [\#142](https://github.com/PhilKes/NotallyX/issues/142)
## [v6.2.1](https://github.com/PhilKes/NotallyX/tree/v6.2.1) (2024-12-06)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.2.0...v6.2.1)
### Added Features
- Add change color option inside of a Note [\#140](https://github.com/PhilKes/NotallyX/issues/140)
- Let user choose whether add items in a todo-list at the bottom or top of already existing items [\#132](https://github.com/PhilKes/NotallyX/issues/132)
- Migrate Theme to Material 3 [\#104](https://github.com/PhilKes/NotallyX/issues/104)
### Fixed Bugs
- Exporting multiple notes with same title overwrites files [\#144](https://github.com/PhilKes/NotallyX/issues/144)
- Single notes export as "Untitled.txt" [\#143](https://github.com/PhilKes/NotallyX/issues/143)
## [v6.2.0](https://github.com/PhilKes/NotallyX/tree/v6.2.0) (2024-12-03)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.1.2...v6.2.0)
### Added Features
- Replace positions of "Link Note" and "Select all" [\#136](https://github.com/PhilKes/NotallyX/issues/136)
- Allow to add Notes in Label View [\#128](https://github.com/PhilKes/NotallyX/issues/128)
- Empty notes deleted forever [\#118](https://github.com/PhilKes/NotallyX/issues/118)
- Sync devices using Syncthing [\#109](https://github.com/PhilKes/NotallyX/issues/109)
- Import from txt files [\#103](https://github.com/PhilKes/NotallyX/issues/103)
- Add more Export formats [\#62](https://github.com/PhilKes/NotallyX/issues/62)
### Fixed Bugs
- Using delete option from inside a note won't delete the note [\#131](https://github.com/PhilKes/NotallyX/issues/131)
- The app crashes when creating a link [\#112](https://github.com/PhilKes/NotallyX/issues/112)
- Pinning does not work [\#110](https://github.com/PhilKes/NotallyX/issues/110)
## [v6.1.2](https://github.com/PhilKes/NotallyX/tree/v6.1.2) (2024-11-19)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.1.1...v6.1.2)
### Fixed Bugs
- F-Droid can't build [\#126](https://github.com/PhilKes/NotallyX/issues/126)
- Undo in list can be quite destructive [\#125](https://github.com/PhilKes/NotallyX/issues/125)
- Actions like pin/label/archive only work from overview, not individual note/list [\#124](https://github.com/PhilKes/NotallyX/issues/124)
- Jumbled notes after opening settings [\#100](https://github.com/PhilKes/NotallyX/issues/100)
## [v6.1.1](https://github.com/PhilKes/NotallyX/tree/v6.1.1) (2024-11-14)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/v6.0...v6.1.1)
### Added Features
- Show delete option in top bar after selecting a note [\#105](https://github.com/PhilKes/NotallyX/issues/105)
- Clear previous search term by default [\#96](https://github.com/PhilKes/NotallyX/issues/96)
- Color the navigation bar [\#95](https://github.com/PhilKes/NotallyX/issues/95)
- Make multiselection easier [\#91](https://github.com/PhilKes/NotallyX/issues/91)
- Auto Discard Empty Notes [\#86](https://github.com/PhilKes/NotallyX/issues/86)
- Pin/label multiple Notes [\#78](https://github.com/PhilKes/NotallyX/issues/78)
- Hide widget notes when app locked. [\#75](https://github.com/PhilKes/NotallyX/issues/75)
- Creating categories [\#72](https://github.com/PhilKes/NotallyX/issues/72)
- Add Search Bar to Archived and Deleted Notes Sections [\#68](https://github.com/PhilKes/NotallyX/issues/68)
- Ability to swipe ListItem on DragHandle [\#67](https://github.com/PhilKes/NotallyX/issues/67)
- Show Last Modified Dates in Notes [\#60](https://github.com/PhilKes/NotallyX/issues/60)
- Import from major note apps [\#53](https://github.com/PhilKes/NotallyX/issues/53)
- Display Labels in NavigationView [\#49](https://github.com/PhilKes/NotallyX/issues/49)
- Unneeded Notification Permission on Image Upload [\#34](https://github.com/PhilKes/NotallyX/issues/34)
- Linking Notes Within Notes [\#32](https://github.com/PhilKes/NotallyX/issues/32)
### Fixed Bugs
- Deleted notes won't "delete forever" [\#117](https://github.com/PhilKes/NotallyX/issues/117)
- Empty Auto Backup [\#101](https://github.com/PhilKes/NotallyX/issues/101)
- Selector Moves Left in Widget When Selecting Untitled Notes [\#63](https://github.com/PhilKes/NotallyX/issues/63)
## [v6.0](https://github.com/PhilKes/NotallyX/tree/v6.0) (2024-10-28)
[Full Changelog](https://github.com/PhilKes/NotallyX/compare/a29bff9a2d1adcbea47cb024ab21426bd678c016...v6.0)
### Added Features
- Change icon and add monochrome icon [\#44](https://github.com/PhilKes/NotallyX/issues/44)
- Improve copy&paste behaviour [\#40](https://github.com/PhilKes/NotallyX/issues/40)
- Option to Change a Note in Widget [\#36](https://github.com/PhilKes/NotallyX/issues/36)
- Improve auto-backups [\#31](https://github.com/PhilKes/NotallyX/issues/31)
- Lock Notes via PIN/Fingerprint [\#30](https://github.com/PhilKes/NotallyX/issues/30)
- More options for sorting Notes in Overview [\#29](https://github.com/PhilKes/NotallyX/issues/29)
- Support subtasks in Widgets \(for list notes\) [\#6](https://github.com/PhilKes/NotallyX/issues/6)
- Improving Image Display on Notes [\#15](https://github.com/PhilKes/NotallyX/issues/15)
- File attachment [\#9](https://github.com/PhilKes/NotallyX/issues/9)
- Highlighting Completed Tasks in widget [\#17](https://github.com/PhilKes/NotallyX/issues/17)
- Encrypt backups [\#18](https://github.com/PhilKes/NotallyX/issues/18)
- Undo deleting/archiving notes [\#19](https://github.com/PhilKes/NotallyX/issues/19)
### Fixed Bugs
- Title Change Doesnt Update Last Modified Date [\#61](https://github.com/PhilKes/NotallyX/issues/61)
- Biometric Lock Improvement [\#58](https://github.com/PhilKes/NotallyX/issues/58)
- App crashes when pin lock is enabled [\#50](https://github.com/PhilKes/NotallyX/issues/50)
- Undo action ignored Spans [\#47](https://github.com/PhilKes/NotallyX/issues/47)
- Crash After Importing a Note [\#13](https://github.com/PhilKes/NotallyX/issues/13)
- Tasks Disappear When Changing App Language [\#4](https://github.com/PhilKes/NotallyX/issues/4)
- Unable to Swipe Back After Adding Tasks [\#5](https://github.com/PhilKes/NotallyX/issues/5)
- App Crash When Importing Notes and Opening a Task Note [\#7](https://github.com/PhilKes/NotallyX/issues/7)
- improving subtasks [\#8](https://github.com/PhilKes/NotallyX/issues/8)
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

View file

@ -1,5 +0,0 @@
### Contributing
Issues are currently disabled.
Please use the pull requests tab only for translations or bug fixes.

25
Privacy-Policy.md Normal file
View file

@ -0,0 +1,25 @@
## Privacy Policy
This privacy policy applies to the NotallyX app (hereby referred to as "Application") for mobile devices that was created as an Open Source service. This service is intended for use "AS IS".
### What information does the Application obtain and how is it used?
The Application does not obtain any information when you download and use it. Registration is not required to use the Application.
### Does the Application collect precise real time location information of the device?
This Application does not collect precise information about the location of your mobile device.
### Do third parties see and/or have access to information obtained by the Application?
Since the Application does not collect any information, no data is shared with third parties.
### Your Consent
By using the Application, you are consenting to this Privacy Policy now and as amended by the developer.
### Contact Us
If you have any questions regarding privacy while using the Application, or have questions about the practices, please contact us via email at philkeyplaystore@gmail.com.
This privacy policy is effective as of 2024-10-30

View file

@ -1 +0,0 @@
No user data is collected

105
README.md
View file

@ -1,35 +1,88 @@
### Background <h2 align="center">
Notally was created because I wanted to make something that was beautiful and at the same time, useful. It's extremely light, there are minimal dependencies and lines of code. <img src="fastlane/metadata/android/en-US/images/icon.png" alt="icon" width="90"/>
<br />
<b>NotallyX | Minimalistic note taking app</b>
<p>
<center>
<a href='https://play.google.com/store/apps/details?id=com.philkes.notallyx&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' height='80'/></a>
<a href="https://f-droid.org/en/packages/com.philkes.notallyx"><img alt='IzzyOnDroid' height='80' src='https://fdroid.gitlab.io/artwork/badge/get-it-on.png' /></a>
<a href="https://apt.izzysoft.de/fdroid/index/apk/com.philkes.notallyx"><img alt='F-Droid' height='80' src='https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png' /></a>
</center>
</p>
</h2>
<div style="display: flex; justify-content: space-between; width: 100%;">
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Image 6" style="width: 32%;"/>
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Image 2" style="width: 32%;"/>
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Image 3" style="width: 32%;"/>
</div>
<div style="display: flex; justify-content: space-between; width: 100%;">
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Image 4" style="width: 32%;"/>
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Image 5" style="width: 32%;"/>
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/7.png" alt="Image 7" style="width: 32%;"/>
</div>
### Features ### Features
* Widgets [Notally](https://github.com/OmGodse/Notally), but eXtended
* Auto backup
* Adjustable text size
* Support for Lollipop devices and up
* APK size of 1.4 MB (1.8 MB uncompressed)
* Color, pin and label your notes for quick organisation
* Complement your notes with pictures (JPG, PNG, WEBP)
* Export notes as TXT, JSON, HTML or PDF files with formatting
* Create rich text notes with support for bold, italics, mono space and strike-through
* Add clickable links to notes with support for phone numbers, email addresses and web urls
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Google Play" height="70"/>](https://play.google.com/store/apps/details?id=com.omgodse.notally) * Create **rich text** notes with support for bold, italics, mono space and strike-through
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="70"/>](https://f-droid.org/packages/com.omgodse.notally/) * Create **task lists** and order them with subtasks (+ auto-sort checked items to the end)
* Set **reminders** with notifications for important notes
* Complement your notes with any type of file such as **pictures**, PDFs, etc.
* **Sort notes** by title, last modified date, creation date
* **Color, pin and label** your notes for quick organisation
* Add **clickable links** to notes with support for phone numbers, email addresses and web urls
* **Undo/Redo actions**
* Use **Home Screen Widget** to access important notes fast
* **Lock your notes via Biometric/PIN**
* Configurable **auto-backups**
* Create quick audio notes
* Display the notes either in a **List or Grid**
* Quickly share notes by text
* Extensive preferences to adjust views to your liking
* Actions to quickly remove checked tasks
* Adaptive android app icon
* Support for Lollipop devices and up
---
### Bug Reports / Feature-Requests
If you find any bugs or want to propose a new Feature/Enhancement, feel free to [create a new Issue](https://github.com/PhilKes/NotallyX/issues/new/choose)
When using the app and an unknown error occurs, causing the app to crash you will see a dialog (see showcase video in https://github.com/PhilKes/NotallyX/pull/171) from which you can immediately create a bug report on Github with the crash details pre-filled.
#### Beta Releases
I occasionally release BETA versions of the app during development, since its very valuable for me to get feedback before publicly releasing a new version.
These BETA releases have another `applicationId` as the release versions, thats why when you install a BETA version it will show up on your device as a separate app called `NotallyX BETA`.
BETA versions also have their own data, they do not use the data of your NotallyX app
You can download the most recent BETA release [here on Github](https://github.com/PhilKes/NotallyX/releases/tag/beta)
### Translations ### Translations
All translations are crowd sourced. To contribute, follow these [guidelines](https://m2.material.io/design/communication/writing.html) and email me or open a pull request. All translations are crowd sourced.
To contribute:
1. Download current [translations.xlsx](https://github.com/PhilKes/NotallyX/raw/refs/heads/main/app/translations.xlsx)
2. Open in Excel/LibreOffice and add missing translations
Notes:
- Missing translations are marked in red
- You can filter by key or any language column values
- Non-Translatable strings are hidden and marked in gray, do not add translations for them
- For plurals, some languages need/have more quantity strings than others, if a quantity string in the default language (english) is not needed the row is highlighted in yellow. If your language does not need that quantity string either, ignore them.
3. Open a [Update Translations Issue](https://github.com/PhilKes/NotallyX/issues/new?assignees=&labels=translations&projects=&template=translation.md&title=%3CINSERT+LANGUAGE+HERE%3E+translations+update)
4. I will create a Pull-Request to add your updated translations
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="250"/><img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="250"/><img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="250"/> See [Android Translations Converter](https://github.com/PhilKes/android-translations-converter-plugin) for more details
### Hall of fame ### Contributing
* [Top 20 Android Apps 2021!](https://www.youtube.com/watch?v=bwz13aM0qJk)
* [De-Googling Any Android Phone! (Google Apps Alternatives)](https://www.youtube.com/watch?v=RQUEgwgV99I)
* [The BEST Private Notetaking Apps Explained](https://www.youtube.com/watch?v=BJw5tKPP1PY)
* [Notally](https://www.noteapps.ca/notally/)
* [The 9 Best Simple Note-Taking Apps for Android](https://www.makeuseof.com/simple-note-apps-android/)
### Copycats If you would like to contribute code yourself, just grab any open issue (that has no other developer assigned yet), leave a comment that you want to work on it and start developing by forking this repo.
Clones of Notally keep popping up on the Play Store. They are not licensed under GPL3 and usually change a few colors, include ads, etc. Please [report them](https://support.google.com/googleplay/android-developer/contact/takedown) and [inform me](mailto:omgodseapps@gmail.com) if you find a new one.
* https://play.google.com/store/apps/details?id=com.sladjan.notes The project is a default Android project written in Kotlin, I highly recommend using Android Studio for development. Also be sure to test your changes with an Android device/emulator that uses the same Android SDK Version as defined in the `build.gradle` `targetSdk`.
* https://play.google.com/store/apps/details?id=com.sladjan.notespro
Before submitting your proposed changes as a Pull-Request, make sure all tests are still working (`./gradlew test`), and run `./gradlew ktfmtFormat` for common formatting (also executed automatically as pre-commit hook).
### Attribution
The original Notally project was developed by [OmGodse](https://github.com/OmGodse) under the [GPL 3.0 License](https://github.com/OmGodse/Notally/blob/master/LICENSE.md).
In accordance to GPL 3.0, this project is licensed under the same [GPL 3.0 License](https://github.com/PhilKes/NotallyX/blob/master/LICENSE.md).

1
app/.gitignore vendored
View file

@ -1 +1,2 @@
/build /build
/release

View file

@ -1,89 +0,0 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-parcelize'
id 'com.google.devtools.ksp'
id 'com.ncorti.ktfmt.gradle' version '0.20.1'
}
android {
compileSdk 34
namespace 'com.omgodse.notally'
defaultConfig {
applicationId 'com.omgodse.notally'
minSdk 21
targetSdk 33
versionCode 55
versionName "6.0-SNAPSHOT"
resConfigs 'en', 'ca', 'cs', 'da', 'de', 'el', 'es', 'fr', 'hu', 'in', 'it', 'ja', 'my', 'nb', 'nl', 'nn', 'pl', 'pt-rBR', 'pt-rPT', 'ro', 'ru', 'sk', 'sv', 'tl', 'tr', 'uk', 'vi', 'zh-rCN'
vectorDrawables.generatedDensities = []
}
ksp {
arg("room.generateKotlin", "true")
arg("room.schemaLocation", "$projectDir/schemas")
}
buildTypes {
debug {
applicationIdSuffix ".debug"
}
release {
crunchPngs false
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
}
}
kotlinOptions { jvmTarget = "1.8" }
buildFeatures { viewBinding true }
packagingOptions.resources {
excludes += ["DebugProbesKt.bin", "META-INF/**.version", "kotlin/**.kotlin_builtins", "kotlin-tooling-metadata.json"]
}
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions.jvmTarget = "1.8"
}
ktfmt {
kotlinLangStyle()
}
tasks.withType(Test).configureEach {
// dependsOn 'ktfmtFormat'
}
dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'junit:junit:4.12'
final def navVersion = "2.3.5"
final def roomVersion = "2.6.1"
ksp "androidx.room:room-compiler:$roomVersion"
implementation "androidx.room:room-ktx:$roomVersion"
implementation "androidx.room:room-runtime:$roomVersion"
implementation "androidx.work:work-runtime:2.9.0"
implementation "androidx.navigation:navigation-ui-ktx:$navVersion"
implementation "androidx.navigation:navigation-fragment-ktx:$navVersion"
implementation "org.ocpsoft.prettytime:prettytime:4.0.6.Final"
implementation "com.google.android.material:material:1.4.0"
implementation 'com.github.zerobranch:SwipeLayout:1.3.1'
implementation "com.github.bumptech.glide:glide:4.15.1"
implementation "com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0"
testImplementation "junit:junit:4.13.2"
testImplementation "androidx.test:core:1.6.1"
testImplementation "org.mockito:mockito-core:5.13.0"
testImplementation "org.mockito.kotlin:mockito-kotlin:5.4.0"
testImplementation "io.mockk:mockk:1.13.12"
}

223
app/build.gradle.kts Normal file
View file

@ -0,0 +1,223 @@
import com.android.build.gradle.internal.tasks.factory.dependsOn
import com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask
import org.apache.commons.configuration2.PropertiesConfiguration
import org.apache.commons.configuration2.io.FileHandler
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.parcelize")
id("com.google.devtools.ksp")
id("com.ncorti.ktfmt.gradle") version "0.20.1"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.0"
id("io.github.philkes.android-translations-converter") version "1.0.5"
}
android {
namespace = "com.philkes.notallyx"
compileSdk = 34
ndkVersion = "29.0.13113456"
defaultConfig {
applicationId = "com.philkes.notallyx"
minSdk = 21
targetSdk = 34
versionCode = project.findProperty("app.versionCode").toString().toInt()
versionName = project.findProperty("app.versionName").toString()
resourceConfigurations += listOf(
"en", "ca", "cs", "da", "de", "el", "es", "fr", "hu", "in", "it", "ja", "my", "nb", "nl", "nn", "pl", "pt-rBR", "pt-rPT", "ro", "ru", "sk", "sv", "tl", "tr", "uk", "vi", "zh-rCN", "zh-rTW"
)
vectorDrawables.generatedDensities?.clear()
ndk {
debugSymbolLevel= "FULL"
}
}
ksp {
arg("room.generateKotlin", "true")
arg("room.schemaLocation", "$projectDir/schemas")
}
signingConfigs {
create("release") {
storeFile = file(providers.gradleProperty("RELEASE_STORE_FILE").get())
storePassword = providers.gradleProperty("RELEASE_STORE_PASSWORD").get()
keyAlias = providers.gradleProperty("RELEASE_KEY_ALIAS").get()
keyPassword = providers.gradleProperty("RELEASE_KEY_PASSWORD").get()
}
}
buildTypes {
debug {
applicationIdSuffix = ".debug"
versionNameSuffix = "-DEBUG"
resValue("string", "app_name", "NotallyX DEBUG")
}
release {
isCrunchPngs = false
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
signingConfig = signingConfigs.getByName("release")
}
create("beta"){
initWith(getByName("release"))
applicationIdSuffix = ".beta"
versionNameSuffix = "-BETA"
resValue("string", "app_name", "NotallyX BETA")
}
}
applicationVariants.all {
this.outputs
.map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
.forEach { output ->
output.outputFileName = "NotallyX-$versionName.apk"
}
}
dependenciesInfo {
includeInApk = false
includeInBundle = false
}
kotlinOptions {
jvmTarget = "1.8"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
buildFeatures {
viewBinding = true
}
packaging {
resources.excludes += listOf(
"DebugProbesKt.bin",
"META-INF/**.version",
"kotlin/**.kotlin_builtins",
"kotlin-tooling-metadata.json"
)
}
testOptions {
unitTests.isIncludeAndroidResources = true
}
}
ktfmt {
kotlinLangStyle()
}
tasks.register<KtfmtFormatTask>("ktfmtPrecommit") {
source = project.fileTree(rootDir)
include("**/*.kt")
}
tasks.register<Copy>("installLocalGitHooks") {
val scriptsDir = File(rootProject.rootDir, ".scripts/")
val hooksDir = File(rootProject.rootDir, ".git/hooks")
from(scriptsDir) {
include("pre-commit", "pre-commit.bat")
}
into(hooksDir)
inputs.files(file("${scriptsDir}/pre-commit"), file("${scriptsDir}/pre-commit.bat"))
outputs.dir(hooksDir)
fileMode = 509 // 0775 octal in decimal
// If this throws permission denied:
// chmod +rwx ./.git/hooks/pre-commit*
}
tasks.preBuild.dependsOn(tasks.named("installLocalGitHooks"), tasks.exportTranslationsToExcel)
tasks.register("generateChangelogs") {
doLast {
val githubToken = providers.gradleProperty("CHANGELOG_GITHUB_TOKEN").orNull
val command = mutableListOf(
"bash",
rootProject.file("generate-changelogs.sh").absolutePath,
"v${project.findProperty("app.lastVersionName").toString()}",
rootProject.file("CHANGELOG.md").absolutePath
)
if (!githubToken.isNullOrEmpty()) {
command.add(githubToken)
} else {
println("CHANGELOG_GITHUB_TOKEN not found, which limits the allowed amount of Github API calls")
}
exec {
commandLine(command)
standardOutput = System.out
errorOutput = System.err
}
val config = PropertiesConfiguration()
val fileHandler = FileHandler(config).apply {
file = rootProject.file("gradle.properties")
load()
}
val currentVersionName = config.getProperty("app.versionName")
config.setProperty("app.lastVersionName", currentVersionName)
fileHandler.save()
println("Updated app.lastVersionName to $currentVersionName")
}
}
afterEvaluate {
tasks.named("bundleRelease").configure {
dependsOn(tasks.named("testReleaseUnitTest"))
}
tasks.named("assembleRelease").configure {
dependsOn(tasks.named("testReleaseUnitTest"))
finalizedBy(tasks.named("generateChangelogs"))
}
}
dependencies {
val navVersion = "2.3.5"
val roomVersion = "2.6.1"
implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
implementation("androidx.preference:preference-ktx:1.2.1")
ksp("androidx.room:room-compiler:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.room:room-runtime:$roomVersion")
implementation("androidx.security:security-crypto:1.1.0-alpha06")
implementation("androidx.sqlite:sqlite-ktx:2.4.0")
implementation("androidx.work:work-runtime:2.9.1")
implementation("androidx.biometric:biometric:1.1.0")
implementation("cat.ereza:customactivityoncrash:2.4.0")
implementation("com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0")
implementation("com.github.bumptech.glide:glide:4.15.1")
implementation("cn.Leaqi:SwipeDrawer:1.6")
implementation("com.github.skydoves:colorpickerview:2.3.0")
implementation("com.google.android.material:material:1.12.0")
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("me.zhanghai.android.fastscroll:library:1.3.0")
implementation("net.lingala.zip4j:zip4j:2.11.5")
implementation("net.zetetic:android-database-sqlcipher:4.5.3")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
implementation("org.jsoup:jsoup:1.18.1")
implementation("org.ocpsoft.prettytime:prettytime:4.0.6.Final")
implementation("org.simpleframework:simple-xml:2.7.1") {
exclude(group = "xpp3", module = "xpp3")
}
androidTestImplementation("androidx.room:room-testing:$roomVersion")
androidTestImplementation("androidx.work:work-testing:2.9.1")
testImplementation("androidx.arch.core:core-testing:2.2.0")
testImplementation("androidx.test:core-ktx:1.6.1")
testImplementation("androidx.test:core:1.6.1")
testImplementation("io.mockk:mockk:1.13.12")
testImplementation("junit:junit:4.13.2")
testImplementation("org.assertj:assertj-core:3.24.2")
testImplementation("org.json:json:20180813")
testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
testImplementation("org.mockito:mockito-core:5.13.0")
testImplementation("org.robolectric:robolectric:4.13")
}

271494
app/obfuscation/mapping.txt Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
# Add project specific ProGuard rules here. # Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the # You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle. # proguardFiles setting in build.gradle.kts.
# #
# For more details, see # For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html # http://developer.android.com/guide/developing/tools/proguard.html
@ -11,13 +11,39 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview { #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *; # public *;
#} #}
-keepattributes LineNumberTable,SourceFile
# Uncomment this to preserve the line number information for
# debugging stack traces.
-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
-renamesourcefileattribute SourceFile -renamesourcefileattribute SourceFile
-dontobfuscate
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
-printmapping obfuscation/mapping.txt
-keep class ** extends androidx.navigation.Navigator -keep class ** extends androidx.navigation.Navigator
-keep class ** implements org.ocpsoft.prettytime.TimeUnit -keep class ** implements org.ocpsoft.prettytime.TimeUnit
# SQLCipher
-keep class net.sqlcipher.** { *; }
-keep class net.sqlcipher.database.** { *; }
# SimpleXML
-keepattributes Signature
-keepattributes *Annotation
-keep interface org.simpleframework.xml.core.Label {
public *;
}
-keep class * implements org.simpleframework.xml.core.Label {
public *;
}
-keep interface org.simpleframework.xml.core.Parameter {
public *;
}
-keep class * implements org.simpleframework.xml.core.Parameter {
public *;
}
-keep interface org.simpleframework.xml.core.Extractor {
public *;
}
-keep class * implements org.simpleframework.xml.core.Extractor {
public *;
}
-keep class * implements java.io.Serializable

View file

@ -2,11 +2,11 @@
"formatVersion": 1, "formatVersion": 1,
"database": { "database": {
"version": 4, "version": 4,
"identityHash": "1cbb12db54fc964fac579051101a6c67", "identityHash": "01fd1bdfcfa83b65d83ff1209b964329",
"entities": [ "entities": [
{ {
"tableName": "BaseNote", "tableName": "BaseNote",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `folder` TEXT NOT NULL, `color` TEXT NOT NULL, `title` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `labels` TEXT NOT NULL, `body` TEXT NOT NULL, `spans` TEXT NOT NULL, `items` TEXT NOT NULL, `images` TEXT NOT NULL, `audios` TEXT NOT NULL)", "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `folder` TEXT NOT NULL, `color` TEXT NOT NULL, `title` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `labels` TEXT NOT NULL, `body` TEXT NOT NULL, `spans` TEXT NOT NULL, `items` TEXT NOT NULL, `images` TEXT NOT NULL, `files` TEXT NOT NULL, `audios` TEXT NOT NULL)",
"fields": [ "fields": [
{ {
"fieldPath": "id", "fieldPath": "id",
@ -80,6 +80,12 @@
"affinity": "TEXT", "affinity": "TEXT",
"notNull": true "notNull": true
}, },
{
"fieldPath": "files",
"columnName": "files",
"affinity": "TEXT",
"notNull": true
},
{ {
"fieldPath": "audios", "fieldPath": "audios",
"columnName": "audios", "columnName": "audios",
@ -134,7 +140,7 @@
"views": [], "views": [],
"setupQueries": [ "setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1cbb12db54fc964fac579051101a6c67')" "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '01fd1bdfcfa83b65d83ff1209b964329')"
] ]
} }
} }

View file

@ -0,0 +1,152 @@
{
"formatVersion": 1,
"database": {
"version": 5,
"identityHash": "a0ebadcc625f8b49bf549975d7288f10",
"entities": [
{
"tableName": "BaseNote",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `folder` TEXT NOT NULL, `color` TEXT NOT NULL, `title` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `modifiedTimestamp` INTEGER NOT NULL, `labels` TEXT NOT NULL, `body` TEXT NOT NULL, `spans` TEXT NOT NULL, `items` TEXT NOT NULL, `images` TEXT NOT NULL, `files` TEXT NOT NULL, `audios` TEXT NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "folder",
"columnName": "folder",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "color",
"columnName": "color",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "pinned",
"columnName": "pinned",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "modifiedTimestamp",
"columnName": "modifiedTimestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "labels",
"columnName": "labels",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "body",
"columnName": "body",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "spans",
"columnName": "spans",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "items",
"columnName": "items",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "images",
"columnName": "images",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "files",
"columnName": "files",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "audios",
"columnName": "audios",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_BaseNote_id_folder_pinned_timestamp_labels",
"unique": false,
"columnNames": [
"id",
"folder",
"pinned",
"timestamp",
"labels"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_BaseNote_id_folder_pinned_timestamp_labels` ON `${TABLE_NAME}` (`id`, `folder`, `pinned`, `timestamp`, `labels`)"
}
],
"foreignKeys": []
},
{
"tableName": "Label",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` TEXT NOT NULL, PRIMARY KEY(`value`))",
"fields": [
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"value"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a0ebadcc625f8b49bf549975d7288f10')"
]
}
}

View file

@ -0,0 +1,158 @@
{
"formatVersion": 1,
"database": {
"version": 6,
"identityHash": "3ac03ff6740f6a6bcb19de11c7b3d750",
"entities": [
{
"tableName": "BaseNote",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `folder` TEXT NOT NULL, `color` TEXT NOT NULL, `title` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `modifiedTimestamp` INTEGER NOT NULL, `labels` TEXT NOT NULL, `body` TEXT NOT NULL, `spans` TEXT NOT NULL, `items` TEXT NOT NULL, `images` TEXT NOT NULL, `files` TEXT NOT NULL, `audios` TEXT NOT NULL, `reminders` TEXT NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "folder",
"columnName": "folder",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "color",
"columnName": "color",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "pinned",
"columnName": "pinned",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "modifiedTimestamp",
"columnName": "modifiedTimestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "labels",
"columnName": "labels",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "body",
"columnName": "body",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "spans",
"columnName": "spans",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "items",
"columnName": "items",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "images",
"columnName": "images",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "files",
"columnName": "files",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "audios",
"columnName": "audios",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "reminders",
"columnName": "reminders",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_BaseNote_id_folder_pinned_timestamp_labels",
"unique": false,
"columnNames": [
"id",
"folder",
"pinned",
"timestamp",
"labels"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_BaseNote_id_folder_pinned_timestamp_labels` ON `${TABLE_NAME}` (`id`, `folder`, `pinned`, `timestamp`, `labels`)"
}
],
"foreignKeys": []
},
{
"tableName": "Label",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` TEXT NOT NULL, PRIMARY KEY(`value`))",
"fields": [
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"value"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3ac03ff6740f6a6bcb19de11c7b3d750')"
]
}
}

View file

@ -0,0 +1,158 @@
{
"formatVersion": 1,
"database": {
"version": 7,
"identityHash": "3ac03ff6740f6a6bcb19de11c7b3d750",
"entities": [
{
"tableName": "BaseNote",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `folder` TEXT NOT NULL, `color` TEXT NOT NULL, `title` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `modifiedTimestamp` INTEGER NOT NULL, `labels` TEXT NOT NULL, `body` TEXT NOT NULL, `spans` TEXT NOT NULL, `items` TEXT NOT NULL, `images` TEXT NOT NULL, `files` TEXT NOT NULL, `audios` TEXT NOT NULL, `reminders` TEXT NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "folder",
"columnName": "folder",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "color",
"columnName": "color",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "pinned",
"columnName": "pinned",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "modifiedTimestamp",
"columnName": "modifiedTimestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "labels",
"columnName": "labels",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "body",
"columnName": "body",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "spans",
"columnName": "spans",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "items",
"columnName": "items",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "images",
"columnName": "images",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "files",
"columnName": "files",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "audios",
"columnName": "audios",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "reminders",
"columnName": "reminders",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_BaseNote_id_folder_pinned_timestamp_labels",
"unique": false,
"columnNames": [
"id",
"folder",
"pinned",
"timestamp",
"labels"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_BaseNote_id_folder_pinned_timestamp_labels` ON `${TABLE_NAME}` (`id`, `folder`, `pinned`, `timestamp`, `labels`)"
}
],
"foreignKeys": []
},
{
"tableName": "Label",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` TEXT NOT NULL, PRIMARY KEY(`value`))",
"fields": [
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"value"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3ac03ff6740f6a6bcb19de11c7b3d750')"
]
}
}

View file

@ -0,0 +1,158 @@
{
"formatVersion": 1,
"database": {
"version": 8,
"identityHash": "3ac03ff6740f6a6bcb19de11c7b3d750",
"entities": [
{
"tableName": "BaseNote",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `folder` TEXT NOT NULL, `color` TEXT NOT NULL, `title` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `modifiedTimestamp` INTEGER NOT NULL, `labels` TEXT NOT NULL, `body` TEXT NOT NULL, `spans` TEXT NOT NULL, `items` TEXT NOT NULL, `images` TEXT NOT NULL, `files` TEXT NOT NULL, `audios` TEXT NOT NULL, `reminders` TEXT NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "folder",
"columnName": "folder",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "color",
"columnName": "color",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "pinned",
"columnName": "pinned",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "modifiedTimestamp",
"columnName": "modifiedTimestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "labels",
"columnName": "labels",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "body",
"columnName": "body",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "spans",
"columnName": "spans",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "items",
"columnName": "items",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "images",
"columnName": "images",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "files",
"columnName": "files",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "audios",
"columnName": "audios",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "reminders",
"columnName": "reminders",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_BaseNote_id_folder_pinned_timestamp_labels",
"unique": false,
"columnNames": [
"id",
"folder",
"pinned",
"timestamp",
"labels"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_BaseNote_id_folder_pinned_timestamp_labels` ON `${TABLE_NAME}` (`id`, `folder`, `pinned`, `timestamp`, `labels`)"
}
],
"foreignKeys": []
},
{
"tableName": "Label",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` TEXT NOT NULL, PRIMARY KEY(`value`))",
"fields": [
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"value"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3ac03ff6740f6a6bcb19de11c7b3d750')"
]
}
}

View file

@ -0,0 +1,164 @@
{
"formatVersion": 1,
"database": {
"version": 9,
"identityHash": "042b20b5b4cfc8415e6cf6348196e869",
"entities": [
{
"tableName": "BaseNote",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` TEXT NOT NULL, `folder` TEXT NOT NULL, `color` TEXT NOT NULL, `title` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `modifiedTimestamp` INTEGER NOT NULL, `labels` TEXT NOT NULL, `body` TEXT NOT NULL, `spans` TEXT NOT NULL, `items` TEXT NOT NULL, `images` TEXT NOT NULL, `files` TEXT NOT NULL, `audios` TEXT NOT NULL, `reminders` TEXT NOT NULL, `viewMode` TEXT NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "folder",
"columnName": "folder",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "color",
"columnName": "color",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "pinned",
"columnName": "pinned",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "modifiedTimestamp",
"columnName": "modifiedTimestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "labels",
"columnName": "labels",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "body",
"columnName": "body",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "spans",
"columnName": "spans",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "items",
"columnName": "items",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "images",
"columnName": "images",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "files",
"columnName": "files",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "audios",
"columnName": "audios",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "reminders",
"columnName": "reminders",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "viewMode",
"columnName": "viewMode",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_BaseNote_id_folder_pinned_timestamp_labels",
"unique": false,
"columnNames": [
"id",
"folder",
"pinned",
"timestamp",
"labels"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_BaseNote_id_folder_pinned_timestamp_labels` ON `${TABLE_NAME}` (`id`, `folder`, `pinned`, `timestamp`, `labels`)"
}
],
"foreignKeys": []
},
{
"tableName": "Label",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` TEXT NOT NULL, PRIMARY KEY(`value`))",
"fields": [
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"value"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '042b20b5b4cfc8415e6cf6348196e869')"
]
}
}

View file

@ -6,21 +6,27 @@
<uses-permission <uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE" android:name="android.permission.ACCESS_NETWORK_STATE"
tools:node="remove" /> tools:node="remove" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<application <application
android:name=".NotallyApplication" android:name=".NotallyXApplication"
android:allowBackup="true" android:allowBackup="true"
android:appCategory="productivity" android:appCategory="productivity"
android:dataExtractionRules="@xml/data_rules" android:dataExtractionRules="@xml/data_rules"
android:fullBackupContent="@xml/backup_content" android:fullBackupContent="@xml/backup_content"
android:icon="@mipmap/notally" android:icon="@mipmap/notallyx"
android:label="@string/app_name" android:label="@string/app_name"
android:localeConfig="@xml/locales" android:localeConfig="@xml/locales"
android:roundIcon="@mipmap/notally_round" android:roundIcon="@mipmap/notallyx_round"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<provider <provider
@ -36,9 +42,8 @@
</provider> </provider>
<activity <activity
android:name=".activities.MainActivity" android:name=".presentation.activity.main.MainActivity"
android:exported="true" android:exported="true">
android:theme="@style/MainActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -52,34 +57,57 @@
</activity> </activity>
<activity <activity
android:name=".activities.MakeList" android:name=".presentation.activity.note.EditListActivity"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity <activity
android:name=".activities.TakeNote" android:name=".presentation.activity.note.EditNoteActivity"
android:exported="true" android:exported="true"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/plain" /> <data android:mimeType="*/*" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="*/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file" android:mimeType="text/*" />
<data android:scheme="content" android:mimeType="text/*" />
<data android:scheme="file" android:mimeType="application/json" />
<data android:scheme="content" android:mimeType="application/json" />
<data android:scheme="file" android:mimeType="application/xml" />
<data android:scheme="content" android:mimeType="application/xml" />
</intent-filter>
</activity> </activity>
<activity android:name=".activities.ViewImage" /> <activity android:name=".presentation.activity.note.ViewImageActivity" />
<activity android:name=".activities.SelectLabels" /> <activity android:name=".presentation.activity.note.SelectLabelsActivity" />
<activity android:name=".presentation.activity.note.reminders.RemindersActivity" />
<activity <activity
android:name=".activities.RecordAudio" android:name=".presentation.activity.note.RecordAudioActivity"
android:launchMode="singleTask" /> android:launchMode="singleTask" />
<activity android:name=".activities.PlayAudio" /> <activity android:name=".presentation.activity.note.PlayAudioActivity" />
<activity <activity
android:name=".activities.ConfigureWidget" android:name=".presentation.activity.ConfigureWidgetActivity"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>
@ -88,8 +116,23 @@
</activity> </activity>
<activity
android:name=".presentation.activity.note.PickNoteActivity"
android:exported="false">
</activity>
<activity
android:name=".utils.ErrorActivity"
android:exported="true"
android:label="@string/unknown_error"
android:process=":error_activity">
<intent-filter>
<action android:name="cat.ereza.customactivityoncrash.ERROR" />
</intent-filter>
</activity>
<receiver <receiver
android:name=".widget.WidgetProvider" android:name=".presentation.widget.WidgetProvider"
android:exported="false" android:exported="false"
android:label="@string/single_note_or_list"> android:label="@string/single_note_or_list">
@ -103,23 +146,27 @@
</receiver> </receiver>
<receiver android:name=".presentation.activity.note.reminders.ReminderReceiver" android:enabled="true" android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</receiver>
<service <service
android:name=".widget.WidgetService" android:name=".presentation.widget.WidgetService"
android:permission="android.permission.BIND_REMOTEVIEWS" /> android:permission="android.permission.BIND_REMOTEVIEWS" />
<service <service
android:name=".AttachmentDeleteService" android:name=".utils.audio.AudioRecordService"
android:exported="false"
android:foregroundServiceType="dataSync" />
<service
android:name=".audio.AudioRecordService"
android:exported="false" android:exported="false"
android:foregroundServiceType="microphone" /> android:foregroundServiceType="microphone" />
<service <service
android:name=".audio.AudioPlayService" android:name=".utils.audio.AudioPlayService"
android:exported="false" /> android:exported="false"
android:foregroundServiceType="mediaPlayback" />
</application> </application>

View file

@ -0,0 +1,83 @@
package android.print
import android.content.ContentResolver
import android.content.Context
import android.webkit.WebView
import android.webkit.WebViewClient
import androidx.documentfile.provider.DocumentFile
import com.philkes.notallyx.utils.nameWithoutExtension
/**
* Needs to be in android.print package to access the package private methods of
* [PrintDocumentAdapter]
*/
fun Context.printPdf(file: DocumentFile, content: String, pdfPrintListener: PdfPrintListener) {
val webView = WebView(this)
webView.loadDataWithBaseURL(null, content, "text/html", "utf-8", null)
webView.webViewClient =
object : WebViewClient() {
override fun onPageFinished(view: WebView?, url: String?) {
val adapter = webView.createPrintDocumentAdapter(file.nameWithoutExtension!!)
contentResolver.printPdf(file, adapter, pdfPrintListener)
}
}
}
private fun ContentResolver.printPdf(
file: DocumentFile,
adapter: PrintDocumentAdapter,
pdfPrintListener: PdfPrintListener,
) {
val onLayoutResult =
object : PrintDocumentAdapter.LayoutResultCallback() {
override fun onLayoutFailed(error: CharSequence?) {
pdfPrintListener.onFailure(error)
}
override fun onLayoutFinished(info: PrintDocumentInfo?, changed: Boolean) {
this@printPdf.writeToFile(file, adapter, pdfPrintListener)
}
}
adapter.onLayout(null, createPrintAttributes(), null, onLayoutResult, null)
}
private fun ContentResolver.writeToFile(
file: DocumentFile,
adapter: PrintDocumentAdapter,
pdfPrintListener: PdfPrintListener,
) {
val onWriteResult =
object : PrintDocumentAdapter.WriteResultCallback() {
override fun onWriteFailed(error: CharSequence?) {
pdfPrintListener.onFailure(error)
}
override fun onWriteFinished(pages: Array<out PageRange>?) {
pdfPrintListener.onSuccess(file)
}
}
val pages = arrayOf(PageRange.ALL_PAGES)
val fileDescriptor = openFileDescriptor(file.uri, "rw")
adapter.onWrite(pages, fileDescriptor, null, onWriteResult)
}
private fun createPrintAttributes(): PrintAttributes {
return with(PrintAttributes.Builder()) {
setMediaSize(PrintAttributes.MediaSize.ISO_A4)
setMinMargins(PrintAttributes.Margins.NO_MARGINS)
setResolution(PrintAttributes.Resolution("Standard", "Standard", 100, 100))
build()
}
}
interface PdfPrintListener {
fun onSuccess(file: DocumentFile)
fun onFailure(message: CharSequence?)
}

View file

@ -1,79 +0,0 @@
package android.print
import android.content.Context
import android.os.ParcelFileDescriptor
import android.webkit.WebView
import android.webkit.WebViewClient
import java.io.File
/**
* This class needs to be in android.print package to access the package private methods of
* [PrintDocumentAdapter]
*/
object PostPDFGenerator {
fun create(file: File, content: String, context: Context, onResult: OnResult) {
val webView = WebView(context)
webView.loadDataWithBaseURL(null, content, "text/html", "utf-8", null)
webView.webViewClient =
object : WebViewClient() {
override fun onPageFinished(view: WebView?, url: String?) {
val adapter = webView.createPrintDocumentAdapter(file.nameWithoutExtension)
print(file, adapter, onResult)
}
}
}
private fun print(file: File, adapter: PrintDocumentAdapter, onResult: OnResult) {
val onLayoutResult =
object : PrintDocumentAdapter.LayoutResultCallback() {
override fun onLayoutFailed(error: CharSequence?) {
onResult.onFailure(error)
}
override fun onLayoutFinished(info: PrintDocumentInfo?, changed: Boolean) {
writeToFile(file, adapter, onResult)
}
}
adapter.onLayout(null, getPrintAttributes(), null, onLayoutResult, null)
}
private fun writeToFile(file: File, adapter: PrintDocumentAdapter, onResult: OnResult) {
val onWriteResult =
object : PrintDocumentAdapter.WriteResultCallback() {
override fun onWriteFailed(error: CharSequence?) {
onResult.onFailure(error)
}
override fun onWriteFinished(pages: Array<out PageRange>?) {
onResult.onSuccess(file)
}
}
val pages = arrayOf(PageRange.ALL_PAGES)
if (!file.exists()) {
file.createNewFile()
}
val fileDescriptor = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_WRITE)
adapter.onWrite(pages, fileDescriptor, null, onWriteResult)
}
private fun getPrintAttributes(): PrintAttributes {
val builder = PrintAttributes.Builder()
builder.setMediaSize(PrintAttributes.MediaSize.ISO_A4)
builder.setMinMargins(PrintAttributes.Margins.NO_MARGINS)
builder.setResolution(PrintAttributes.Resolution("Standard", "Standard", 100, 100))
return builder.build()
}
interface OnResult {
fun onSuccess(file: File)
fun onFailure(message: CharSequence?)
}
}

View file

@ -0,0 +1,118 @@
package androidx.recyclerview.widget
import android.graphics.Rect
import android.view.View
import android.view.ViewGroup
import androidx.core.view.children
import androidx.core.widget.NestedScrollView
import kotlin.math.abs
class NestedScrollViewItemTouchHelper(
callback: Callback,
private val scrollView: NestedScrollView,
) : ItemTouchHelper(callback) {
private var selectedStartY: Int = -1
private var selectedStartScrollY: Float = -1f
private var selectedView: View? = null
private var dragScrollStartTimeInMs: Long = 0
private var lastmDy = 0f
private var lastScrollY = 0
private var tmpRect: Rect? = null
override fun select(selected: RecyclerView.ViewHolder?, actionState: Int) {
super.select(selected, actionState)
if (selected != null) {
selectedView = selected.itemView
selectedStartY = selected.itemView.top
selectedStartScrollY = scrollView!!.scrollY.toFloat()
}
}
/**
* Scrolls [scrollView] when an item in [mRecyclerView] is dragged to the top or bottom of the
* [scrollView].
*
* Inspired by
* [https://stackoverflow.com/a/70699988/9748566](https://stackoverflow.com/a/70699988/9748566)
*/
override fun scrollIfNecessary(): Boolean {
if (mSelected == null) {
dragScrollStartTimeInMs = Long.MIN_VALUE
return false
}
val now = System.currentTimeMillis()
val scrollDuration =
if (dragScrollStartTimeInMs == Long.MIN_VALUE) 0 else now - dragScrollStartTimeInMs
val lm = mRecyclerView.layoutManager
if (tmpRect == null) {
tmpRect = Rect()
}
var scrollY = 0
val currentScrollY = scrollView.scrollY
// We need to use the height of NestedScrollView, not RecyclerView's!
val actualShowingHeight =
scrollView.height - mRecyclerView.top - mRecyclerView.paddingBottom
lm!!.calculateItemDecorationsForChild(mSelected.itemView, tmpRect!!)
if (lm.canScrollVertically()) {
// Keep scrolling if the user didnt change the drag direction
if (lastScrollY != 0 && abs(lastmDy) >= abs(mDy)) {
scrollY = lastScrollY
} else {
// The true current Y of the item in NestedScrollView, not in RecyclerView!
val curY = (selectedStartY + mDy - currentScrollY).toInt()
// The true mDy should plus the initial scrollY and minus current scrollY of
// NestedScrollView
val checkDy = (mDy + selectedStartScrollY - currentScrollY).toInt()
val topDiff = curY - tmpRect!!.top - mRecyclerView.paddingTop
if (checkDy < 0 && topDiff < 0) { // User is draging the item out of the top edge.
scrollY = topDiff
} else if (checkDy > 0) { // User is draging the item out of the bottom edge.
val bottomDiff = (curY + mSelected.itemView.height - actualShowingHeight) + 10
if (bottomDiff >= 0) {
scrollY = bottomDiff
}
} else {
scrollY = 0
}
}
}
lastScrollY = scrollY
lastmDy = mDy
if (scrollY != 0) {
scrollY =
mCallback.interpolateOutOfBoundsScroll(
mRecyclerView,
mSelected.itemView.height,
scrollY,
actualShowingHeight,
scrollDuration,
)
}
if (scrollY != 0) {
val maxScrollY = scrollView.childrenHeightsSum - scrollView.height
// Check if we can scroll further before applying the scroll
if (
(scrollY < 0 && scrollView.scrollY > 0) ||
(scrollY > 0 && scrollView.scrollY < maxScrollY)
) {
if (dragScrollStartTimeInMs == Long.MIN_VALUE) {
dragScrollStartTimeInMs = now
}
scrollView.scrollBy(0, scrollY)
// Update the dragged item position as well
selectedView?.translationY = selectedView!!.translationY + scrollY
return true
}
}
dragScrollStartTimeInMs = Long.MIN_VALUE
lastScrollY = 0
lastmDy = 0f
return false
}
private val ViewGroup.childrenHeightsSum
get() = children.map { it.measuredHeight }.sum()
}

View file

@ -1,119 +0,0 @@
package com.omgodse.notally
import android.app.Application
import android.app.Notification
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.Service
import android.content.Context
import android.content.Intent
import android.os.Build
import android.os.IBinder
import androidx.core.content.ContextCompat
import com.omgodse.notally.miscellaneous.IO
import com.omgodse.notally.room.Attachment
import com.omgodse.notally.room.Audio
import com.omgodse.notally.room.Image
import java.io.File
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.cancel
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class AttachmentDeleteService : Service() {
private val scope = MainScope()
private val channel = Channel<ArrayList<Attachment>>()
override fun onCreate() {
val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
val builder = Notification.Builder(application)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channelId = "com.omgodse.fileUpdates"
val channel =
NotificationChannel(
channelId,
"Backups and Images",
NotificationManager.IMPORTANCE_DEFAULT,
)
manager.createNotificationChannel(channel)
builder.setChannelId(channelId)
}
builder.setContentTitle(getString(R.string.deleting_images))
builder.setSmallIcon(R.drawable.notification_delete)
builder.setProgress(0, 0, true)
builder.setOnlyAlertOnce(true)
/*
Prevent user from dismissing notification in Android 13 (33) and above
https://developer.android.com/guide/components/foreground-services#user-dismiss-notification
*/
builder.setOngoing(true)
/*
On Android 12 (31) and above, the system waits 10 seconds before showing the notification.
https://developer.android.com/guide/components/foreground-services#notification-immediate
*/
startForeground(1, builder.build())
scope.launch {
withContext(Dispatchers.IO) {
val imageRoot = IO.getExternalImagesDirectory(application)
val audioRoot = IO.getExternalAudioDirectory(application)
do {
val attachments = channel.receive()
attachments.forEachIndexed { index, attachment ->
val file =
when (attachment) {
is Audio ->
if (audioRoot != null) File(audioRoot, attachment.name)
else null
is Image ->
if (imageRoot != null) File(imageRoot, attachment.name)
else null
}
if (file != null && file.exists()) {
file.delete()
}
builder.setContentText(
getString(R.string.count, index + 1, attachments.size)
)
builder.setProgress(attachments.size, index + 1, false)
manager.notify(1, builder.build())
}
} while (!channel.isEmpty)
channel.close()
stopSelf()
}
}
}
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
scope.launch {
val list =
requireNotNull(intent).getParcelableArrayListExtra<Attachment>(EXTRA_ATTACHMENTS)
withContext(Dispatchers.IO) { channel.send(requireNotNull(list)) }
}
return START_NOT_STICKY
}
override fun onDestroy() {
scope.cancel()
}
override fun onBind(intent: Intent?): IBinder? = null
companion object {
private const val EXTRA_ATTACHMENTS = "com.omgodse.notally.EXTRA_ATTACHMENTS"
fun start(app: Application, list: ArrayList<out Attachment>) {
val intent = Intent(app, AttachmentDeleteService::class.java)
intent.putParcelableArrayListExtra(EXTRA_ATTACHMENTS, list)
ContextCompat.startForegroundService(app, intent)
}
}
}

View file

@ -1,79 +0,0 @@
package com.omgodse.notally
import android.app.Application
import android.content.Context
import android.net.Uri
import androidx.documentfile.provider.DocumentFile
import androidx.work.Worker
import androidx.work.WorkerParameters
import com.omgodse.notally.miscellaneous.Export
import com.omgodse.notally.miscellaneous.IO
import com.omgodse.notally.miscellaneous.Operations
import com.omgodse.notally.preferences.AutoBackup
import com.omgodse.notally.preferences.Preferences
import com.omgodse.notally.room.Converters
import com.omgodse.notally.room.NotallyDatabase
import java.text.SimpleDateFormat
import java.util.Locale
import java.util.zip.ZipOutputStream
class AutoBackupWorker(private val context: Context, params: WorkerParameters) :
Worker(context, params) {
override fun doWork(): Result {
val app = context.applicationContext as Application
val preferences = Preferences.getInstance(app)
val backupPath = preferences.autoBackup.value
if (backupPath != AutoBackup.emptyPath) {
val uri = Uri.parse(backupPath)
val folder = requireNotNull(DocumentFile.fromTreeUri(app, uri))
if (folder.exists()) {
val formatter =
SimpleDateFormat("yyyyMMdd HHmmss '(Notally Backup)'", Locale.ENGLISH)
val name = formatter.format(System.currentTimeMillis())
val file = requireNotNull(folder.createFile("application/zip", name))
val outputStream = requireNotNull(app.contentResolver.openOutputStream(file.uri))
val zipStream = ZipOutputStream(outputStream)
val database = NotallyDatabase.getDatabase(app)
database.checkpoint()
Export.backupDatabase(app, zipStream)
val imageRoot = IO.getExternalImagesDirectory(app)
val audioRoot = IO.getExternalAudioDirectory(app)
database
.getBaseNoteDao()
.getAllImages()
.asSequence()
.flatMap { string -> Converters.jsonToImages(string) }
.forEach { image ->
try {
Export.backupFile(zipStream, imageRoot, "Images", image.name)
} catch (exception: Exception) {
Operations.log(app, exception)
}
}
database
.getBaseNoteDao()
.getAllAudios()
.asSequence()
.flatMap { string -> Converters.jsonToAudios(string) }
.forEach { audio ->
try {
Export.backupFile(zipStream, audioRoot, "Audios", audio.name)
} catch (exception: Exception) {
Operations.log(app, exception)
}
}
zipStream.close()
}
}
return Result.success()
}
}

View file

@ -1,8 +0,0 @@
package com.omgodse.notally
class BackupProgress(
val inProgress: Boolean,
val current: Int,
val total: Int,
val indeterminate: Boolean,
)

View file

@ -1,8 +0,0 @@
package com.omgodse.notally
import com.omgodse.notally.room.BaseNote
object Cache {
var list: List<BaseNote> = ArrayList()
}

View file

@ -1,36 +0,0 @@
package com.omgodse.notally
import android.app.Application
import androidx.appcompat.app.AppCompatDelegate
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.PeriodicWorkRequest
import androidx.work.WorkManager
import com.omgodse.notally.preferences.Preferences
import com.omgodse.notally.preferences.Theme
import java.util.concurrent.TimeUnit
class NotallyApplication : Application() {
override fun onCreate() {
super.onCreate()
val preferences = Preferences.getInstance(this)
preferences.theme.observeForever { theme ->
when (theme) {
Theme.dark ->
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
Theme.light ->
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
Theme.followSystem ->
AppCompatDelegate.setDefaultNightMode(
AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
)
}
}
val request =
PeriodicWorkRequest.Builder(AutoBackupWorker::class.java, 12, TimeUnit.HOURS).build()
WorkManager.getInstance(this)
.enqueueUniquePeriodicWork("Auto Backup", ExistingPeriodicWorkPolicy.KEEP, request)
}
}

View file

@ -1,21 +0,0 @@
package com.omgodse.notally
import android.content.Context
import android.util.AttributeSet
import androidx.appcompat.widget.AppCompatEditText
/**
* Implementation that fixes a bug in Lollipop where clicking on the overflow icon in the custom
* text selection mode causes it to end. For more information, see this ->
* https://issuetracker.google.com/issues/36937508
*/
class OverflowEditText(context: Context, attrs: AttributeSet) : AppCompatEditText(context, attrs) {
var isActionModeOn = false
override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
if (!isActionModeOn) {
super.onWindowFocusChanged(hasWindowFocus)
}
}
}

View file

@ -1,108 +0,0 @@
package com.omgodse.notally.activities
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.omgodse.notally.R
import com.omgodse.notally.databinding.ActivityConfigureWidgetBinding
import com.omgodse.notally.miscellaneous.IO
import com.omgodse.notally.preferences.Preferences
import com.omgodse.notally.preferences.View
import com.omgodse.notally.recyclerview.ItemListener
import com.omgodse.notally.recyclerview.adapter.BaseNoteAdapter
import com.omgodse.notally.room.BaseNote
import com.omgodse.notally.room.Header
import com.omgodse.notally.room.NotallyDatabase
import com.omgodse.notally.viewmodels.BaseNoteModel
import com.omgodse.notally.widget.WidgetProvider
import java.util.Collections
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class ConfigureWidget : AppCompatActivity(), ItemListener {
private lateinit var adapter: BaseNoteAdapter
private val id by lazy {
intent.getIntExtra(
AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID,
)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val binding = ActivityConfigureWidgetBinding.inflate(layoutInflater)
setContentView(binding.root)
val result = Intent()
result.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id)
setResult(RESULT_CANCELED, result)
val preferences = Preferences.getInstance(application)
val maxItems = preferences.maxItems
val maxLines = preferences.maxLines
val maxTitle = preferences.maxTitle
val textSize = preferences.textSize.value
val dateFormat = preferences.dateFormat.value
val mediaRoot = IO.getExternalImagesDirectory(application)
adapter =
BaseNoteAdapter(
Collections.emptySet(),
dateFormat,
textSize,
maxItems,
maxLines,
maxTitle,
mediaRoot,
this,
)
binding.RecyclerView.adapter = adapter
binding.RecyclerView.setHasFixedSize(true)
binding.RecyclerView.layoutManager =
if (preferences.view.value == View.grid) {
StaggeredGridLayoutManager(2, RecyclerView.VERTICAL)
} else LinearLayoutManager(this)
val database = NotallyDatabase.getDatabase(application)
val pinned = Header(getString(R.string.pinned))
val others = Header(getString(R.string.others))
lifecycleScope.launch {
val notes =
withContext(Dispatchers.IO) {
val raw = database.getBaseNoteDao().getAllNotes()
BaseNoteModel.transform(raw, pinned, others)
}
adapter.submitList(notes)
}
}
override fun onClick(position: Int) {
if (position != -1) {
val preferences = Preferences.getInstance(application)
val noteId = (adapter.currentList[position] as BaseNote).id
preferences.updateWidget(id, noteId)
val manager = AppWidgetManager.getInstance(this)
WidgetProvider.updateWidget(this, manager, id, noteId)
val success = Intent()
success.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id)
setResult(RESULT_OK, success)
finish()
}
}
override fun onLongClick(position: Int) {}
}

View file

@ -1,449 +0,0 @@
package com.omgodse.notally.activities
import android.app.Activity
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.print.PostPDFGenerator
import android.transition.TransitionManager
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.Toast
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.FileProvider
import androidx.core.view.GravityCompat
import androidx.core.view.forEach
import androidx.core.widget.doAfterTextChanged
import androidx.drawerlayout.widget.DrawerLayout
import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavController
import androidx.navigation.NavDestination
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.navOptions
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.navigateUp
import androidx.navigation.ui.setupActionBarWithNavController
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.transition.platform.MaterialFade
import com.omgodse.notally.MenuDialog
import com.omgodse.notally.R
import com.omgodse.notally.databinding.ActivityMainBinding
import com.omgodse.notally.databinding.DialogColorBinding
import com.omgodse.notally.miscellaneous.Operations
import com.omgodse.notally.miscellaneous.add
import com.omgodse.notally.miscellaneous.applySpans
import com.omgodse.notally.recyclerview.ItemListener
import com.omgodse.notally.recyclerview.adapter.ColorAdapter
import com.omgodse.notally.room.BaseNote
import com.omgodse.notally.room.Color
import com.omgodse.notally.room.Folder
import com.omgodse.notally.room.Type
import com.omgodse.notally.viewmodels.BaseNoteModel
import java.io.File
import kotlinx.coroutines.launch
class MainActivity : AppCompatActivity() {
private lateinit var binding: ActivityMainBinding
private lateinit var navController: NavController
private lateinit var configuration: AppBarConfiguration
private val model: BaseNoteModel by viewModels()
override fun onBackPressed() {
if (model.actionMode.enabled.value) {
model.actionMode.close(true)
} else super.onBackPressed()
}
override fun onSupportNavigateUp(): Boolean {
return navController.navigateUp(configuration)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
setSupportActionBar(binding.Toolbar)
setupFAB()
setupMenu()
setupActionMode()
setupNavigation()
setupSearch()
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == REQUEST_EXPORT_FILE && resultCode == Activity.RESULT_OK) {
data?.data?.let { uri -> model.writeCurrentFileToUri(uri) }
}
}
private fun setupFAB() {
binding.TakeNote.setOnClickListener {
val intent = Intent(this, TakeNote::class.java)
startActivity(intent)
}
binding.MakeList.setOnClickListener {
val intent = Intent(this, MakeList::class.java)
startActivity(intent)
}
}
private fun setupMenu() {
val menu = binding.NavigationView.menu
menu.add(0, R.id.Notes, 0, R.string.notes).setCheckable(true).setIcon(R.drawable.home)
menu.add(1, R.id.Labels, 0, R.string.labels).setCheckable(true).setIcon(R.drawable.label)
menu.add(2, R.id.Deleted, 0, R.string.deleted).setCheckable(true).setIcon(R.drawable.delete)
menu
.add(2, R.id.Archived, 0, R.string.archived)
.setCheckable(true)
.setIcon(R.drawable.archive)
menu
.add(3, R.id.Settings, 0, R.string.settings)
.setCheckable(true)
.setIcon(R.drawable.settings)
}
private fun setupActionMode() {
binding.ActionMode.setNavigationOnClickListener { model.actionMode.close(true) }
val transition = MaterialFade()
transition.secondaryAnimatorProvider = null
transition.excludeTarget(binding.NavHostFragment, true)
transition.excludeChildren(binding.NavHostFragment, true)
transition.excludeTarget(binding.TakeNote, true)
transition.excludeTarget(binding.MakeList, true)
transition.excludeTarget(binding.NavigationView, true)
model.actionMode.enabled.observe(this) { enabled ->
TransitionManager.beginDelayedTransition(binding.RelativeLayout, transition)
if (enabled) {
binding.Toolbar.visibility = View.GONE
binding.ActionMode.visibility = View.VISIBLE
binding.DrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
} else {
binding.Toolbar.visibility = View.VISIBLE
binding.ActionMode.visibility = View.GONE
binding.DrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNDEFINED)
}
}
val menu = binding.ActionMode.menu
val pinned = menu.add(R.string.pin, R.drawable.pin) {}
val share = menu.add(R.string.share, R.drawable.share) { share() }
val labels = menu.add(R.string.labels, R.drawable.label) { label() }
val export = createExportMenu(menu)
val changeColor = menu.add(R.string.change_color, R.drawable.change_color) { changeColor() }
val delete =
menu.add(R.string.delete, R.drawable.delete) { model.moveBaseNotes(Folder.DELETED) }
val archive =
menu.add(R.string.archive, R.drawable.archive) { model.moveBaseNotes(Folder.ARCHIVED) }
val restore =
menu.add(R.string.restore, R.drawable.restore) { model.moveBaseNotes(Folder.NOTES) }
val unarchive =
menu.add(R.string.unarchive, R.drawable.unarchive) { model.moveBaseNotes(Folder.NOTES) }
val deleteForever = menu.add(R.string.delete_forever, R.drawable.delete) { deleteForever() }
model.actionMode.count.observe(this) { count ->
if (count == 0) {
menu.forEach { item -> item.setVisible(false) }
} else {
binding.ActionMode.title = count.toString()
val baseNote = model.actionMode.getFirstNote()
if (count == 1) {
if (baseNote.pinned) {
pinned.setTitle(R.string.unpin)
pinned.setIcon(R.drawable.unpin)
} else {
pinned.setTitle(R.string.pin)
pinned.setIcon(R.drawable.pin)
}
pinned.onClick { model.pinBaseNote(!baseNote.pinned) }
}
pinned.setVisible(count == 1)
share.setVisible(count == 1)
labels.setVisible(count == 1)
export.setVisible(count == 1)
changeColor.setVisible(true)
val folder = baseNote.folder
delete.setVisible(folder == Folder.NOTES || folder == Folder.ARCHIVED)
archive.setVisible(folder == Folder.NOTES)
restore.setVisible(folder == Folder.DELETED)
unarchive.setVisible(folder == Folder.ARCHIVED)
deleteForever.setVisible(folder == Folder.DELETED)
}
}
}
private fun createExportMenu(menu: Menu): MenuItem {
val export = menu.addSubMenu(R.string.export)
export.setIcon(R.drawable.export)
export.item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
export.add("PDF").onClick { exportToPDF() }
export.add("TXT").onClick { exportToTXT() }
export.add("JSON").onClick { exportToJSON() }
export.add("HTML").onClick { exportToHTML() }
return export.item
}
fun MenuItem.onClick(function: () -> Unit) {
setOnMenuItemClickListener {
function()
return@setOnMenuItemClickListener false
}
}
private fun share() {
val baseNote = model.actionMode.getFirstNote()
val body =
when (baseNote.type) {
Type.NOTE -> baseNote.body.applySpans(baseNote.spans)
Type.LIST -> Operations.getBody(baseNote.items)
}
Operations.shareNote(this, baseNote.title, body)
}
private fun changeColor() {
val dialog = MaterialAlertDialogBuilder(this).setTitle(R.string.change_color).create()
val colorAdapter =
ColorAdapter(
object : ItemListener {
override fun onClick(position: Int) {
dialog.dismiss()
val color = Color.entries[position]
model.colorBaseNote(color)
}
override fun onLongClick(position: Int) {}
}
)
val dialogBinding = DialogColorBinding.inflate(layoutInflater)
dialogBinding.RecyclerView.adapter = colorAdapter
dialog.setView(dialogBinding.root)
dialog.show()
}
private fun deleteForever() {
MaterialAlertDialogBuilder(this)
.setMessage(R.string.delete_selected_notes)
.setPositiveButton(R.string.delete) { _, _ -> model.deleteBaseNotes() }
.setNegativeButton(R.string.cancel, null)
.show()
}
private fun label() {
val baseNote = model.actionMode.getFirstNote()
lifecycleScope.launch {
val labels = model.getAllLabels()
if (labels.isNotEmpty()) {
displaySelectLabelsDialog(labels, baseNote)
} else {
model.actionMode.close(true)
navigateWithAnimation(R.id.Labels)
}
}
}
private fun displaySelectLabelsDialog(labels: Array<String>, baseNote: BaseNote) {
val checkedPositions =
BooleanArray(labels.size) { index -> baseNote.labels.contains(labels[index]) }
MaterialAlertDialogBuilder(this)
.setTitle(R.string.labels)
.setNegativeButton(R.string.cancel, null)
.setMultiChoiceItems(labels, checkedPositions) { _, which, isChecked ->
checkedPositions[which] = isChecked
}
.setPositiveButton(R.string.save) { _, _ ->
val new = ArrayList<String>()
checkedPositions.forEachIndexed { index, checked ->
if (checked) {
val label = labels[index]
new.add(label)
}
}
model.updateBaseNoteLabels(new, baseNote.id)
}
.show()
}
private fun exportToPDF() {
val baseNote = model.actionMode.getFirstNote()
model.getPDFFile(
baseNote,
object : PostPDFGenerator.OnResult {
override fun onSuccess(file: File) {
showFileOptionsDialog(file, "application/pdf")
}
override fun onFailure(message: CharSequence?) {
Toast.makeText(
this@MainActivity,
R.string.something_went_wrong,
Toast.LENGTH_SHORT,
)
.show()
}
},
)
}
private fun exportToTXT() {
val baseNote = model.actionMode.getFirstNote()
lifecycleScope.launch {
val file = model.getTXTFile(baseNote)
showFileOptionsDialog(file, "text/plain")
}
}
private fun exportToJSON() {
val baseNote = model.actionMode.getFirstNote()
lifecycleScope.launch {
val file = model.getJSONFile(baseNote)
showFileOptionsDialog(file, "application/json")
}
}
private fun exportToHTML() {
val baseNote = model.actionMode.getFirstNote()
lifecycleScope.launch {
val file = model.getHTMLFile(baseNote)
showFileOptionsDialog(file, "text/html")
}
}
private fun showFileOptionsDialog(file: File, mimeType: String) {
val uri = FileProvider.getUriForFile(this, "${packageName}.provider", file)
MenuDialog(this)
.add(R.string.share) { shareFile(uri, mimeType) }
.add(R.string.view_file) { viewFile(uri, mimeType) }
.add(R.string.save_to_device) { saveFileToDevice(file, mimeType) }
.show()
}
private fun viewFile(uri: Uri, mimeType: String) {
val intent = Intent(Intent.ACTION_VIEW)
intent.setDataAndType(uri, mimeType)
intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
val chooser = Intent.createChooser(intent, getString(R.string.view_note))
startActivity(chooser)
}
private fun shareFile(uri: Uri, mimeType: String) {
val intent = Intent(Intent.ACTION_SEND)
intent.type = mimeType
intent.putExtra(Intent.EXTRA_STREAM, uri)
val chooser = Intent.createChooser(intent, null)
startActivity(chooser)
}
private fun saveFileToDevice(file: File, mimeType: String) {
val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
intent.type = mimeType
intent.addCategory(Intent.CATEGORY_OPENABLE)
intent.putExtra(Intent.EXTRA_TITLE, file.nameWithoutExtension)
model.currentFile = file
startActivityForResult(intent, REQUEST_EXPORT_FILE)
}
private fun setupNavigation() {
val navHostFragment =
supportFragmentManager.findFragmentById(R.id.NavHostFragment) as NavHostFragment
navController = navHostFragment.navController
configuration = AppBarConfiguration(binding.NavigationView.menu, binding.DrawerLayout)
setupActionBarWithNavController(navController, configuration)
var fragmentIdToLoad: Int? = null
binding.NavigationView.setNavigationItemSelectedListener { item ->
fragmentIdToLoad = item.itemId
binding.DrawerLayout.closeDrawer(GravityCompat.START)
return@setNavigationItemSelectedListener true
}
binding.DrawerLayout.addDrawerListener(
object : DrawerLayout.SimpleDrawerListener() {
override fun onDrawerClosed(drawerView: View) {
if (
fragmentIdToLoad != null &&
navController.currentDestination?.id != fragmentIdToLoad
) {
navigateWithAnimation(requireNotNull(fragmentIdToLoad))
}
}
}
)
navController.addOnDestinationChangedListener { _, destination, _ ->
fragmentIdToLoad = destination.id
binding.NavigationView.setCheckedItem(destination.id)
handleDestinationChange(destination)
}
}
private fun handleDestinationChange(destination: NavDestination) {
if (destination.id == R.id.Notes) {
binding.TakeNote.show()
binding.MakeList.show()
} else {
binding.TakeNote.hide()
binding.MakeList.hide()
}
val inputManager = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
if (destination.id == R.id.Search) {
binding.EnterSearchKeyword.visibility = View.VISIBLE
binding.EnterSearchKeyword.requestFocus()
inputManager.showSoftInput(binding.EnterSearchKeyword, InputMethodManager.SHOW_IMPLICIT)
} else {
binding.EnterSearchKeyword.visibility = View.GONE
inputManager.hideSoftInputFromWindow(binding.EnterSearchKeyword.windowToken, 0)
}
}
private fun navigateWithAnimation(id: Int) {
val options = navOptions {
launchSingleTop = true
anim {
exit = androidx.navigation.ui.R.anim.nav_default_exit_anim
enter = androidx.navigation.ui.R.anim.nav_default_enter_anim
popExit = androidx.navigation.ui.R.anim.nav_default_pop_exit_anim
popEnter = androidx.navigation.ui.R.anim.nav_default_pop_enter_anim
}
popUpTo(navController.graph.startDestination) { inclusive = false }
}
navController.navigate(id, null, options)
}
private fun setupSearch() {
binding.EnterSearchKeyword.setText(model.keyword)
binding.EnterSearchKeyword.doAfterTextChanged { text ->
model.keyword = requireNotNull(text).trim().toString()
}
}
companion object {
private const val REQUEST_EXPORT_FILE = 10
}
}

View file

@ -1,118 +0,0 @@
package com.omgodse.notally.activities
import android.os.Build
import android.view.MenuItem
import android.view.inputmethod.InputMethodManager
import com.omgodse.notally.R
import com.omgodse.notally.changehistory.ChangeHistory
import com.omgodse.notally.miscellaneous.add
import com.omgodse.notally.miscellaneous.setOnNextAction
import com.omgodse.notally.preferences.ListItemSorting
import com.omgodse.notally.preferences.Preferences
import com.omgodse.notally.recyclerview.ListItemNoSortCallback
import com.omgodse.notally.recyclerview.ListItemSortedByCheckedCallback
import com.omgodse.notally.recyclerview.ListItemSortedList
import com.omgodse.notally.recyclerview.ListManager
import com.omgodse.notally.recyclerview.adapter.MakeListAdapter
import com.omgodse.notally.recyclerview.toMutableList
import com.omgodse.notally.room.Type
import com.omgodse.notally.widget.WidgetProvider
class MakeList : NotallyActivity(Type.LIST) {
private lateinit var adapter: MakeListAdapter
private lateinit var items: ListItemSortedList
private lateinit var listManager: ListManager
override suspend fun saveNote() {
model.saveNote(items.toMutableList())
WidgetProvider.sendBroadcast(application, longArrayOf(model.id))
}
override fun setupToolbar() {
super.setupToolbar()
binding.Toolbar.menu.add(
1,
R.string.delete_checked_items,
R.drawable.delete_all,
MenuItem.SHOW_AS_ACTION_IF_ROOM,
) {
listManager.deleteCheckedItems()
}
binding.Toolbar.menu.add(
1,
R.string.check_all_items,
R.drawable.checkbox_fill,
MenuItem.SHOW_AS_ACTION_IF_ROOM,
) {
listManager.changeCheckedForAll(true)
}
binding.Toolbar.menu.add(
1,
R.string.uncheck_all_items,
R.drawable.checkbox,
MenuItem.SHOW_AS_ACTION_IF_ROOM,
) {
listManager.changeCheckedForAll(false)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
binding.Toolbar.menu.setGroupDividerEnabled(true)
}
}
override fun initActionManager(undo: MenuItem, redo: MenuItem) {
changeHistory = ChangeHistory {
undo.isEnabled = changeHistory.canUndo()
redo.isEnabled = changeHistory.canRedo()
}
}
override fun configureUI() {
binding.EnterTitle.setOnNextAction { listManager.moveFocusToNext(-1) }
if (model.isNewNote) {
if (model.items.isEmpty()) {
listManager.add(pushChange = false)
}
}
}
override fun setupListeners() {
super.setupListeners()
binding.AddItem.setOnClickListener { listManager.add() }
}
override fun setStateFromModel() {
super.setStateFromModel()
val elevation = resources.displayMetrics.density * 2
listManager =
ListManager(
binding.RecyclerView,
changeHistory,
preferences,
getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager,
)
adapter =
MakeListAdapter(
model.textSize,
elevation,
Preferences.getInstance(application),
listManager,
)
val sortCallback =
when (preferences.listItemSorting.value) {
ListItemSorting.autoSortByChecked -> ListItemSortedByCheckedCallback(adapter)
else -> ListItemNoSortCallback(adapter)
}
items = ListItemSortedList(sortCallback)
if (sortCallback is ListItemSortedByCheckedCallback) {
sortCallback.setList(items)
}
items.addAll(model.items)
adapter.setList(items)
binding.RecyclerView.adapter = adapter
listManager.adapter = adapter
listManager.initList(items)
}
}

View file

@ -1,515 +0,0 @@
package com.omgodse.notally.activities
import android.Manifest
import android.app.Activity
import android.content.Intent
import android.content.pm.PackageManager
import android.content.res.ColorStateList
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.provider.Settings
import android.text.Editable
import android.util.TypedValue
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup.LayoutParams
import android.widget.Toast
import androidx.activity.viewModels
import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.core.widget.doAfterTextChanged
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.PagerSnapHelper
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.omgodse.notally.R
import com.omgodse.notally.changehistory.ChangeHistory
import com.omgodse.notally.databinding.ActivityNotallyBinding
import com.omgodse.notally.databinding.DialogProgressBinding
import com.omgodse.notally.image.ImageError
import com.omgodse.notally.miscellaneous.Constants
import com.omgodse.notally.miscellaneous.Operations
import com.omgodse.notally.miscellaneous.add
import com.omgodse.notally.miscellaneous.displayFormattedTimestamp
import com.omgodse.notally.preferences.Preferences
import com.omgodse.notally.preferences.TextSize
import com.omgodse.notally.recyclerview.adapter.AudioAdapter
import com.omgodse.notally.recyclerview.adapter.ErrorAdapter
import com.omgodse.notally.recyclerview.adapter.PreviewImageAdapter
import com.omgodse.notally.room.Audio
import com.omgodse.notally.room.Folder
import com.omgodse.notally.room.Image
import com.omgodse.notally.room.Type
import com.omgodse.notally.viewmodels.NotallyModel
import com.omgodse.notally.widget.WidgetProvider
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
abstract class NotallyActivity(private val type: Type) : AppCompatActivity() {
internal lateinit var binding: ActivityNotallyBinding
internal val model: NotallyModel by viewModels()
internal lateinit var preferences: Preferences
internal lateinit var changeHistory: ChangeHistory
override fun finish() {
lifecycleScope.launch(Dispatchers.Main) {
saveNote()
super.finish()
}
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putLong("id", model.id)
lifecycleScope.launch { saveNote() }
}
open suspend fun saveNote() {
model.saveNote()
WidgetProvider.sendBroadcast(application, longArrayOf(model.id))
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
preferences = Preferences.getInstance(application)
model.type = type
initialiseBinding()
setContentView(binding.root)
lifecycleScope.launch {
if (model.isFirstInstance) {
val persistedId = savedInstanceState?.getLong("id")
val selectedId = intent.getLongExtra(Constants.SelectedBaseNote, 0L)
val id = persistedId ?: selectedId
model.setState(id)
if (model.isNewNote && intent.action == Intent.ACTION_SEND) {
handleSharedNote()
}
model.isFirstInstance = false
}
setupToolbar()
setupListeners()
setStateFromModel()
configureUI()
binding.ScrollView.visibility = View.VISIBLE
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (resultCode == Activity.RESULT_OK) {
when (requestCode) {
REQUEST_ADD_IMAGES -> {
val uri = data?.data
val clipData = data?.clipData
if (uri != null) {
val uris = arrayOf(uri)
model.addImages(uris)
} else if (clipData != null) {
val uris =
Array(clipData.itemCount) { index -> clipData.getItemAt(index).uri }
model.addImages(uris)
}
}
REQUEST_VIEW_IMAGES -> {
val list = data?.getParcelableArrayListExtra<Image>(ViewImage.DELETED_IMAGES)
if (!list.isNullOrEmpty()) {
model.deleteImages(list)
}
}
REQUEST_SELECT_LABELS -> {
val list = data?.getStringArrayListExtra(SelectLabels.SELECTED_LABELS)
if (list != null && list != model.labels) {
model.setLabels(list)
Operations.bindLabels(binding.LabelGroup, model.labels, model.textSize)
}
}
REQUEST_RECORD_AUDIO -> model.addAudio()
REQUEST_PLAY_AUDIO -> {
val audio = data?.getParcelableExtra<Audio>(PlayAudio.AUDIO)
if (audio != null) {
model.deleteAudio(audio)
}
}
}
}
}
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<out String>,
grantResults: IntArray,
) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
when (requestCode) {
REQUEST_NOTIFICATION_PERMISSION -> selectImages()
REQUEST_AUDIO_PERMISSION -> {
if (
grantResults.isNotEmpty() &&
grantResults[0] == PackageManager.PERMISSION_GRANTED
) {
recordAudio()
} else handleRejection()
}
}
}
protected open fun initActionManager(undo: MenuItem, redo: MenuItem) {
changeHistory = ChangeHistory {
undo.isEnabled = changeHistory.canUndo()
redo.isEnabled = changeHistory.canRedo()
}
}
protected open fun setupToolbar() {
binding.Toolbar.setNavigationOnClickListener { finish() }
val menu = binding.Toolbar.menu
val pin =
menu.add(R.string.pin, R.drawable.pin, MenuItem.SHOW_AS_ACTION_ALWAYS) { item ->
pin(item)
}
bindPinned(pin)
val undo =
menu.add(R.string.undo, R.drawable.undo, MenuItem.SHOW_AS_ACTION_ALWAYS) {
changeHistory.undo()
}
val redo =
menu.add(R.string.redo, R.drawable.redo, MenuItem.SHOW_AS_ACTION_ALWAYS) {
changeHistory.redo()
}
initActionManager(undo, redo)
undo.isEnabled = changeHistory.canUndo()
redo.isEnabled = changeHistory.canRedo()
menu.add(R.string.share, R.drawable.share) { share() }
menu.add(R.string.labels, R.drawable.label) { label() }
menu.add(R.string.add_images, R.drawable.add_images) { checkNotificationPermission() }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
menu.add(R.string.record_audio, R.drawable.record_audio) { checkAudioPermission() }
}
when (model.folder) {
Folder.NOTES -> {
menu.add(R.string.delete, R.drawable.delete) { delete() }
menu.add(R.string.archive, R.drawable.archive) { archive() }
}
Folder.DELETED -> {
menu.add(R.string.restore, R.drawable.restore) { restore() }
menu.add(R.string.delete_forever, R.drawable.delete) { deleteForever() }
}
Folder.ARCHIVED -> {
menu.add(R.string.delete, R.drawable.delete) { delete() }
menu.add(R.string.unarchive, R.drawable.unarchive) { restore() }
}
}
}
abstract fun configureUI()
open fun setupListeners() {
binding.EnterTitle.doAfterTextChanged { text ->
model.title = requireNotNull(text).trim().toString()
}
}
open fun setStateFromModel() {
binding.DateCreated.displayFormattedTimestamp(model.timestamp, preferences.dateFormat.value)
binding.EnterTitle.setText(model.title)
Operations.bindLabels(binding.LabelGroup, model.labels, model.textSize)
setColor()
}
private fun handleSharedNote() {
val title = intent.getStringExtra(Intent.EXTRA_SUBJECT)
val string = intent.getStringExtra(Intent.EXTRA_TEXT)
val charSequence = intent.getCharSequenceExtra(Operations.extraCharSequence)
val body = charSequence ?: string
if (body != null) {
model.body = Editable.Factory.getInstance().newEditable(body)
}
if (title != null) {
model.title = title
}
}
@RequiresApi(24)
private fun checkAudioPermission() {
val permission = Manifest.permission.RECORD_AUDIO
if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
if (shouldShowRequestPermissionRationale(permission)) {
MaterialAlertDialogBuilder(this)
.setMessage(R.string.please_grant_notally_audio)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.continue_) { _, _ ->
requestPermissions(arrayOf(permission), REQUEST_AUDIO_PERMISSION)
}
.show()
} else requestPermissions(arrayOf(permission), REQUEST_AUDIO_PERMISSION)
} else recordAudio()
}
private fun checkNotificationPermission() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
val permission = Manifest.permission.POST_NOTIFICATIONS
if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
if (shouldShowRequestPermissionRationale(permission)) {
MaterialAlertDialogBuilder(this)
.setMessage(R.string.please_grant_notally_notification)
.setNegativeButton(R.string.cancel) { _, _ -> selectImages() }
.setPositiveButton(R.string.continue_) { _, _ ->
requestPermissions(arrayOf(permission), REQUEST_NOTIFICATION_PERMISSION)
}
.setOnDismissListener { selectImages() }
.show()
} else requestPermissions(arrayOf(permission), REQUEST_NOTIFICATION_PERMISSION)
} else selectImages()
} else selectImages()
}
private fun recordAudio() {
if (model.audioRoot != null) {
val intent = Intent(this, RecordAudio::class.java)
startActivityForResult(intent, REQUEST_RECORD_AUDIO)
} else Toast.makeText(this, R.string.insert_an_sd_card_audio, Toast.LENGTH_LONG).show()
}
private fun handleRejection() {
MaterialAlertDialogBuilder(this)
.setMessage(R.string.to_record_audio)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.settings) { _, _ ->
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
intent.data = Uri.parse("package:${packageName}")
startActivity(intent)
}
.show()
}
private fun selectImages() {
if (model.imageRoot != null) {
val intent = Intent(Intent.ACTION_GET_CONTENT)
intent.type = "image/*"
intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true)
intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
intent.addCategory(Intent.CATEGORY_OPENABLE)
startActivityForResult(intent, REQUEST_ADD_IMAGES)
} else Toast.makeText(this, R.string.insert_an_sd_card_images, Toast.LENGTH_LONG).show()
}
private fun share() {
val body =
when (type) {
Type.NOTE -> model.body
Type.LIST -> Operations.getBody(model.items!!.toMutableList())
}
Operations.shareNote(this, model.title, body)
}
private fun label() {
val intent = Intent(this, SelectLabels::class.java)
intent.putStringArrayListExtra(SelectLabels.SELECTED_LABELS, model.labels)
startActivityForResult(intent, REQUEST_SELECT_LABELS)
}
private fun delete() {
model.folder = Folder.DELETED
finish()
}
private fun restore() {
model.folder = Folder.NOTES
finish()
}
private fun archive() {
model.folder = Folder.ARCHIVED
finish()
}
private fun deleteForever() {
MaterialAlertDialogBuilder(this)
.setMessage(R.string.delete_note_forever)
.setPositiveButton(R.string.delete) { _, _ ->
lifecycleScope.launch {
model.deleteBaseNote()
super.finish()
}
}
.setNegativeButton(R.string.cancel, null)
.show()
}
private fun pin(item: MenuItem) {
model.pinned = !model.pinned
bindPinned(item)
}
private fun setupImages() {
val adapter =
PreviewImageAdapter(model.imageRoot) { position ->
val intent = Intent(this, ViewImage::class.java)
intent.putExtra(ViewImage.POSITION, position)
intent.putExtra(Constants.SelectedBaseNote, model.id)
startActivityForResult(intent, REQUEST_VIEW_IMAGES)
}
adapter.registerAdapterDataObserver(
object : RecyclerView.AdapterDataObserver() {
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
binding.ImagePreview.scrollToPosition(positionStart)
}
}
)
binding.ImagePreview.setHasFixedSize(true)
binding.ImagePreview.adapter = adapter
binding.ImagePreview.layoutManager =
LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)
PagerSnapHelper().attachToRecyclerView(binding.ImagePreview)
model.images.observe(this) { list ->
adapter.submitList(list)
binding.ImagePreview.isVisible = list.isNotEmpty()
}
val dialogBinding = DialogProgressBinding.inflate(layoutInflater)
val dialog =
MaterialAlertDialogBuilder(this)
.setTitle(R.string.adding_images)
.setView(dialogBinding.root)
.setCancelable(false)
.create()
model.addingImages.observe(this) { progress ->
if (progress.inProgress) {
dialog.show()
dialogBinding.ProgressBar.max = progress.total
dialogBinding.ProgressBar.setProgressCompat(progress.current, true)
dialogBinding.Count.text =
getString(R.string.count, progress.current, progress.total)
} else dialog.dismiss()
}
model.eventBus.observe(this) { event ->
event.handle { errors -> displayImageErrors(errors) }
}
}
private fun displayImageErrors(errors: List<ImageError>) {
val recyclerView = RecyclerView(this)
recyclerView.layoutParams =
LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
recyclerView.adapter = ErrorAdapter(errors)
recyclerView.layoutManager = LinearLayoutManager(this)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
recyclerView.scrollIndicators =
View.SCROLL_INDICATOR_TOP or View.SCROLL_INDICATOR_BOTTOM
}
val title = resources.getQuantityString(R.plurals.cant_add_images, errors.size, errors.size)
MaterialAlertDialogBuilder(this)
.setTitle(title)
.setView(recyclerView)
.setNegativeButton(R.string.cancel, null)
.setCancelable(false)
.show()
}
private fun setupAudios() {
val adapter = AudioAdapter { position: Int ->
if (position != -1) {
val audio = model.audios.value[position]
val intent = Intent(this, PlayAudio::class.java)
intent.putExtra(PlayAudio.AUDIO, audio)
startActivityForResult(intent, REQUEST_PLAY_AUDIO)
}
}
binding.AudioRecyclerView.adapter = adapter
model.audios.observe(this) { list ->
adapter.submitList(list)
binding.AudioHeader.isVisible = list.isNotEmpty()
binding.AudioRecyclerView.isVisible = list.isNotEmpty()
}
}
private fun setColor() {
val color = Operations.extractColor(model.color, this)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
window.statusBarColor = color
}
binding.root.setBackgroundColor(color)
binding.RecyclerView.setBackgroundColor(color)
binding.Toolbar.backgroundTintList = ColorStateList.valueOf(color)
}
private fun initialiseBinding() {
binding = ActivityNotallyBinding.inflate(layoutInflater)
when (type) {
Type.NOTE -> {
binding.AddItem.visibility = View.GONE
binding.RecyclerView.visibility = View.GONE
}
Type.LIST -> {
binding.EnterBody.visibility = View.GONE
}
}
val title = TextSize.getEditTitleSize(model.textSize)
val date = TextSize.getDisplayBodySize(model.textSize)
val body = TextSize.getEditBodySize(model.textSize)
binding.EnterTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, title)
binding.DateCreated.setTextSize(TypedValue.COMPLEX_UNIT_SP, date)
binding.EnterBody.setTextSize(TypedValue.COMPLEX_UNIT_SP, body)
setupImages()
setupAudios()
binding.root.isSaveFromParentEnabled = false
}
private fun bindPinned(item: MenuItem) {
val icon: Int
val title: Int
if (model.pinned) {
icon = R.drawable.unpin
title = R.string.unpin
} else {
icon = R.drawable.pin
title = R.string.pin
}
item.setTitle(title)
item.setIcon(icon)
}
companion object {
private const val REQUEST_ADD_IMAGES = 30
private const val REQUEST_VIEW_IMAGES = 31
private const val REQUEST_NOTIFICATION_PERMISSION = 32
private const val REQUEST_SELECT_LABELS = 33
private const val REQUEST_RECORD_AUDIO = 34
private const val REQUEST_PLAY_AUDIO = 35
private const val REQUEST_AUDIO_PERMISSION = 36
}
}

View file

@ -1,187 +0,0 @@
package com.omgodse.notally.activities
import android.content.Intent
import android.graphics.Typeface
import android.net.Uri
import android.text.Editable
import android.text.Spanned
import android.text.TextWatcher
import android.text.style.CharacterStyle
import android.text.style.StrikethroughSpan
import android.text.style.StyleSpan
import android.text.style.TypefaceSpan
import android.text.style.URLSpan
import android.util.Patterns
import android.view.ActionMode
import android.view.Menu
import android.view.MenuItem
import android.widget.Toast
import androidx.core.text.getSpans
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.omgodse.notally.LinkMovementMethod
import com.omgodse.notally.R
import com.omgodse.notally.miscellaneous.add
import com.omgodse.notally.miscellaneous.createTextWatcherWithHistory
import com.omgodse.notally.miscellaneous.setOnNextAction
import com.omgodse.notally.room.Type
class TakeNote : NotallyActivity(Type.NOTE) {
private lateinit var enterBodyTextWatcher: TextWatcher
override fun configureUI() {
binding.EnterTitle.setOnNextAction { binding.EnterBody.requestFocus() }
setupEditor()
if (model.isNewNote) {
binding.EnterBody.requestFocus()
}
}
override fun setupListeners() {
super.setupListeners()
enterBodyTextWatcher = run {
binding.EnterBody.createTextWatcherWithHistory(changeHistory) { text: String ->
model.body = Editable.Factory.getInstance().newEditable(text)
}
}
binding.EnterBody.addTextChangedListener(enterBodyTextWatcher)
}
override fun setStateFromModel() {
super.setStateFromModel()
updateEditText()
}
private fun updateEditText() {
binding.EnterBody.removeTextChangedListener(enterBodyTextWatcher)
binding.EnterBody.text = model.body
binding.EnterBody.addTextChangedListener(enterBodyTextWatcher)
}
private fun setupEditor() {
setupMovementMethod()
binding.EnterBody.customSelectionActionModeCallback =
object : ActionMode.Callback {
override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?) = false
override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?) = false
override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
binding.EnterBody.isActionModeOn = true
// Try block is there because this will crash on MiUI as Xiaomi has a broken
// ActionMode implementation
try {
if (menu != null) {
menu.add(R.string.bold, 0) {
applySpan(StyleSpan(Typeface.BOLD))
mode?.finish()
}
menu.add(R.string.link, 0) {
applySpan(URLSpan(null))
mode?.finish()
}
menu.add(R.string.italic, 0) {
applySpan(StyleSpan(Typeface.ITALIC))
mode?.finish()
}
menu.add(R.string.monospace, 0) {
applySpan(TypefaceSpan("monospace"))
mode?.finish()
}
menu.add(R.string.strikethrough, 0) {
applySpan(StrikethroughSpan())
mode?.finish()
}
menu.add(R.string.clear_formatting, 0) {
removeSpans()
mode?.finish()
}
}
} catch (exception: Exception) {
exception.printStackTrace()
}
return true
}
override fun onDestroyActionMode(mode: ActionMode?) {
binding.EnterBody.isActionModeOn = false
}
}
}
private fun setupMovementMethod() {
val items = arrayOf(getString(R.string.edit), getString(R.string.open_link))
val movementMethod = LinkMovementMethod { span ->
MaterialAlertDialogBuilder(this)
.setItems(items) { dialog, which ->
if (which == 1) {
val spanStart = binding.EnterBody.text?.getSpanStart(span)
val spanEnd = binding.EnterBody.text?.getSpanEnd(span)
ifBothNotNullAndInvalid(spanStart, spanEnd) { start, end ->
val text = binding.EnterBody.text?.substring(start, end)
if (text != null) {
val link = getURLFrom(text)
val uri = Uri.parse(link)
val intent = Intent(Intent.ACTION_VIEW, uri)
try {
startActivity(intent)
} catch (exception: Exception) {
Toast.makeText(this, R.string.cant_open_link, Toast.LENGTH_LONG)
.show()
}
}
}
}
}
.show()
}
binding.EnterBody.movementMethod = movementMethod
}
private fun removeSpans() {
val selectionEnd = binding.EnterBody.selectionEnd
val selectionStart = binding.EnterBody.selectionStart
ifBothNotNullAndInvalid(selectionStart, selectionEnd) { start, end ->
binding.EnterBody.text?.getSpans<CharacterStyle>(start, end)?.forEach { span ->
binding.EnterBody.text?.removeSpan(span)
}
}
}
private fun applySpan(span: Any) {
val selectionEnd = binding.EnterBody.selectionEnd
val selectionStart = binding.EnterBody.selectionStart
ifBothNotNullAndInvalid(selectionStart, selectionEnd) { start, end ->
binding.EnterBody.text?.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
}
}
private fun ifBothNotNullAndInvalid(
start: Int?,
end: Int?,
function: (start: Int, end: Int) -> Unit,
) {
if (start != null && start != -1 && end != null && end != -1) {
function.invoke(start, end)
}
}
companion object {
fun getURLFrom(text: String): String {
return when {
text.matches(Patterns.PHONE.toRegex()) -> "tel:$text"
text.matches(Patterns.EMAIL_ADDRESS.toRegex()) -> "mailto:$text"
text.matches(Patterns.DOMAIN_NAME.toRegex()) -> "http://$text"
else -> text
}
}
}
}

View file

@ -1,212 +0,0 @@
package com.omgodse.notally.activities
import android.content.ClipData
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.FileProvider
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.PagerSnapHelper
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.omgodse.notally.R
import com.omgodse.notally.databinding.ActivityViewImageBinding
import com.omgodse.notally.miscellaneous.Constants
import com.omgodse.notally.miscellaneous.IO
import com.omgodse.notally.miscellaneous.add
import com.omgodse.notally.recyclerview.adapter.ImageAdapter
import com.omgodse.notally.room.Converters
import com.omgodse.notally.room.Image
import com.omgodse.notally.room.NotallyDatabase
import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class ViewImage : AppCompatActivity() {
private var currentImage: Image? = null
private lateinit var deletedImages: ArrayList<Image>
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val binding = ActivityViewImageBinding.inflate(layoutInflater)
setContentView(binding.root)
val savedList = savedInstanceState?.getParcelableArrayList<Image>(DELETED_IMAGES)
deletedImages = savedList ?: ArrayList()
val result = Intent()
result.putExtra(DELETED_IMAGES, deletedImages)
setResult(RESULT_OK, result)
val savedImage = savedInstanceState?.getParcelable<Image>(CURRENT_IMAGE)
if (savedImage != null) {
currentImage = savedImage
}
binding.RecyclerView.setHasFixedSize(true)
binding.RecyclerView.layoutManager =
LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)
PagerSnapHelper().attachToRecyclerView(binding.RecyclerView)
val initial = intent.getIntExtra(POSITION, 0)
binding.RecyclerView.scrollToPosition(initial)
lifecycleScope.launch {
val database = NotallyDatabase.getDatabase(application)
val id = intent.getLongExtra(Constants.SelectedBaseNote, 0)
val json = withContext(Dispatchers.IO) { database.getBaseNoteDao().getImages(id) }
val original = Converters.jsonToImages(json)
val images = ArrayList<Image>(original.size)
original.filterNotTo(images) { image -> deletedImages.contains(image) }
val mediaRoot = IO.getExternalImagesDirectory(application)
val adapter = ImageAdapter(mediaRoot, images)
binding.RecyclerView.adapter = adapter
setupToolbar(binding, adapter)
}
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putParcelable(CURRENT_IMAGE, currentImage)
outState.putParcelableArrayList(DELETED_IMAGES, deletedImages)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == REQUEST_EXPORT_FILE && resultCode == RESULT_OK) {
data?.data?.let { uri -> writeImageToUri(uri) }
}
}
private fun setupToolbar(binding: ActivityViewImageBinding, adapter: ImageAdapter) {
binding.Toolbar.setNavigationOnClickListener { finish() }
val layoutManager = binding.RecyclerView.layoutManager as LinearLayoutManager
adapter.registerAdapterDataObserver(
object : RecyclerView.AdapterDataObserver() {
override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
val position = layoutManager.findFirstVisibleItemPosition()
binding.Toolbar.title = "${position + 1} / ${adapter.itemCount}"
}
}
)
binding.RecyclerView.addOnScrollListener(
object : RecyclerView.OnScrollListener() {
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
val position = layoutManager.findFirstVisibleItemPosition()
binding.Toolbar.title = "${position + 1} / ${adapter.itemCount}"
}
}
)
binding.Toolbar.menu.add(R.string.share, R.drawable.share) {
val position = layoutManager.findFirstCompletelyVisibleItemPosition()
if (position != -1) {
val image = adapter.items[position]
share(image)
}
}
binding.Toolbar.menu.add(R.string.save_to_device, R.drawable.save) {
val position = layoutManager.findFirstCompletelyVisibleItemPosition()
if (position != -1) {
val image = adapter.items[position]
saveToDevice(image)
}
}
binding.Toolbar.menu.add(R.string.delete, R.drawable.delete) {
val position = layoutManager.findFirstCompletelyVisibleItemPosition()
if (position != -1) {
delete(position, adapter)
}
}
}
private fun share(image: Image) {
val mediaRoot = IO.getExternalImagesDirectory(application)
val file = if (mediaRoot != null) File(mediaRoot, image.name) else null
if (file != null && file.exists()) {
val uri = FileProvider.getUriForFile(this, "$packageName.provider", file)
val intent = Intent(Intent.ACTION_SEND)
intent.type = image.mimeType
intent.putExtra(Intent.EXTRA_STREAM, uri)
// Necessary for sharesheet to show a preview of the image
// Check ->
// https://commonsware.com/blog/2021/01/07/action_send-share-sheet-clipdata.html
intent.clipData = ClipData.newRawUri(null, uri)
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
val chooser = Intent.createChooser(intent, null)
startActivity(chooser)
}
}
private fun saveToDevice(image: Image) {
val mediaRoot = IO.getExternalImagesDirectory(application)
val file = if (mediaRoot != null) File(mediaRoot, image.name) else null
if (file != null && file.exists()) {
val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
intent.type = image.mimeType
intent.addCategory(Intent.CATEGORY_OPENABLE)
intent.putExtra(Intent.EXTRA_TITLE, "Notally Image")
currentImage = image
startActivityForResult(intent, REQUEST_EXPORT_FILE)
}
}
private fun writeImageToUri(uri: Uri) {
lifecycleScope.launch {
withContext(Dispatchers.IO) {
val mediaRoot = IO.getExternalImagesDirectory(application)
val file =
if (mediaRoot != null) File(mediaRoot, requireNotNull(currentImage).name)
else null
if (file != null && file.exists()) {
val output = contentResolver.openOutputStream(uri) as FileOutputStream
output.channel.truncate(0)
val input = FileInputStream(file)
input.copyTo(output)
input.close()
output.close()
}
}
Toast.makeText(this@ViewImage, R.string.saved_to_device, Toast.LENGTH_LONG).show()
}
}
private fun delete(position: Int, adapter: ImageAdapter) {
MaterialAlertDialogBuilder(this)
.setMessage(R.string.delete_image_forever)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.delete) { _, _ ->
val image = adapter.items.removeAt(position)
deletedImages.add(image)
adapter.notifyItemRemoved(position)
if (adapter.items.isEmpty()) {
finish()
}
}
.show()
}
companion object {
const val POSITION = "POSITION"
const val CURRENT_IMAGE = "CURRENT_IMAGE"
const val DELETED_IMAGES = "DELETED_IMAGES"
private const val REQUEST_EXPORT_FILE = 40
}
}

View file

@ -1,135 +0,0 @@
package com.omgodse.notally.audio
import android.app.Notification
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
import android.app.Service
import android.content.Context
import android.content.Intent
import android.media.MediaRecorder
import android.os.Build
import android.os.SystemClock
import androidx.annotation.RequiresApi
import com.omgodse.notally.R
import com.omgodse.notally.activities.RecordAudio
import com.omgodse.notally.audio.Status.PAUSED
import com.omgodse.notally.audio.Status.READY
import com.omgodse.notally.audio.Status.RECORDING
import com.omgodse.notally.miscellaneous.IO
@RequiresApi(24)
class AudioRecordService : Service() {
var status = READY
private var lastStart = 0L
private var audioDuration = 0L
private lateinit var recorder: MediaRecorder
private lateinit var manager: NotificationManager
private lateinit var builder: Notification.Builder
override fun onCreate() {
manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
builder = Notification.Builder(this)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channelId = "com.omgodse.audio"
val channel =
NotificationChannel(
channelId,
"Audio Recordings",
NotificationManager.IMPORTANCE_HIGH,
)
manager.createNotificationChannel(channel)
builder.setChannelId(channelId)
}
builder.setSmallIcon(R.drawable.record_audio)
builder.setOnlyAlertOnce(true)
/*
Prevent user from dismissing notification in Android 13 (33) and above
https://developer.android.com/guide/components/foreground-services#user-dismiss-notification
*/
builder.setOngoing(true)
/*
On Android 12 (31) and above, the system waits 10 seconds before showing the notification.
https://developer.android.com/guide/components/foreground-services#notification-immediate
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
builder.setForegroundServiceBehavior(Notification.FOREGROUND_SERVICE_IMMEDIATE)
}
val intent = Intent(this, RecordAudio::class.java)
val pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE)
builder.setContentIntent(pendingIntent)
startForeground(2, buildNotification())
recorder =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
MediaRecorder(this)
} else MediaRecorder()
recorder.setAudioSource(MediaRecorder.AudioSource.MIC)
recorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4)
recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC)
val output = IO.getTempAudioFile(this)
recorder.setOutputFile(output.path)
recorder.prepare()
}
override fun onDestroy() {
recorder.release()
}
override fun onBind(intent: Intent?) = LocalBinder(this)
fun start() {
recorder.start()
status = RECORDING
lastStart = SystemClock.elapsedRealtime()
manager.notify(2, buildNotification())
}
fun resume() {
recorder.resume()
status = RECORDING
lastStart = SystemClock.elapsedRealtime()
manager.notify(2, buildNotification())
}
fun pause() {
recorder.pause()
status = PAUSED
audioDuration += SystemClock.elapsedRealtime() - lastStart
lastStart = 0L
manager.notify(2, buildNotification())
}
fun stop() {
recorder.stop()
stopSelf()
}
fun getBase(): Long {
return if (lastStart != 0L) {
lastStart - audioDuration
} else SystemClock.elapsedRealtime() - audioDuration
}
private fun buildNotification(): Notification {
val title =
when (status) {
READY -> getString(R.string.ready_to_record)
PAUSED -> getString(R.string.paused)
RECORDING -> getString(R.string.recording)
}
builder.setContentTitle(title)
builder.setContentText(getString(R.string.tap_for_more_options))
return builder.build()
}
}

View file

@ -1,26 +0,0 @@
package com.omgodse.notally.changehistory
import com.omgodse.notally.recyclerview.ListManager
class ChangeCheckedForAllChange(
internal val checked: Boolean,
internal val changedPositions: Collection<Int>,
internal val changedPositionsAfterSort: Collection<Int>,
private val listManager: ListManager,
) : Change {
override fun redo() {
listManager.check(checked, changedPositions)
}
override fun undo() {
listManager.check(!checked, changedPositionsAfterSort)
}
override fun toString(): String {
return "ChangeCheckedForAllChange checked: $checked changedPositions: ${
changedPositions.joinToString(
","
)
} changedPositionsAfterSort: ${changedPositionsAfterSort.joinToString(",")}"
}
}

View file

@ -1,67 +0,0 @@
package com.omgodse.notally.changehistory
import android.util.Log
class ChangeHistory(private val onStackChanged: (stackPointer: Int) -> Unit) {
private val TAG = "ChangeHistory"
private val changeStack = ArrayList<Change>()
private var stackPointer = -1
fun push(change: Change) {
popRedos()
changeStack.add(change)
stackPointer++
Log.d(TAG, "addChange: $change")
onStackChanged.invoke(stackPointer)
}
fun redo() {
stackPointer++
if (stackPointer >= changeStack.size) {
throw RuntimeException("There is no Change to redo!")
}
val makeListAction = changeStack[stackPointer]
Log.d(TAG, "redo: $makeListAction")
makeListAction.redo()
onStackChanged.invoke(stackPointer)
}
fun undo() {
if (stackPointer < 0) {
throw RuntimeException("There is no Change to undo!")
}
val makeListAction = changeStack[stackPointer]
Log.d(TAG, "undo: $makeListAction")
makeListAction.undo()
stackPointer--
onStackChanged.invoke(stackPointer)
}
fun canRedo(): Boolean {
return stackPointer >= -1 && stackPointer < changeStack.size - 1
}
fun canUndo(): Boolean {
return stackPointer > -1
}
fun reset() {
stackPointer = -1
changeStack.clear()
}
internal fun lookUp(position: Int = 0): Change {
if (stackPointer - position < 0) {
throw IllegalArgumentException("ChangeHistory only has $stackPointer changes!")
}
return changeStack[stackPointer - position]
}
private fun popRedos() {
while (changeStack.size > stackPointer + 1) {
changeStack.removeAt(stackPointer + 1)
}
// changeStack.subList(stackPointer, changeStack.size).clear()
}
}

View file

@ -1,22 +0,0 @@
package com.omgodse.notally.changehistory
import com.omgodse.notally.recyclerview.ListManager
import com.omgodse.notally.recyclerview.toReadableString
import com.omgodse.notally.room.ListItem
class DeleteCheckedChange(
internal val itemsBeforeDelete: MutableList<ListItem>,
private val listManager: ListManager,
) : Change {
override fun redo() {
listManager.deleteCheckedItems(pushChange = false)
}
override fun undo() {
listManager.updateList(itemsBeforeDelete)
}
override fun toString(): String {
return "DeleteCheckedChange itemsBeforeDelete:\n${itemsBeforeDelete.toReadableString()}"
}
}

View file

@ -1,24 +0,0 @@
package com.omgodse.notally.changehistory
import android.text.TextWatcher
import android.widget.EditText
class EditTextChange(
private val editText: EditText,
textBefore: String,
textAfter: String,
private val listener: TextWatcher,
private val updateModel: (newValue: String) -> Unit,
) : ValueChange<String>(textAfter, textBefore) {
private val cursorPosition = editText.selectionStart
override fun update(value: String, isUndo: Boolean) {
updateModel.invoke(value)
editText.removeTextChangedListener(listener)
editText.setText(value)
editText.requestFocus()
editText.setSelection(Math.max(0, cursorPosition - (if (isUndo) 1 else 0)))
editText.addTextChangedListener(listener)
}
}

View file

@ -1,27 +0,0 @@
package com.omgodse.notally.changehistory
import com.omgodse.notally.recyclerview.ListManager
import com.omgodse.notally.room.ListItem
class ListAddChange(
position: Int,
internal val positionAfterAdd: Int,
internal val itemBeforeInsert: ListItem,
private val listManager: ListManager,
) : ListChange(position) {
override fun redo() {
listManager.add(position, item = itemBeforeInsert, pushChange = false)
}
override fun undo() {
listManager.delete(
positionAfterAdd,
childrenToDelete = itemBeforeInsert.children,
pushChange = false,
)
}
override fun toString(): String {
return "Add at position: $position"
}
}

View file

@ -1,4 +0,0 @@
package com.omgodse.notally.changehistory
abstract class ListBooleanChange(newValue: Boolean, position: Int, positionAfter: Int = position) :
ListValueChange<Boolean>(newValue, !newValue, position, positionAfter)

View file

@ -1,19 +0,0 @@
package com.omgodse.notally.changehistory
import com.omgodse.notally.recyclerview.ListManager
class ListCheckedChange(
checked: Boolean,
position: Int,
positionAfter: Int,
private val listManager: ListManager,
) : ListBooleanChange(checked, position, positionAfter) {
override fun update(position: Int, value: Boolean, isUndo: Boolean) {
listManager.changeChecked(position, value, pushChange = false)
}
override fun toString(): String {
return "CheckedChange pos: $position positionAfter: $positionAfter isChecked: $newValue"
}
}

View file

@ -1,22 +0,0 @@
package com.omgodse.notally.changehistory
import com.omgodse.notally.recyclerview.ListManager
import com.omgodse.notally.room.ListItem
class ListDeleteChange(
position: Int,
internal val deletedItem: ListItem,
private val listManager: ListManager,
) : ListChange(position) {
override fun redo() {
listManager.delete(position, pushChange = false)
}
override fun undo() {
listManager.add(position, deletedItem, pushChange = false)
}
override fun toString(): String {
return "DeleteChange at $position"
}
}

View file

@ -1,29 +0,0 @@
package com.omgodse.notally.changehistory
import android.text.TextWatcher
import android.widget.EditText
import com.omgodse.notally.recyclerview.ListManager
open class ListEditTextChange(
private val editText: EditText,
position: Int,
private val textBefore: String,
private val textAfter: String,
private val listener: TextWatcher,
private val listManager: ListManager,
) : ListValueChange<String>(textAfter, textBefore, position) {
private val cursorPosition = editText.selectionStart
override fun update(position: Int, value: String, isUndo: Boolean) {
listManager.changeText(editText, listener, position, textBefore, value, pushChange = false)
editText.removeTextChangedListener(listener)
editText.setText(value)
editText.requestFocus()
editText.setSelection(Math.max(0, cursorPosition - (if (isUndo) 1 else 0)))
editText.addTextChangedListener(listener)
}
override fun toString(): String {
return "CheckedText at $position from: $textBefore to: $textAfter"
}
}

View file

@ -1,14 +0,0 @@
package com.omgodse.notally.changehistory
import com.omgodse.notally.recyclerview.ListManager
class ListIsChildChange(isChild: Boolean, position: Int, private val listManager: ListManager) :
ListBooleanChange(isChild, position) {
override fun update(position: Int, value: Boolean, isUndo: Boolean) {
listManager.changeIsChild(position, value, pushChange = false)
}
override fun toString(): String {
return "IsChildChange position: $position isChild: $newValue"
}
}

View file

@ -1,24 +0,0 @@
package com.omgodse.notally.changehistory
import com.omgodse.notally.recyclerview.ListManager
import com.omgodse.notally.room.ListItem
class ListMoveChange(
positionFrom: Int,
internal val positionTo: Int,
internal var positionAfter: Int,
internal val itemBeforeMove: ListItem,
internal val listManager: ListManager,
) : ListChange(positionFrom) {
override fun redo() {
positionAfter = listManager.move(position, positionTo, pushChange = false)!!
}
override fun undo() {
listManager.revertMove(positionAfter, position, itemBeforeMove)
}
override fun toString(): String {
return "MoveChange from: $position to: $positionTo after: $positionAfter itemBeforeMove: $itemBeforeMove"
}
}

View file

@ -1,19 +0,0 @@
package com.omgodse.notally.changehistory
abstract class ListValueChange<T>(
internal val newValue: T,
internal val oldValue: T,
position: Int,
internal val positionAfter: Int = position,
) : ListChange(position) {
override fun redo() {
update(position, newValue, false)
}
override fun undo() {
update(positionAfter, oldValue, true)
}
abstract fun update(position: Int, value: T, isUndo: Boolean)
}

View file

@ -1,14 +0,0 @@
package com.omgodse.notally.changehistory
abstract class ValueChange<T>(protected val newValue: T, protected val oldValue: T) : Change {
override fun redo() {
update(newValue, false)
}
override fun undo() {
update(newValue, true)
}
abstract fun update(value: T, isUndo: Boolean)
}

View file

@ -1,10 +0,0 @@
package com.omgodse.notally.fragments
import com.omgodse.notally.R
class Archived : NotallyFragment() {
override fun getBackground() = R.drawable.archive
override fun getObservable() = model.archivedNotes
}

View file

@ -1,26 +0,0 @@
package com.omgodse.notally.fragments
import android.view.Menu
import android.view.MenuInflater
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.omgodse.notally.R
import com.omgodse.notally.miscellaneous.add
class Deleted : NotallyFragment() {
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
menu.add(R.string.delete_all, R.drawable.delete_all) { deleteAllNotes() }
}
private fun deleteAllNotes() {
MaterialAlertDialogBuilder(requireContext())
.setMessage(R.string.delete_all_notes)
.setPositiveButton(R.string.delete) { _, _ -> model.deleteAllBaseNotes() }
.setNegativeButton(R.string.cancel, null)
.show()
}
override fun getBackground() = R.drawable.delete
override fun getObservable() = model.deletedNotes
}

View file

@ -1,16 +0,0 @@
package com.omgodse.notally.fragments
import androidx.lifecycle.LiveData
import com.omgodse.notally.R
import com.omgodse.notally.miscellaneous.Constants
import com.omgodse.notally.room.Item
class DisplayLabel : NotallyFragment() {
override fun getBackground() = R.drawable.label
override fun getObservable(): LiveData<List<Item>> {
val label = requireNotNull(requireArguments().getString(Constants.SelectedLabel))
return model.getNotesByLabel(label)
}
}

View file

@ -1,158 +0,0 @@
package com.omgodse.notally.fragments
import android.os.Bundle
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.omgodse.notally.MenuDialog
import com.omgodse.notally.R
import com.omgodse.notally.databinding.DialogInputBinding
import com.omgodse.notally.databinding.FragmentNotesBinding
import com.omgodse.notally.miscellaneous.Constants
import com.omgodse.notally.miscellaneous.add
import com.omgodse.notally.recyclerview.ItemListener
import com.omgodse.notally.recyclerview.adapter.LabelAdapter
import com.omgodse.notally.room.Label
import com.omgodse.notally.viewmodels.BaseNoteModel
class Labels : Fragment(), ItemListener {
private var adapter: LabelAdapter? = null
private var binding: FragmentNotesBinding? = null
private val model: BaseNoteModel by activityViewModels()
override fun onDestroyView() {
super.onDestroyView()
binding = null
adapter = null
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
adapter = LabelAdapter(this)
binding?.RecyclerView?.setHasFixedSize(true)
binding?.RecyclerView?.adapter = adapter
binding?.RecyclerView?.layoutManager = LinearLayoutManager(requireContext())
val itemDecoration = DividerItemDecoration(requireContext(), RecyclerView.VERTICAL)
binding?.RecyclerView?.addItemDecoration(itemDecoration)
binding?.RecyclerView?.setPadding(0, 0, 0, 0)
binding?.ImageView?.setImageResource(R.drawable.label)
setupObserver()
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?,
): View? {
setHasOptionsMenu(true)
binding = FragmentNotesBinding.inflate(inflater)
return binding?.root
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
menu.add(R.string.add_label, R.drawable.add) { displayAddLabelDialog() }
}
override fun onClick(position: Int) {
adapter?.currentList?.get(position)?.let { value ->
val bundle = Bundle()
bundle.putString(Constants.SelectedLabel, value)
findNavController().navigate(R.id.LabelsToDisplayLabel, bundle)
}
}
override fun onLongClick(position: Int) {
adapter?.currentList?.get(position)?.let { value ->
MenuDialog(requireContext())
.add(R.string.edit) { displayEditLabelDialog(value) }
.add(R.string.delete) { confirmDeletion(value) }
.show()
}
}
private fun setupObserver() {
model.labels.observe(viewLifecycleOwner) { labels ->
adapter?.submitList(labels)
binding?.ImageView?.isVisible = labels.isEmpty()
}
}
private fun displayAddLabelDialog() {
val inflater = LayoutInflater.from(requireContext())
val dialogBinding = DialogInputBinding.inflate(inflater)
MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.add_label)
.setView(dialogBinding.root)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.save) { dialog, _ ->
val value = dialogBinding.EditText.text.toString().trim()
if (value.isNotEmpty()) {
val label = Label(value)
model.insertLabel(label) { success: Boolean ->
if (success) {
dialog.dismiss()
} else
Toast.makeText(context, R.string.label_exists, Toast.LENGTH_LONG).show()
}
}
}
.show()
dialogBinding.EditText.requestFocus()
}
private fun confirmDeletion(value: String) {
MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.delete_label)
.setMessage(R.string.your_notes_associated)
.setPositiveButton(R.string.delete) { _, _ -> model.deleteLabel(value) }
.setNegativeButton(R.string.cancel, null)
.show()
}
private fun displayEditLabelDialog(oldValue: String) {
val dialogBinding = DialogInputBinding.inflate(layoutInflater)
dialogBinding.EditText.setText(oldValue)
MaterialAlertDialogBuilder(requireContext())
.setView(dialogBinding.root)
.setTitle(R.string.edit_label)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.save) { dialog, _ ->
val value = dialogBinding.EditText.text.toString().trim()
if (value.isNotEmpty()) {
model.updateLabel(oldValue, value) { success ->
if (success) {
dialog.dismiss()
} else
Toast.makeText(
requireContext(),
R.string.label_exists,
Toast.LENGTH_LONG,
)
.show()
}
}
}
.show()
dialogBinding.EditText.requestFocus()
}
}

View file

@ -1,158 +0,0 @@
package com.omgodse.notally.fragments
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.LiveData
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.omgodse.notally.activities.MakeList
import com.omgodse.notally.activities.TakeNote
import com.omgodse.notally.databinding.FragmentNotesBinding
import com.omgodse.notally.miscellaneous.Constants
import com.omgodse.notally.preferences.View as ViewPref
import com.omgodse.notally.recyclerview.ItemListener
import com.omgodse.notally.recyclerview.adapter.BaseNoteAdapter
import com.omgodse.notally.room.BaseNote
import com.omgodse.notally.room.Item
import com.omgodse.notally.room.Type
import com.omgodse.notally.viewmodels.BaseNoteModel
abstract class NotallyFragment : Fragment(), ItemListener {
private var adapter: BaseNoteAdapter? = null
internal var binding: FragmentNotesBinding? = null
internal val model: BaseNoteModel by activityViewModels()
override fun onDestroyView() {
super.onDestroyView()
binding = null
adapter = null
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
binding?.ImageView?.setImageResource(getBackground())
setupAdapter()
setupRecyclerView()
setupObserver()
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?,
): View? {
setHasOptionsMenu(true)
binding = FragmentNotesBinding.inflate(inflater)
return binding?.root
}
// See [RecyclerView.ViewHolder.getAdapterPosition]
override fun onClick(position: Int) {
if (position != -1) {
adapter?.currentList?.get(position)?.let { item ->
if (item is BaseNote) {
if (model.actionMode.isEnabled()) {
handleNoteSelection(item.id, position, item)
} else {
when (item.type) {
Type.NOTE -> goToActivity(TakeNote::class.java, item)
Type.LIST -> goToActivity(MakeList::class.java, item)
}
}
}
}
}
}
override fun onLongClick(position: Int) {
if (position != -1) {
adapter?.currentList?.get(position)?.let { item ->
if (item is BaseNote) {
handleNoteSelection(item.id, position, item)
}
}
}
}
private fun handleNoteSelection(id: Long, position: Int, baseNote: BaseNote) {
if (model.actionMode.selectedNotes.contains(id)) {
model.actionMode.remove(id)
} else model.actionMode.add(id, baseNote)
adapter?.notifyItemChanged(position, 0)
}
private fun setupAdapter() {
val textSize = model.preferences.textSize.value
val maxItems = model.preferences.maxItems
val maxLines = model.preferences.maxLines
val maxTitle = model.preferences.maxTitle
val dateFormat = model.preferences.dateFormat.value
adapter =
BaseNoteAdapter(
model.actionMode.selectedIds,
dateFormat,
textSize,
maxItems,
maxLines,
maxTitle,
model.mediaRoot,
this,
)
adapter?.registerAdapterDataObserver(
object : RecyclerView.AdapterDataObserver() {
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
if (itemCount > 0) {
binding?.RecyclerView?.scrollToPosition(positionStart)
}
}
}
)
binding?.RecyclerView?.adapter = adapter
binding?.RecyclerView?.setHasFixedSize(true)
}
private fun setupObserver() {
getObservable().observe(viewLifecycleOwner) { list ->
adapter?.submitList(list)
binding?.ImageView?.isVisible = list.isEmpty()
}
model.actionMode.closeListener.observe(viewLifecycleOwner) { event ->
event.handle { ids ->
adapter?.currentList?.forEachIndexed { index, item ->
if (item is BaseNote && ids.contains(item.id)) {
adapter?.notifyItemChanged(index, 0)
}
}
}
}
}
private fun setupRecyclerView() {
binding?.RecyclerView?.layoutManager =
if (model.preferences.view.value == ViewPref.grid) {
StaggeredGridLayoutManager(2, RecyclerView.VERTICAL)
} else LinearLayoutManager(requireContext())
}
private fun goToActivity(activity: Class<*>, baseNote: BaseNote) {
val intent = Intent(requireContext(), activity)
intent.putExtra(Constants.SelectedBaseNote, baseNote.id)
startActivity(intent)
}
abstract fun getBackground(): Int
abstract fun getObservable(): LiveData<List<Item>>
}

View file

@ -1,20 +0,0 @@
package com.omgodse.notally.fragments
import android.view.Menu
import android.view.MenuInflater
import androidx.navigation.fragment.findNavController
import com.omgodse.notally.R
import com.omgodse.notally.miscellaneous.add
class Notes : NotallyFragment() {
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
menu.add(R.string.search, R.drawable.search) {
findNavController().navigate(R.id.NotesToSearch)
}
}
override fun getObservable() = model.baseNotes
override fun getBackground() = R.drawable.notebook
}

View file

@ -1,39 +0,0 @@
package com.omgodse.notally.fragments
import android.os.Build
import android.os.Bundle
import android.view.View
import com.omgodse.notally.R
import com.omgodse.notally.room.Folder
class Search : NotallyFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
binding?.ChipGroup?.visibility = View.VISIBLE
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
binding?.RecyclerView?.scrollIndicators = View.SCROLL_INDICATOR_TOP
}
super.onViewCreated(view, savedInstanceState)
val checked =
when (model.folder) {
Folder.NOTES -> R.id.Notes
Folder.DELETED -> R.id.Deleted
Folder.ARCHIVED -> R.id.Archived
}
binding?.ChipGroup?.check(checked)
binding?.ChipGroup?.setOnCheckedChangeListener { _, checkedId ->
when (checkedId) {
R.id.Notes -> model.folder = Folder.NOTES
R.id.Deleted -> model.folder = Folder.DELETED
R.id.Archived -> model.folder = Folder.ARCHIVED
}
}
}
override fun getBackground() = R.drawable.search
override fun getObservable() = model.searchResults
}

View file

@ -1,282 +0,0 @@
package com.omgodse.notally.fragments
import android.app.Activity
import android.app.Application
import android.content.ActivityNotFoundException
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.core.content.FileProvider
import androidx.documentfile.provider.DocumentFile
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.MutableLiveData
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.omgodse.notally.BackupProgress
import com.omgodse.notally.MenuDialog
import com.omgodse.notally.R
import com.omgodse.notally.databinding.DialogProgressBinding
import com.omgodse.notally.databinding.FragmentSettingsBinding
import com.omgodse.notally.databinding.PreferenceBinding
import com.omgodse.notally.databinding.PreferenceSeekbarBinding
import com.omgodse.notally.miscellaneous.Operations
import com.omgodse.notally.preferences.*
import com.omgodse.notally.viewmodels.BaseNoteModel
class Settings : Fragment() {
private val model: BaseNoteModel by activityViewModels()
private fun setupBinding(binding: FragmentSettingsBinding) {
model.preferences.view.observe(viewLifecycleOwner) { value ->
binding.View.setup(View, value)
}
model.preferences.theme.observe(viewLifecycleOwner) { value ->
binding.Theme.setup(Theme, value)
}
model.preferences.dateFormat.observe(viewLifecycleOwner) { value ->
binding.DateFormat.setup(DateFormat, value)
}
model.preferences.textSize.observe(viewLifecycleOwner) { value ->
binding.TextSize.setup(TextSize, value)
}
model.preferences.listItemSorting.observe(viewLifecycleOwner) { value ->
binding.CheckedListItemSorting.setup(ListItemSorting, value)
}
binding.MaxItems.setup(MaxItems, model.preferences.maxItems)
binding.MaxLines.setup(MaxLines, model.preferences.maxLines)
binding.MaxTitle.setup(MaxTitle, model.preferences.maxTitle)
model.preferences.autoBackup.observe(viewLifecycleOwner) { value ->
binding.AutoBackup.setup(AutoBackup, value)
}
binding.ImportBackup.setOnClickListener { importBackup() }
binding.ExportBackup.setOnClickListener { exportBackup() }
setupProgressDialog(R.string.exporting_backup, model.exportingBackup)
setupProgressDialog(R.string.importing_backup, model.importingBackup)
binding.GitHub.setOnClickListener { openLink("https://github.com/OmGodse/Notally") }
binding.Libraries.setOnClickListener { displayLibraries() }
binding.Rate.setOnClickListener {
openLink("https://play.google.com/store/apps/details?id=com.omgodse.notally")
}
binding.SendFeedback.setOnClickListener { sendEmailWithLog() }
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?,
): View {
val binding = FragmentSettingsBinding.inflate(inflater)
setupBinding(binding)
return binding.root
}
override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
if (resultCode == Activity.RESULT_OK) {
intent?.data?.let { uri ->
when (requestCode) {
REQUEST_IMPORT_BACKUP -> model.importBackup(uri)
REQUEST_EXPORT_BACKUP -> model.exportBackup(uri)
REQUEST_CHOOSE_FOLDER -> model.setAutoBackupPath(uri)
}
}
}
}
private fun exportBackup() {
val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
intent.type = "application/zip"
intent.addCategory(Intent.CATEGORY_OPENABLE)
intent.putExtra(Intent.EXTRA_TITLE, "Notally Backup")
startActivityForResult(intent, REQUEST_EXPORT_BACKUP)
}
private fun importBackup() {
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
intent.type = "*/*"
intent.putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("application/zip", "text/xml"))
intent.addCategory(Intent.CATEGORY_OPENABLE)
startActivityForResult(intent, REQUEST_IMPORT_BACKUP)
}
private fun setupProgressDialog(titleId: Int, liveData: MutableLiveData<BackupProgress>) {
val dialogBinding = DialogProgressBinding.inflate(layoutInflater)
val dialog =
MaterialAlertDialogBuilder(requireContext())
.setTitle(titleId)
.setView(dialogBinding.root)
.setCancelable(false)
.create()
liveData.observe(viewLifecycleOwner) { progress ->
if (progress.inProgress) {
if (progress.indeterminate) {
dialogBinding.ProgressBar.isIndeterminate = true
dialogBinding.Count.setText(R.string.calculating)
} else {
dialogBinding.ProgressBar.max = progress.total
dialogBinding.ProgressBar.setProgressCompat(progress.current, true)
dialogBinding.Count.text =
getString(R.string.count, progress.current, progress.total)
}
dialog.show()
} else dialog.dismiss()
}
}
private fun sendEmailWithLog() {
val intent = Intent(Intent.ACTION_SEND)
intent.selector = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("omgodseapps@gmail.com"))
intent.putExtra(Intent.EXTRA_SUBJECT, "Notally [Feedback]")
val app = requireContext().applicationContext as Application
val log = Operations.getLog(app)
if (log.exists()) {
val uri = FileProvider.getUriForFile(app, "${app.packageName}.provider", log)
intent.putExtra(Intent.EXTRA_STREAM, uri)
}
try {
startActivity(intent)
} catch (exception: ActivityNotFoundException) {
Toast.makeText(requireContext(), R.string.install_an_email, Toast.LENGTH_LONG).show()
}
}
private fun displayLibraries() {
val libraries =
arrayOf(
"Glide",
"Pretty Time",
"Swipe Layout",
"Work Manager",
"Subsampling Scale ImageView",
"Material Components for Android",
)
MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.libraries)
.setItems(libraries) { _, which ->
when (which) {
0 -> openLink("https://github.com/bumptech/glide")
1 -> openLink("https://github.com/ocpsoft/prettytime")
2 ->
openLink(
"https://github.com/rambler-digital-solutions/swipe-layout-android"
)
3 -> openLink("https://developer.android.com/jetpack/androidx/releases/work")
4 -> openLink("https://github.com/davemorrissey/subsampling-scale-image-view")
5 ->
openLink(
"https://github.com/material-components/material-components-android"
)
}
}
.setNegativeButton(R.string.cancel, null)
.show()
}
private fun displayChooseFolderDialog() {
MaterialAlertDialogBuilder(requireContext())
.setMessage(R.string.notes_will_be)
.setPositiveButton(R.string.choose_folder) { _, _ ->
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
startActivityForResult(intent, REQUEST_CHOOSE_FOLDER)
}
.show()
}
private fun PreferenceBinding.setup(info: ListInfo, value: String) {
Title.setText(info.title)
val entries = info.getEntries(requireContext())
val entryValues = info.getEntryValues()
val checked = entryValues.indexOf(value)
val displayValue = entries[checked]
Value.text = displayValue
root.setOnClickListener {
MaterialAlertDialogBuilder(requireContext())
.setTitle(info.title)
.setSingleChoiceItems(entries, checked) { dialog, which ->
dialog.cancel()
val newValue = entryValues[which]
model.savePreference(info, newValue)
}
.setNegativeButton(R.string.cancel, null)
.show()
}
}
private fun PreferenceBinding.setup(info: AutoBackup, value: String) {
Title.setText(info.title)
if (value == info.emptyPath) {
Value.setText(R.string.tap_to_set_up)
root.setOnClickListener { displayChooseFolderDialog() }
} else {
val uri = Uri.parse(value)
val folder = requireNotNull(DocumentFile.fromTreeUri(requireContext(), uri))
if (folder.exists()) {
Value.text = folder.name
} else Value.setText(R.string.cant_find_folder)
root.setOnClickListener {
MenuDialog(requireContext())
.add(R.string.disable_auto_backup) { model.disableAutoBackup() }
.add(R.string.choose_another_folder) { displayChooseFolderDialog() }
.show()
}
}
}
private fun PreferenceSeekbarBinding.setup(info: SeekbarInfo, initialValue: Int) {
Title.setText(info.title)
Slider.valueTo = info.max.toFloat()
Slider.valueFrom = info.min.toFloat()
Slider.value = initialValue.toFloat()
Slider.addOnChangeListener { _, value, _ -> model.savePreference(info, value.toInt()) }
}
private fun openLink(link: String) {
val uri = Uri.parse(link)
val intent = Intent(Intent.ACTION_VIEW, uri)
try {
startActivity(intent)
} catch (exception: ActivityNotFoundException) {
Toast.makeText(requireContext(), R.string.install_a_browser, Toast.LENGTH_LONG).show()
}
}
companion object {
private const val REQUEST_IMPORT_BACKUP = 20
private const val REQUEST_EXPORT_BACKUP = 21
private const val REQUEST_CHOOSE_FOLDER = 22
}
}

View file

@ -1,3 +0,0 @@
package com.omgodse.notally.image
class ImageError(val name: String, val description: String)

View file

@ -1,3 +0,0 @@
package com.omgodse.notally.image
class ImageProgress(val inProgress: Boolean, val current: Int, val total: Int)

View file

@ -1,62 +0,0 @@
package com.omgodse.notally.legacy
import android.app.Application
import android.content.Context
import android.content.SharedPreferences
import com.omgodse.notally.room.BaseNote
import com.omgodse.notally.room.Folder
import com.omgodse.notally.room.Label
import java.io.File
// Backwards compatibility from v3.2 to v3.3
object Migrations {
fun clearAllLabels(app: Application) {
val preferences = getLabelsPreferences(app)
preferences.edit().clear().commit()
}
fun clearAllFolders(app: Application) {
getNotePath(app).listFiles()?.forEach { file -> file.delete() }
getDeletedPath(app).listFiles()?.forEach { file -> file.delete() }
getArchivedPath(app).listFiles()?.forEach { file -> file.delete() }
}
fun getPreviousLabels(app: Application): List<Label> {
val preferences = getLabelsPreferences(app)
val labels = requireNotNull(preferences.getStringSet("labelItems", emptySet()))
return labels.map { value -> Label(value) }
}
fun getPreviousNotes(app: Application): List<BaseNote> {
val list = ArrayList<BaseNote>()
getNotePath(app).listFiles()?.mapTo(list) { file ->
XMLUtils.readBaseNoteFromFile(file, Folder.NOTES)
}
getDeletedPath(app).listFiles()?.mapTo(list) { file ->
XMLUtils.readBaseNoteFromFile(file, Folder.DELETED)
}
getArchivedPath(app).listFiles()?.mapTo(list) { file ->
XMLUtils.readBaseNoteFromFile(file, Folder.ARCHIVED)
}
return list
}
private fun getNotePath(app: Application) = getFolder(app, "notes")
private fun getDeletedPath(app: Application) = getFolder(app, "deleted")
private fun getArchivedPath(app: Application) = getFolder(app, "archived")
private fun getLabelsPreferences(app: Application): SharedPreferences {
return app.getSharedPreferences("labelsPreferences", Context.MODE_PRIVATE)
}
private fun getFolder(app: Application, name: String): File {
val folder = File(app.filesDir, name)
if (!folder.exists()) {
folder.mkdir()
}
return folder
}
}

View file

@ -1,153 +0,0 @@
package com.omgodse.notally.legacy
import com.omgodse.notally.room.BaseNote
import com.omgodse.notally.room.Color
import com.omgodse.notally.room.Folder
import com.omgodse.notally.room.Label
import com.omgodse.notally.room.ListItem
import com.omgodse.notally.room.SpanRepresentation
import com.omgodse.notally.room.Type
import java.io.File
import java.io.FileInputStream
import java.io.InputStream
import org.xmlpull.v1.XmlPullParser
import org.xmlpull.v1.XmlPullParserFactory
object XMLUtils {
fun readBaseNoteFromFile(file: File, folder: Folder): BaseNote {
val inputStream = FileInputStream(file)
val parser = XmlPullParserFactory.newInstance().newPullParser()
parser.setInput(inputStream, null)
parser.next()
return parseBaseNote(parser, parser.name, folder)
}
fun readBackupFromStream(inputStream: InputStream): Pair<List<BaseNote>, List<Label>> {
val parser = XmlPullParserFactory.newInstance().newPullParser()
parser.setInput(inputStream, null)
val baseNotes = ArrayList<BaseNote>()
val labels = ArrayList<Label>()
while (parser.next() != XmlPullParser.END_DOCUMENT) {
if (parser.eventType == XmlPullParser.START_TAG) {
when (parser.name) {
"notes" -> parseList(parser, parser.name, baseNotes, Folder.NOTES)
"deleted-notes" -> parseList(parser, parser.name, baseNotes, Folder.DELETED)
"archived-notes" -> parseList(parser, parser.name, baseNotes, Folder.ARCHIVED)
"label" -> labels.add(Label(parser.nextText()))
}
}
}
return Pair(baseNotes, labels)
}
private fun parseList(
parser: XmlPullParser,
rootTag: String,
list: ArrayList<BaseNote>,
folder: Folder,
) {
while (parser.next() != XmlPullParser.END_DOCUMENT) {
if (parser.eventType == XmlPullParser.START_TAG) {
val note = parseBaseNote(parser, parser.name, folder)
list.add(note)
} else if (parser.eventType == XmlPullParser.END_TAG) {
if (parser.name == rootTag) {
break
}
}
}
}
private fun parseBaseNote(parser: XmlPullParser, rootTag: String, folder: Folder): BaseNote {
var color = Color.DEFAULT
var body = String()
var title = String()
var timestamp = 0L
var pinned = false
val items = ArrayList<ListItem>()
val labels = ArrayList<String>()
val spans = ArrayList<SpanRepresentation>()
while (parser.next() != XmlPullParser.END_DOCUMENT) {
if (parser.eventType == XmlPullParser.START_TAG) {
when (parser.name) {
"color" -> color = Color.valueOf(parser.nextText())
"title" -> title = parser.nextText()
"body" -> body = parser.nextText()
"date-created" -> timestamp = parser.nextText().toLong()
"pinned" -> pinned = parser.nextText().toBoolean()
"label" -> labels.add(parser.nextText())
"item" -> items.add(parseItem(parser, parser.name))
"span" -> spans.add(parseSpan(parser))
}
} else if (parser.eventType == XmlPullParser.END_TAG) {
if (parser.name == rootTag) {
break
}
}
}
// Can be either `note` or `list`
val type =
if (rootTag == "note") {
Type.NOTE
} else Type.LIST
return BaseNote(
0,
type,
folder,
color,
title,
pinned,
timestamp,
labels,
body,
spans,
items,
emptyList(),
emptyList(),
)
}
private fun parseItem(parser: XmlPullParser, rootTag: String): ListItem {
var body = String()
var checked = false
var isChild = false
var sortingPosition: Int? = null
// TODO: migration required?
while (parser.next() != XmlPullParser.END_DOCUMENT) {
if (parser.eventType == XmlPullParser.START_TAG) {
when (parser.name) {
"text" -> body = parser.nextText()
"checked" -> checked = parser.nextText()?.toBoolean() ?: false
"isChild" -> isChild = parser.nextText()?.toBoolean() ?: false
"sortingPosition" -> sortingPosition = parser.nextText()?.toInt()
}
} else if (parser.eventType == XmlPullParser.END_TAG) {
if (parser.name == rootTag) {
break
}
}
}
return ListItem(body, checked, isChild, sortingPosition, mutableListOf())
}
private fun parseSpan(parser: XmlPullParser): SpanRepresentation {
val start = parser.getAttributeValue(null, "start").toInt()
val end = parser.getAttributeValue(null, "end").toInt()
val bold = parser.getAttributeValue(null, "bold")?.toBoolean() ?: false
val link = parser.getAttributeValue(null, "link")?.toBoolean() ?: false
val italic = parser.getAttributeValue(null, "italic")?.toBoolean() ?: false
val monospace = parser.getAttributeValue(null, "monospace")?.toBoolean() ?: false
val strikethrough = parser.getAttributeValue(null, "strike")?.toBoolean() ?: false
return SpanRepresentation(bold, link, italic, monospace, strikethrough, start, end)
}
}

View file

@ -1,59 +0,0 @@
package com.omgodse.notally.miscellaneous
import com.omgodse.notally.room.ListItem
class CheckedSorter : ListItemSorterStrategy {
override fun sort(
list: MutableList<ListItem>,
initSortingPositions: Boolean,
): MutableList<ListItem> {
if (initSortingPositions) {
list.forEachIndexed { index, item ->
if (item.sortingPosition == null) item.sortingPosition = index
}
}
// Sorted by parents
val sortedGroups =
list
.mapIndexedNotNull { idx, item ->
if (item.isChild) {
null
} else if (idx < list.lastIndex) {
val itemsBelow = list.subList(idx + 1, list.size)
var nextParentIdx = itemsBelow.indexOfFirst { !it.isChild }
if (nextParentIdx == -1) {
// there is only children below it
nextParentIdx = list.lastIndex
} else {
nextParentIdx += idx
}
val items = list.subList(idx, nextParentIdx + 1)
if (items.size > 1) {
items[0].children =
list.subList(idx + 1, nextParentIdx + 1).toMutableList()
}
items
} else {
mutableListOf(item)
}
}
.sortedWith(
Comparator { i1, i2 ->
val parent1 = i1[0]
val parent2 = i2[0]
if (parent1.checked && !parent2.checked) {
return@Comparator 1
}
if (!parent1.checked && parent2.checked) {
return@Comparator -1
}
return@Comparator parent1.sortingPosition!!.compareTo(
parent2.sortingPosition!!
)
}
)
val sortedItems = sortedGroups.flatten().toMutableList()
// sortedItems.updateSortingPositions()
return sortedItems
}
}

View file

@ -1,6 +0,0 @@
package com.omgodse.notally.miscellaneous
object Constants {
const val SelectedLabel = "SelectedLabel"
const val SelectedBaseNote = "SelectedBaseNote"
}

View file

@ -1,37 +0,0 @@
package com.omgodse.notally.miscellaneous
import android.app.Application
import com.omgodse.notally.room.NotallyDatabase
import java.io.File
import java.io.FileInputStream
import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
object Export {
fun backupDatabase(app: Application, zipStream: ZipOutputStream) {
val entry = ZipEntry(NotallyDatabase.DatabaseName)
zipStream.putNextEntry(entry)
val file = app.getDatabasePath(NotallyDatabase.DatabaseName)
val inputStream = FileInputStream(file)
inputStream.copyTo(zipStream)
inputStream.close()
zipStream.closeEntry()
}
fun backupFile(zipStream: ZipOutputStream, root: File?, folder: String, name: String) {
val file = if (root != null) File(root, name) else null
if (file != null && file.exists()) {
val entry = ZipEntry("$folder/$name")
zipStream.putNextEntry(entry)
val inputStream = FileInputStream(file)
inputStream.copyTo(zipStream)
inputStream.close()
zipStream.closeEntry()
}
}
}

View file

@ -1,205 +0,0 @@
package com.omgodse.notally.miscellaneous
import android.content.res.Resources
import android.graphics.Typeface
import android.text.Editable
import android.text.InputType
import android.text.Spannable
import android.text.Spanned
import android.text.TextWatcher
import android.text.style.StrikethroughSpan
import android.text.style.StyleSpan
import android.text.style.TypefaceSpan
import android.text.style.URLSpan
import android.view.KeyEvent
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.inputmethod.EditorInfo
import android.widget.EditText
import android.widget.RemoteViews
import android.widget.TextView
import com.omgodse.notally.activities.TakeNote
import com.omgodse.notally.changehistory.ChangeHistory
import com.omgodse.notally.changehistory.EditTextChange
import com.omgodse.notally.recyclerview.ListManager
import com.omgodse.notally.room.SpanRepresentation
import java.util.Date
import kotlin.math.roundToInt
import org.ocpsoft.prettytime.PrettyTime
/**
* For some reason, this method crashes sometimes with an IndexOutOfBoundsException that I've not
* been able to replicate. When this happens, to prevent the entire app from crashing and becoming
* unusable, the exception is suppressed.
*/
fun String.applySpans(representations: List<SpanRepresentation>): Editable {
val editable = Editable.Factory.getInstance().newEditable(this)
representations.forEach { (bold, link, italic, monospace, strikethrough, start, end) ->
try {
if (bold) {
editable.setSpan(StyleSpan(Typeface.BOLD), start, end)
}
if (italic) {
editable.setSpan(StyleSpan(Typeface.ITALIC), start, end)
}
if (link) {
val url = getURL(start, end)
editable.setSpan(URLSpan(url), start, end)
}
if (monospace) {
editable.setSpan(TypefaceSpan("monospace"), start, end)
}
if (strikethrough) {
editable.setSpan(StrikethroughSpan(), start, end)
}
} catch (exception: Exception) {
exception.printStackTrace()
}
}
return editable
}
private fun String.getURL(start: Int, end: Int): String {
return if (end <= length) {
TakeNote.getURLFrom(substring(start, end))
} else TakeNote.getURLFrom(substring(start, length))
}
private fun Spannable.setSpan(span: Any, start: Int, end: Int) {
if (end <= length) {
setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
} else setSpan(span, start, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
}
fun EditText.setOnNextAction(onNext: () -> Unit) {
setRawInputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES)
setOnKeyListener { v, keyCode, event ->
if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {
onNext()
return@setOnKeyListener true
} else return@setOnKeyListener false
}
setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_NEXT) {
onNext()
return@setOnEditorActionListener true
} else return@setOnEditorActionListener false
}
}
fun Menu.add(title: Int, drawable: Int, onClick: (item: MenuItem) -> Unit): MenuItem {
return add(Menu.NONE, title, drawable, MenuItem.SHOW_AS_ACTION_IF_ROOM, onClick)
}
fun Menu.add(
title: Int,
drawable: Int,
showAsAction: Int,
onClick: (item: MenuItem) -> Unit,
): MenuItem {
return add(Menu.NONE, title, drawable, showAsAction, onClick)
}
fun Menu.add(
groupId: Int,
title: Int,
drawable: Int,
showAsAction: Int,
onClick: (item: MenuItem) -> Unit,
): MenuItem {
val menuItem = add(groupId, Menu.NONE, Menu.NONE, title)
menuItem.setIcon(drawable)
menuItem.setOnMenuItemClickListener { item ->
onClick(item)
return@setOnMenuItemClickListener false
}
menuItem.setShowAsAction(showAsAction)
return menuItem
}
fun TextView.displayFormattedTimestamp(timestamp: Long, dateFormat: String) {
if (dateFormat != com.omgodse.notally.preferences.DateFormat.none) {
visibility = View.VISIBLE
text = formatTimestamp(timestamp, dateFormat)
} else visibility = View.GONE
}
fun RemoteViews.displayFormattedTimestamp(id: Int, timestamp: Long, dateFormat: String) {
if (dateFormat != com.omgodse.notally.preferences.DateFormat.none) {
setViewVisibility(id, View.VISIBLE)
setTextViewText(id, formatTimestamp(timestamp, dateFormat))
} else setViewVisibility(id, View.GONE)
}
val Int.dp: Int
get() = (this / Resources.getSystem().displayMetrics.density).roundToInt()
/**
* Creates a TextWatcher for an EditText that is part of a list. Everytime the text is changed, a
* Change is added to the ChangeHistory.
*
* @param positionGetter Function to determine the current position of the EditText in the list
* (e.g. the current adapterPosition when using RecyclerViewer.Adapter)
* @param updateModel Function to update the model. Is called on any text changes and on undo/redo.
*/
fun EditText.createListTextWatcherWithHistory(listManager: ListManager, positionGetter: () -> Int) =
object : TextWatcher {
private lateinit var currentTextBefore: String
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
currentTextBefore = s.toString()
}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
override fun afterTextChanged(s: Editable?) {
listManager.changeText(
this@createListTextWatcherWithHistory,
this,
positionGetter.invoke(),
currentTextBefore,
requireNotNull(s).toString(),
)
}
}
fun EditText.createTextWatcherWithHistory(
changeHistory: ChangeHistory,
updateModel: (text: String) -> Unit,
) =
object : TextWatcher {
private lateinit var currentTextBefore: String
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
currentTextBefore = s.toString()
}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
override fun afterTextChanged(s: Editable?) {
val textBefore = currentTextBefore
val textAfter = requireNotNull(s).toString()
updateModel.invoke(textAfter)
changeHistory.push(
EditTextChange(
this@createTextWatcherWithHistory,
textAfter,
textBefore,
this,
updateModel,
)
)
}
}
private fun formatTimestamp(timestamp: Long, dateFormat: String): String {
val date = Date(timestamp)
return when (dateFormat) {
com.omgodse.notally.preferences.DateFormat.relative -> PrettyTime().format(date)
else -> java.text.DateFormat.getDateInstance(java.text.DateFormat.FULL).format(date)
}
}

View file

@ -1,66 +0,0 @@
package com.omgodse.notally.miscellaneous
import android.app.Application
import android.content.Context
import android.os.Build
import java.io.File
import java.io.FileOutputStream
import java.io.InputStream
import java.nio.file.Files
object IO {
private fun createDirectory(file: File) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Files.createDirectory(file.toPath())
} else file.mkdir()
}
fun getExternalImagesDirectory(app: Application) = getExternalDirectory(app, "Images")
fun getExternalAudioDirectory(app: Application) = getExternalDirectory(app, "Audios")
private fun getExternalDirectory(app: Application, name: String): File? {
var file: File? = null
try {
val mediaDir = app.externalMediaDirs.firstOrNull()
if (mediaDir != null) {
file = File(mediaDir, name)
if (file.exists()) {
if (!file.isDirectory) {
file.delete()
createDirectory(file)
}
} else createDirectory(file)
}
} catch (exception: Exception) {
exception.printStackTrace()
}
return file
}
fun getTempAudioFile(context: Context): File {
return File(context.externalCacheDir, "Temp.m4a")
}
fun copyStreamToFile(input: InputStream, destination: File) {
val output = FileOutputStream(destination)
input.copyTo(output)
input.close()
output.close()
}
fun renameFile(file: File, name: String): Boolean {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val source = file.toPath()
val destination = source.resolveSibling(name)
Files.move(source, destination)
true // If move failed, an exception would have been thrown
} else {
val destination = file.resolveSibling(name)
file.renameTo(destination)
}
}
}

View file

@ -1,11 +0,0 @@
package com.omgodse.notally.miscellaneous
import com.omgodse.notally.room.ListItem
interface ListItemSorterStrategy {
fun sort(
list: MutableList<ListItem>,
initSortingPosition: Boolean = false,
): MutableList<ListItem>
}

View file

@ -1,134 +0,0 @@
package com.omgodse.notally.miscellaneous
import android.app.Application
import android.content.Context
import android.content.Intent
import android.content.res.ColorStateList
import android.os.Build
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.View
import androidx.core.content.ContextCompat
import com.google.android.material.chip.ChipGroup
import com.google.android.material.shape.MaterialShapeDrawable
import com.google.android.material.shape.RelativeCornerSize
import com.google.android.material.shape.RoundedCornerTreatment
import com.google.android.material.shape.ShapeAppearanceModel
import com.omgodse.notally.BuildConfig
import com.omgodse.notally.R
import com.omgodse.notally.databinding.LabelBinding
import com.omgodse.notally.preferences.TextSize
import com.omgodse.notally.room.Color
import com.omgodse.notally.room.ListItem
import java.io.File
import java.io.FileOutputStream
import java.io.OutputStreamWriter
import java.io.PrintWriter
import java.text.DateFormat
object Operations {
const val extraCharSequence = "com.omgodse.notally.extra.charSequence"
fun getLog(app: Application): File {
val folder = File(app.filesDir, "logs")
folder.mkdir()
return File(folder, "Log.v1.txt")
}
fun log(app: Application, throwable: Throwable) {
val file = getLog(app)
val output = FileOutputStream(file, true)
val writer = PrintWriter(OutputStreamWriter(output, Charsets.UTF_8))
val formatter = DateFormat.getDateTimeInstance()
val time = formatter.format(System.currentTimeMillis())
writer.println("[Start]")
throwable.printStackTrace(writer)
writer.println("Version code : " + BuildConfig.VERSION_CODE)
writer.println("Version name : " + BuildConfig.VERSION_NAME)
writer.println("Model : " + Build.MODEL)
writer.println("Device : " + Build.DEVICE)
writer.println("Brand : " + Build.BRAND)
writer.println("Manufacturer : " + Build.MANUFACTURER)
writer.println("Android : " + Build.VERSION.SDK_INT)
writer.println("Time : $time")
writer.println("[End]")
writer.close()
}
fun extractColor(color: Color, context: Context): Int {
val id =
when (color) {
Color.DEFAULT -> R.color.Default
Color.CORAL -> R.color.Coral
Color.ORANGE -> R.color.Orange
Color.SAND -> R.color.Sand
Color.STORM -> R.color.Storm
Color.FOG -> R.color.Fog
Color.SAGE -> R.color.Sage
Color.MINT -> R.color.Mint
Color.DUSK -> R.color.Dusk
Color.FLOWER -> R.color.Flower
Color.BLOSSOM -> R.color.Blossom
Color.CLAY -> R.color.Clay
}
return ContextCompat.getColor(context, id)
}
fun shareNote(context: Context, title: String, body: CharSequence) {
val text = body.toString()
val intent = Intent(Intent.ACTION_SEND)
intent.type = "text/plain"
intent.putExtra(extraCharSequence, body)
intent.putExtra(Intent.EXTRA_TEXT, text)
intent.putExtra(Intent.EXTRA_TITLE, title)
intent.putExtra(Intent.EXTRA_SUBJECT, title)
val chooser = Intent.createChooser(intent, null)
context.startActivity(chooser)
}
fun getBody(list: List<ListItem>) = buildString {
for (item in list) {
val check = if (item.checked) "[✓]" else "[ ]"
val childIndentation = if (item.isChild) " " else ""
appendLine("$childIndentation$check ${item.body}")
}
}
fun bindLabels(group: ChipGroup, labels: List<String>, textSize: String) {
if (labels.isEmpty()) {
group.visibility = View.GONE
} else {
group.visibility = View.VISIBLE
group.removeAllViews()
val inflater = LayoutInflater.from(group.context)
val labelSize = TextSize.getDisplayBodySize(textSize)
for (label in labels) {
val view = LabelBinding.inflate(inflater, group, true).root
view.background = getOutlinedDrawable(group.context)
view.setTextSize(TypedValue.COMPLEX_UNIT_SP, labelSize)
view.text = label
}
}
}
private fun getOutlinedDrawable(context: Context): MaterialShapeDrawable {
val model =
ShapeAppearanceModel.builder()
.setAllCorners(RoundedCornerTreatment())
.setAllCornerSizes(RelativeCornerSize(0.5f))
.build()
val drawable = MaterialShapeDrawable(model)
drawable.fillColor = ColorStateList.valueOf(0)
drawable.strokeWidth = context.resources.displayMetrics.density
drawable.strokeColor = ContextCompat.getColorStateList(context, R.color.chip_stroke)
return drawable
}
}

View file

@ -1,148 +0,0 @@
package com.omgodse.notally.preferences
import android.content.Context
import com.omgodse.notally.R
import java.text.DateFormat
import java.util.Date
import org.ocpsoft.prettytime.PrettyTime
sealed interface ListInfo {
val title: Int
val key: String
val defaultValue: String
fun getEntryValues(): Array<String>
fun getEntries(context: Context): Array<String>
fun convertToValues(ids: Array<Int>, context: Context): Array<String> {
return Array(ids.size) { index ->
val id = ids[index]
context.getString(id)
}
}
}
object View : ListInfo {
const val list = "list"
const val grid = "grid"
override val title = R.string.view
override val key = "view"
override val defaultValue = list
override fun getEntryValues() = arrayOf(list, grid)
override fun getEntries(context: Context): Array<String> {
val ids = arrayOf(R.string.list, R.string.grid)
return convertToValues(ids, context)
}
}
object Theme : ListInfo {
const val dark = "dark"
const val light = "light"
const val followSystem = "followSystem"
override val title = R.string.theme
override val key = "theme"
override val defaultValue = followSystem
override fun getEntryValues() = arrayOf(dark, light, followSystem)
override fun getEntries(context: Context): Array<String> {
val ids = arrayOf(R.string.dark, R.string.light, R.string.follow_system)
return convertToValues(ids, context)
}
}
object DateFormat : ListInfo {
const val none = "none"
const val relative = "relative"
const val absolute = "absolute"
override val title = R.string.date_format
override val key = "dateFormat"
override val defaultValue = relative
override fun getEntryValues() = arrayOf(none, relative, absolute)
override fun getEntries(context: Context): Array<String> {
val none = context.getString(R.string.none)
val date = Date(System.currentTimeMillis() - 86400000)
val relative = PrettyTime().format(date)
val absolute = DateFormat.getDateInstance(DateFormat.FULL).format(date)
return arrayOf(none, relative, absolute)
}
}
object TextSize : ListInfo {
const val small = "small"
const val medium = "medium"
const val large = "large"
override val title = R.string.text_size
override val key = "textSize"
override val defaultValue = medium
override fun getEntryValues() = arrayOf(small, medium, large)
override fun getEntries(context: Context): Array<String> {
val ids = arrayOf(R.string.small, R.string.medium, R.string.large)
return convertToValues(ids, context)
}
fun getEditBodySize(textSize: String): Float {
return when (textSize) {
small -> 14f
medium -> 16f
large -> 18f
else -> throw IllegalArgumentException("Invalid : $textSize")
}
}
fun getEditTitleSize(textSize: String): Float {
return when (textSize) {
small -> 18f
medium -> 20f
large -> 22f
else -> throw IllegalArgumentException("Invalid : $textSize")
}
}
fun getDisplayBodySize(textSize: String): Float {
return when (textSize) {
small -> 12f
medium -> 14f
large -> 16f
else -> throw IllegalArgumentException("Invalid : $textSize")
}
}
fun getDisplayTitleSize(textSize: String): Float {
return when (textSize) {
small -> 14f
medium -> 16f
large -> 18f
else -> throw IllegalArgumentException("Invalid : $textSize")
}
}
}
object ListItemSorting : ListInfo {
const val noAutoSort = "noAutoSort"
const val autoSortByChecked = "autoSortByChecked"
override val title = R.string.checked_list_item_sorting
override val key = "checkedListItemSorting"
override val defaultValue = noAutoSort
override fun getEntryValues() = arrayOf(noAutoSort, autoSortByChecked)
override fun getEntries(context: Context): Array<String> {
val ids = arrayOf(R.string.no_auto_sort, R.string.auto_sort_by_checked)
return convertToValues(ids, context)
}
}

View file

@ -1,118 +0,0 @@
package com.omgodse.notally.preferences
import android.app.Application
import android.preference.PreferenceManager
/**
* Custom implementation of androidx.preference library Way faster, simpler and smaller, logic of
* storing preferences has been decoupled from their UI. It is backed by SharedPreferences but it
* should be trivial to shift to another source if needed.
*/
class Preferences private constructor(app: Application) {
private val preferences = PreferenceManager.getDefaultSharedPreferences(app)
private val editor = preferences.edit()
// Main thread (unfortunately)
val view = BetterLiveData(getListPref(View))
val theme = BetterLiveData(getListPref(Theme))
val dateFormat = BetterLiveData(getListPref(DateFormat))
val textSize = BetterLiveData(getListPref(TextSize))
val listItemSorting = BetterLiveData(getListPref(ListItemSorting))
var maxItems = getSeekbarPref(MaxItems)
var maxLines = getSeekbarPref(MaxLines)
var maxTitle = getSeekbarPref(MaxTitle)
val autoBackup = BetterLiveData(getTextPref(AutoBackup))
private fun getListPref(info: ListInfo) =
requireNotNull(preferences.getString(info.key, info.defaultValue))
private fun getTextPref(info: TextInfo) =
requireNotNull(preferences.getString(info.key, info.defaultValue))
private fun getSeekbarPref(info: SeekbarInfo) =
requireNotNull(preferences.getInt(info.key, info.defaultValue))
fun getWidgetData(id: Int) = preferences.getLong("widget:$id", 0)
fun deleteWidget(id: Int) {
editor.remove("widget:$id")
editor.commit()
}
fun updateWidget(id: Int, noteId: Long) {
editor.putLong("widget:$id", noteId)
editor.commit()
}
fun getUpdatableWidgets(noteIds: LongArray): List<Pair<Int, Long>> {
val updatableWidgets = ArrayList<Pair<Int, Long>>()
val pairs = preferences.all
pairs.keys.forEach { key ->
val token = "widget:"
if (key.startsWith(token)) {
val end = key.substringAfter(token)
val id = end.toIntOrNull()
if (id != null) {
val value = pairs[key] as? Long
if (value != null) {
if (noteIds.contains(value)) {
updatableWidgets.add(Pair(id, value))
}
}
}
}
}
return updatableWidgets
}
fun savePreference(info: SeekbarInfo, value: Int) {
editor.putInt(info.key, value)
editor.commit()
when (info) {
MaxItems -> maxItems = getSeekbarPref(MaxItems)
MaxLines -> maxLines = getSeekbarPref(MaxLines)
MaxTitle -> maxTitle = getSeekbarPref(MaxTitle)
}
}
fun savePreference(info: ListInfo, value: String) {
editor.putString(info.key, value)
editor.commit()
when (info) {
View -> view.postValue(getListPref(info))
Theme -> theme.postValue(getListPref(info))
DateFormat -> dateFormat.postValue(getListPref(info))
TextSize -> textSize.postValue(getListPref(info))
ListItemSorting -> listItemSorting.postValue(getListPref(info))
}
}
fun savePreference(info: TextInfo, value: String) {
editor.putString(info.key, value)
editor.commit()
when (info) {
AutoBackup -> autoBackup.postValue(getTextPref(info))
}
}
fun showDateCreated(): Boolean {
return dateFormat.value != DateFormat.none
}
companion object {
@Volatile private var instance: Preferences? = null
fun getInstance(app: Application): Preferences {
return instance
?: synchronized(this) {
val instance = Preferences(app)
this.instance = instance
return instance
}
}
}
}

View file

@ -1,47 +0,0 @@
package com.omgodse.notally.preferences
import com.omgodse.notally.R
sealed interface SeekbarInfo {
val title: Int
val key: String
val defaultValue: Int
val min: Int
val max: Int
}
object MaxItems : SeekbarInfo {
override val title = R.string.max_items_to_display
override val key = "maxItemsToDisplayInList.v1"
override val defaultValue = 4
override val min = 1
override val max = 10
}
object MaxLines : SeekbarInfo {
override val title = R.string.max_lines_to_display
override val key = "maxLinesToDisplayInNote.v1"
override val defaultValue = 8
override val min = 1
override val max = 10
}
object MaxTitle : SeekbarInfo {
override val title = R.string.max_lines_to_display_title
override val key = "maxLinesToDisplayInTitle"
override val defaultValue = 1
override val min = 1
override val max = 10
}

View file

@ -1,20 +0,0 @@
package com.omgodse.notally.preferences
import com.omgodse.notally.R
sealed interface TextInfo {
val title: Int
val key: String
val defaultValue: String
}
object AutoBackup : TextInfo {
const val emptyPath = "emptyPath"
override val title = R.string.auto_backup
override val key = "autoBackup"
override val defaultValue = emptyPath
}

View file

@ -1,19 +0,0 @@
package com.omgodse.notally.recyclerview
import androidx.recyclerview.widget.DiffUtil
import com.omgodse.notally.room.ListItem
class ListItemCallback(private val oldList: List<ListItem>, private val newList: List<ListItem>) :
DiffUtil.Callback() {
override fun getOldListSize(): Int = oldList.size
override fun getNewListSize(): Int = newList.size
override fun areItemsTheSame(oldPosition: Int, newPosition: Int): Boolean {
return oldList[oldPosition].id == newList[newPosition].id
}
override fun areContentsTheSame(oldPosition: Int, newPosition: Int): Boolean {
return oldList[oldPosition] == newList[newPosition]
}
}

View file

@ -1,259 +0,0 @@
package com.omgodse.notally.recyclerview
import androidx.recyclerview.widget.SortedList
import com.omgodse.notally.room.ListItem
fun ListItemSortedList.addItem(position: Int, item: ListItem) {
item.sortingPosition = position
this.add(item)
}
fun ListItemSortedList.moveItemRange(
fromIndex: Int,
itemCount: Int,
toIndex: Int,
forceIsChild: Boolean? = null,
): Int? {
if (fromIndex == toIndex || itemCount <= 0) return null
this.beginBatchedUpdates()
val insertPosition = if (fromIndex < toIndex) toIndex - itemCount + 1 else toIndex
if (fromIndex < toIndex) {
this.addToSortingPositions(fromIndex + itemCount until toIndex + 1, -itemCount)
} else {
this.addToSortingPositions(toIndex until fromIndex, itemCount)
}
val itemsToMove = (0 until itemCount).map { this.removeItemAt(fromIndex) }
itemsToMove.forEachIndexed { index, item ->
val movedItem = item.clone() as ListItem
movedItem.sortingPosition = insertPosition + index
this.add(movedItem, forceIsChild)
}
this.endBatchedUpdates()
val newPosition = this.indexOfFirst { it.id == itemsToMove[0].id }!!
return newPosition
}
// fun ListItemSortedList.addAndNotify(
// position: Int,
// item: ListItem,
// adapter: RecyclerView.Adapter<*>,
// ) {
// if (item.checked && item.sortingPosition == null) {
// item.sortingPosition = position
// }
// add(position, item)
// adapter.notifyItemInserted(position)
// }
fun ListItemSortedList.deleteItem(
position: Int,
childrenToDelete: List<ListItem>? = null,
): ListItem {
this.beginBatchedUpdates()
val item = this[position]
val deletedItem = this[position].clone() as ListItem
val children = childrenToDelete ?: item.children
// for (i in position + children.size until this.size()) {
// this[i].sortingPosition = this[i].sortingPosition!! - (children.size + 1)
// }
this.addToSortingPositions(position + children.size until this.size(), -(children.size + 1))
(item + children).indices.forEach { this.removeItemAt(position) }
this.endBatchedUpdates()
return deletedItem
}
fun ListItemSortedList.addToSortingPositions(positionRange: IntRange, valueToAdd: Int) {
this.forEach {
if (it.sortingPosition!! in positionRange) {
it.sortingPosition = it.sortingPosition!! + valueToAdd
}
}
}
fun <T, R> SortedList<T>.map(transform: (T) -> R): List<R> {
return (0 until this.size()).map { transform.invoke(this[it]) }
}
fun <T> SortedList<T>.forEach(function: (item: T) -> Unit) {
return (0 until this.size()).forEach { function.invoke(this[it]) }
}
fun <T> SortedList<T>.forEachIndexed(function: (idx: Int, item: T) -> Unit) {
for (i in 0 until this.size()) {
function.invoke(i, this[i])
}
}
fun <T> SortedList<T>.filter(function: (item: T) -> Boolean): List<T> {
val list = mutableListOf<T>()
for (i in 0 until this.size()) {
if (function.invoke(this[i])) {
list.add(this[i])
}
}
return list.toList()
}
fun <T> SortedList<T>.find(function: (item: T) -> Boolean): T? {
for (i in 0 until this.size()) {
if (function.invoke(this[i])) {
return this[i]
}
}
return null
}
fun <T> SortedList<T>.indexOfFirst(function: (item: T) -> Boolean): Int? {
for (i in 0 until this.size()) {
if (function.invoke(this[i])) {
return i
}
}
return null
}
val <T> SortedList<T>.lastIndex: Int
get() = this.size() - 1
val <T> SortedList<T>.indices: IntRange
get() = (0 until this.size())
fun <T> SortedList<T>.isNotEmpty(): Boolean {
return size() > 0
}
fun <T> SortedList<T>.isEmpty(): Boolean {
return size() == 0
}
fun ListItemSortedList.toMutableList(): MutableList<ListItem> {
return this.indices.map { this[it] }.toMutableList()
}
fun ListItemSortedList.cloneList(): MutableList<ListItem> {
return this.indices.map { this[it].clone() as ListItem }.toMutableList()
}
fun ListItemSortedList.setIsChild(
position: Int,
isChild: Boolean,
forceOnChildren: Boolean = false,
) {
if (forceOnChildren) {
this.setIsChild((position..position + this[position].children.size).toList(), isChild)
} else {
val item = this[position].clone() as ListItem
if (item.isChild != isChild) {
item.isChild = isChild
this.updateItemAt(position, item)
// this.updateAllChildren()
}
}
}
fun ListItemSortedList.setIsChild(positions: List<Int>, isChild: Boolean) {
val changedPositions = mutableListOf<Int>()
val items = this.cloneList()
positions.forEach {
val item = items[it]
if (item.isChild != isChild) {
changedPositions.add(it)
item.isChild = isChild
}
}
updatePositions(changedPositions, items)
}
fun ListItemSortedList.setChecked(position: Int, checked: Boolean): Int {
val item = this[position].clone() as ListItem
if (item.checked != checked) {
item.checked = checked
this.updateItemAt(position, item)
return this.indexOf(item)
}
return position
}
fun ListItemSortedList.setChecked(
positions: Collection<Int>,
checked: Boolean,
): Pair<List<Int>, List<Int>> {
val changedPositions = mutableListOf<Int>()
val items = this.cloneList()
positions.forEach {
val item = items[it]
if (item.checked != checked) {
changedPositions.add(it)
item.checked = checked
}
}
val changedPositionsAfterSort = updatePositions(changedPositions, items)
return Pair(changedPositions, changedPositionsAfterSort)
}
/**
* Checks item at position and its children
*
* @return The position of the checked item afterwards
*/
fun ListItemSortedList.setCheckedWithChildren(position: Int, checked: Boolean): Int {
val parent = this[position]
var childrenWithSameChecked = 0
parent.children.forEach {
val updatedChild = this.find { item -> item.id == it.id }!!
if (updatedChild.checked != checked) {
childrenWithSameChecked++
}
}
val positionsWithChildren = (position..position + childrenWithSameChecked).toList()
val (_, changedPositionsAfterSort) = this.setChecked(positionsWithChildren, checked)
return changedPositionsAfterSort[0]
}
operator fun ListItem.plus(list: List<ListItem>): List<ListItem> {
return mutableListOf(this) + list
}
fun ListItemSortedList.toReadableString(): String {
return map { "${it.toString()} sortingPosition: ${it.sortingPosition} id: ${it.id}" }
.joinToString("\n")
}
fun Collection<ListItem>.toReadableString(): String {
return map { "${it.toString()} uncheckedPos: ${it.sortingPosition} id: ${it.id}" }
.joinToString("\n")
}
fun ListItemSortedList.findParent(childItem: ListItem): Pair<Int, ListItem>? {
this.indices.forEach {
if (this[it].children.find { child -> child.id == childItem.id } != null) {
return Pair(it, this[it])
}
}
return null
}
private fun ListItemSortedList.updatePositions(
changedPositions: MutableList<Int>,
items: MutableList<ListItem>,
): List<Int> {
this.beginBatchedUpdates()
changedPositions.forEach {
val updatedItem = items[it]
val newPosition = this.indexOfFirst { item -> item.id == updatedItem.id }!!
this.updateItemAt(newPosition, updatedItem)
}
val changedPositionsAfterSort =
changedPositions
.map { pos -> this.indexOfFirst { item -> item.id == items[pos].id }!! }
.toList()
this.endBatchedUpdates()
return changedPositionsAfterSort
}

View file

@ -1,26 +0,0 @@
package com.omgodse.notally.recyclerview
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.SortedListAdapterCallback
import com.omgodse.notally.room.ListItem
class ListItemNoSortCallback(adapter: RecyclerView.Adapter<*>?) :
SortedListAdapterCallback<ListItem>(adapter) {
override fun compare(item1: ListItem?, item2: ListItem?): Int {
return when {
item1 == null && item2 == null -> 0
item1 == null && item2 != null -> -1
item1 != null && item2 == null -> 1
else -> item1!!.sortingPosition!!.compareTo(item2!!.sortingPosition!!)
}
}
override fun areContentsTheSame(oldItem: ListItem?, newItem: ListItem?): Boolean {
return oldItem == newItem
}
override fun areItemsTheSame(item1: ListItem?, item2: ListItem?): Boolean {
return item1?.id == item2?.id
}
}

View file

@ -1,84 +0,0 @@
package com.omgodse.notally.recyclerview
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.SortedListAdapterCallback
import com.omgodse.notally.room.ListItem
class ListItemSortedByCheckedCallback(adapter: RecyclerView.Adapter<*>?) :
SortedListAdapterCallback<ListItem>(adapter) {
internal lateinit var items: ListItemSortedList
fun setList(items: ListItemSortedList) {
this.items = items
}
// TODO: remove
override fun compare(item1: ListItem?, item2: ListItem?): Int {
val cmp = compareInternal(item1, item2)
// println("cmp: $cmp item1: $item1\t item2: $item2")
return cmp
}
fun compareInternal(item1: ListItem?, item2: ListItem?): Int {
return when {
item1 == null && item2 == null -> 0
item1 == null && item2 != null -> -1
item1 != null && item2 == null -> 1
item1!!.checked != item2!!.checked -> compareChecked(item1, item2)
else -> item1.sortingPosition!!.compareTo(item2!!.sortingPosition!!)
}
}
private fun compareChecked(item1: ListItem, item2: ListItem): Int {
return when {
item1.id == item2.id -> if (item1.checked) -1 else 1
// if a parent is checked and the child has not been checked yet it should be sorted
// under
// the not yet checked child
item1.isChild && !item2.isChild && item2.checked -> -1
item1.isChild && !item2.isChild && !item2.checked -> 1
// item1.isChild && item2.isChild ->
// item1.sortingPosition!!.compareTo(item2!!.sortingPosition!!)
// if a parent is compared with a children compare the 2 parents instead
item1!!.isChild && !item2!!.isChild -> {
val parent1Info = items.findParent(item1)
// if parent is being sorted it is not yet present in the list
if (parent1Info == null || parent1Info.second.id == item2.id) {
return 1
}
return compare(parent1Info.second, item2)
}
!item1!!.isChild && item2!!.isChild -> {
val parent2Info = items.findParent(item2)
// if parent is being sorted it is not yet present in the list
if (parent2Info == null || parent2Info.second.id == item1.id) {
return -1
}
return compare(item1, parent2Info.second)
}
item1.checked && !item2.checked -> 1
!item1.checked && item2.checked -> -1
else -> 0
}
}
override fun areContentsTheSame(oldItem: ListItem?, newItem: ListItem?): Boolean {
return oldItem == newItem
}
override fun areItemsTheSame(item1: ListItem?, item2: ListItem?): Boolean {
return item1?.id == item2?.id
}
override fun onChanged(position: Int, count: Int) {
super.onChanged(position, count)
}
override fun onChanged(position: Int, count: Int, payload: Any?) {
super.onChanged(position, count, payload)
}
}

View file

@ -1,129 +0,0 @@
package com.omgodse.notally.recyclerview
import androidx.recyclerview.widget.SortedList
import com.omgodse.notally.room.ListItem
class ListItemSortedList(callback: Callback<ListItem>) :
SortedList<ListItem>(ListItem::class.java, callback) {
override fun updateItemAt(index: Int, item: ListItem?) {
updateChildStatus(item, index)
super.updateItemAt(index, item)
}
private fun updateChildStatus(item: ListItem?, index: Int) {
val wasChild = this[index].isChild
if (!wasChild && item?.isChild == true) {
updateChildInParent(index, item)
} else if (wasChild && item?.isChild == false) {
// Child becomes parent
separateChildrenFromParent(item)
}
}
override fun add(item: ListItem?): Int {
val position = super.add(item)
if (item?.isChild == true) {
updateChildInParent(position, item)
}
return position
}
private fun separateChildrenFromParent(item: ListItem) {
findParent(item)?.let { (_, parent) ->
val childIndex = parent.children.indexOfFirst { child -> child.id == item.id }
// If a child becomes a parent it inherits its children below it
val separatedChildren =
if (childIndex < parent.children.lastIndex)
parent.children.subList(childIndex + 1, parent.children.size)
else listOf()
item.children.clear()
item.children.addAll(separatedChildren)
while (parent.children.size >= childIndex + 1) {
parent.children.removeAt(childIndex)
}
}
}
fun add(item: ListItem, isChild: Boolean?) {
if (isChild != null) {
if (item.isChild != isChild) {
if (!item.isChild && isChild) {
item.children.clear()
}
item.isChild = isChild
}
}
add(item)
}
override fun remove(item: ListItem?): Boolean {
if (item?.isChild == true) {
removeChildFromParent(item)
}
return super.remove(item)
}
override fun removeItemAt(index: Int): ListItem {
val item = this[index]
if (item?.isChild == true) {
removeChildFromParent(item)
}
return super.removeItemAt(index)
}
private fun removeChildFromParent(item: ListItem) {
findParent(item)?.let { (_, parent) ->
val childIndex = parent.children.indexOfFirst { child -> child.id == item.id }
parent.children.removeAt(childIndex)
}
}
private fun updateChildInParent(position: Int, item: ListItem) {
var childIndex: Int? = null
var parentInfo = findParent(item)
var parent: ListItem? = null
if (parentInfo == null) {
val parentPosition = findLastIsNotChild(position - 1)!!
childIndex = position - parentPosition - 1
parent = this[parentPosition]
} else {
parent = parentInfo.second
childIndex = parent.children.indexOfFirst { child -> child.id == item.id }
parent.children.removeAt(childIndex)
}
parent!!.children.add(childIndex, item)
parent.children.addAll(childIndex + 1, item.children)
item.children.clear()
}
// override fun updateItemAt(position: Int, newItem: ListItem?) {
// // Retrieve the existing item to maintain the children
// val oldItem = this[position]
//
// // Only transfer children if the new item is not a child itself
// if (oldItem.children.isNotEmpty() && newItem?.isChild == false) {
// newItem.children.clear() // Clear existing children if necessary
// newItem.children.addAll(oldItem.children) // Transfer children
// }
//
// // Call the parent method to perform the actual update
// super.updateItemAt(position, newItem)
// }
/** @return position of the found item and its difference to index */
fun findLastIsNotChild(index: Int): Int? {
var position = index
while (this[position].isChild) {
if (position < 0) {
return null
}
position--
}
return position
}
override fun recalculatePositionOfItemAt(index: Int) {
super.recalculatePositionOfItemAt(index)
}
}

View file

@ -1,381 +0,0 @@
package com.omgodse.notally.recyclerview
import android.text.TextWatcher
import android.util.Log
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import androidx.recyclerview.widget.RecyclerView
import com.omgodse.notally.changehistory.ChangeCheckedForAllChange
import com.omgodse.notally.changehistory.ChangeHistory
import com.omgodse.notally.changehistory.DeleteCheckedChange
import com.omgodse.notally.changehistory.ListAddChange
import com.omgodse.notally.changehistory.ListCheckedChange
import com.omgodse.notally.changehistory.ListDeleteChange
import com.omgodse.notally.changehistory.ListEditTextChange
import com.omgodse.notally.changehistory.ListIsChildChange
import com.omgodse.notally.changehistory.ListMoveChange
import com.omgodse.notally.miscellaneous.CheckedSorter
import com.omgodse.notally.preferences.ListItemSorting
import com.omgodse.notally.preferences.Preferences
import com.omgodse.notally.recyclerview.viewholder.MakeListVH
import com.omgodse.notally.room.ListItem
/**
* Should be used for all changes to the items list. Notifies the RecyclerView.Adapter and pushes
* according changes to the ChangeHistory
*/
class ListManager(
private val recyclerView: RecyclerView,
private val changeHistory: ChangeHistory,
private val preferences: Preferences,
private val inputMethodManager: InputMethodManager,
) {
private var nextItemId: Int = 0
private lateinit var items: ListItemSortedList
internal lateinit var adapter: RecyclerView.Adapter<MakeListVH>
fun add(
position: Int = items.size(),
item: ListItem = defaultNewItem(position),
pushChange: Boolean = true,
) {
val itemBeforeInsert = item.clone() as ListItem
items.beginBatchedUpdates()
for ((idx, newItem) in (item + item.children).withIndex()) {
val insertPosition = position + idx
if (newItem.id == -1) {
newItem.id = nextItemId++
}
items.addToSortingPositions(insertPosition until items.size(), 1)
newItem.sortingPosition = insertPosition
val forceIsChild =
when {
insertPosition == 0 -> false
(insertPosition - 1).isBeforeChildItemOfOtherParent -> true
else -> null
}
items.add(newItem, forceIsChild)
}
items.endBatchedUpdates()
// sortAndUpdate()
// items.updateAllChildren()
val positionAfterAdd = items.indexOf(item)
if (pushChange) {
changeHistory.push(ListAddChange(position, positionAfterAdd, itemBeforeInsert, this))
}
recyclerView.post {
val viewHolder =
recyclerView.findViewHolderForAdapterPosition(positionAfterAdd) as MakeListVH?
if (!item.checked && viewHolder != null) {
viewHolder.focusEditText(inputMethodManager = inputMethodManager)
}
}
}
/**
* Deletes item and its children at given position.
*
* @param force if false, deletion can be rejected, e.g. if trying to delete the first item
* @param childrenToDelete can be used when a ListAddChange is undone to pass the item at the
* state before the insertion
* @param allowFocusChange if true the UI will focus the last valid ListItem's EditText
* @return the removed ListItem or null if deletion was rejected
*/
fun delete(
position: Int = items.lastIndex,
force: Boolean = true,
childrenToDelete: List<ListItem>? = null,
pushChange: Boolean = true,
allowFocusChange: Boolean = true,
): ListItem? {
if (position < 0 || position > items.lastIndex) {
return null
}
var item: ListItem? = null
if (force || position > 0) {
item = items.deleteItem(position, childrenToDelete)
}
if (!force && allowFocusChange) {
if (position > 0) {
this.moveFocusToNext(position - 2)
} else if (items.size() > 1) {
this.moveFocusToNext(position)
}
}
if (item != null && pushChange) {
changeHistory.push(ListDeleteChange(position, item, this))
}
return item
}
/** @return position of the moved item afterwards */
fun move(
positionFrom: Int,
positionTo: Int,
pushChange: Boolean = true,
updateChildren: Boolean = true,
): Int? {
val itemTo = items[positionTo]
val itemFrom = items[positionFrom]
val itemBeforeMove = itemFrom.clone() as ListItem
// Disallow move unchecked item under any checked item (if auto-sort enabled)
if (isAutoSortByCheckedEnabled() && itemTo.checked || itemTo.isChildOf(itemFrom)) {
return null
}
val checkChildPosition = if (positionTo < positionFrom) positionTo - 1 else positionTo
val forceIsChild =
when {
positionTo == 0 -> false
updateChildren && checkChildPosition.isBeforeChildItemOfOtherParent -> true
else -> null
}
val newPosition =
items.moveItemRange(
positionFrom,
itemFrom.itemCount,
positionTo,
forceIsChild = forceIsChild,
) ?: return null
finishMove(
positionFrom,
positionTo,
newPosition,
itemBeforeMove,
updateChildren = false,
pushChange,
)
return newPosition
}
fun finishMove(
positionFrom: Int,
positionTo: Int,
newPosition: Int,
itemBeforeMove: ListItem,
updateChildren: Boolean,
pushChange: Boolean,
) {
if (updateChildren) {
if (newPosition.isBeforeChildItemOfOtherParent) {
items.setIsChild(newPosition, true, true)
} else if (newPosition == 0) {
items.setIsChild(newPosition, false)
} else {
// items.updateAllChildren()
}
}
if (pushChange) {
changeHistory.push(
ListMoveChange(positionFrom, positionTo, newPosition, itemBeforeMove, this)
)
}
}
fun revertMove(positionAfter: Int, positionFrom: Int, itemBeforeMove: ListItem) {
val actualPositionTo =
if (positionAfter < positionFrom) {
positionFrom + itemBeforeMove.children.size
} else {
positionFrom
}
val positionBefore =
move(positionAfter, actualPositionTo, pushChange = false, updateChildren = false)!!
if (items[positionBefore].isChild != itemBeforeMove.isChild) {
items.setIsChild(positionBefore, itemBeforeMove.isChild)
} else {
// items.updateAllChildren()
}
}
fun changeText(
editText: EditText,
listener: TextWatcher,
position: Int,
textBefore: String,
textAfter: String,
pushChange: Boolean = true,
) {
val item = items[position]
item.body = textAfter
if (pushChange) {
changeHistory.push(
ListEditTextChange(editText, position, textBefore, textAfter, listener, this)
)
}
}
fun changeChecked(position: Int, checked: Boolean, pushChange: Boolean = true): Int {
val item = items[position]
if (item.checked == checked) {
return position
}
// if (checked) {
// item.sortingPosition = position
// }
if (item.isChild) {
return changeCheckedForChild(checked, item, pushChange, position)
}
val positionAfter = items.setCheckedWithChildren(position, checked)
if (pushChange) {
changeHistory.push(ListCheckedChange(checked, position, positionAfter, this))
}
return positionAfter
}
private fun changeCheckedForChild(
checked: Boolean,
item: ListItem,
pushChange: Boolean,
position: Int,
): Int {
var changePushedByParent = false
if (!checked) {
val (parentPosition, parent) = items.findParent(item)!!
if (parent.checked) {
val parentPositionAfter = items.setChecked(parentPosition, false)
if (pushChange) {
changeHistory.push(
ListCheckedChange(false, parentPosition, parentPositionAfter, this)
)
changePushedByParent = true
}
}
}
val positionAfter = items.setChecked(position, checked)
if (pushChange && !changePushedByParent) {
changeHistory.push(ListCheckedChange(checked, position, positionAfter, this))
}
return positionAfter
}
fun changeCheckedForAll(checked: Boolean, pushChange: Boolean = true) {
val (changedPositions, changedPositionsAfterSort) = check(checked, items.indices.toList())
if (pushChange) {
changeHistory.push(
ChangeCheckedForAllChange(
checked,
changedPositions,
changedPositionsAfterSort,
this,
)
)
}
}
// fun sortAndUpdate() {
// items.sortAndUpdateItems(adapter = adapter)
// }
fun check(checked: Boolean, positions: Collection<Int>): Pair<List<Int>, List<Int>> {
return items.setChecked(positions, checked)
// val changedPositions = mutableListOf<Int>()
// items.beginBatchedUpdates()
// positions.forEach {
// val item = items[it]
// if (item.checked != checked) {
// changedPositions.add(it)
//// items.setCheckedAndNotify(it, checked)
// if (item.checked != checked) {
// item.checked = checked
//// this.updateItemAt(position, item)
// }
// }
// }
// val changedItems = changedPositions.map { items[it] }.toMutableList()
// items.endBatchedUpdates()
// val changedPositionsAfterSort = changedItems.map { items.indexOf(it)
// }.toMutableList()
// return Pair(changedPositions, changedPositionsAfterSort)
}
fun changeIsChild(position: Int, isChild: Boolean, pushChange: Boolean = true) {
items.setIsChild(position, isChild)
if (pushChange) {
changeHistory.push(ListIsChildChange(isChild, position, this))
}
}
fun moveFocusToNext(position: Int) {
val viewHolder = recyclerView.findViewHolderForAdapterPosition(position + 1) as MakeListVH?
if (viewHolder != null) {
if (viewHolder.binding.CheckBox.isChecked) {
moveFocusToNext(position + 1)
} else viewHolder.binding.EditText.requestFocus()
} else add(pushChange = false)
}
fun getItem(position: Int): ListItem {
return items[position]
}
fun deleteCheckedItems(pushChange: Boolean = true) {
val itemsBeforeDelete = items.toMutableList()
updateList(items.filter { !it.checked }.toMutableList())
if (pushChange) {
changeHistory.push(DeleteCheckedChange(itemsBeforeDelete, this))
}
}
fun updateList(newList: MutableList<ListItem>) {
items.replaceAll(newList)
}
fun initList(items: ListItemSortedList) {
this.items = items
this.items.forEachIndexed { index, item -> item.id = index }
nextItemId = this.items.size()
// this.items.sortAndUpdateItems(initSortingPositions = true, adapter = adapter)
Log.d(TAG, "initList:\n${this.items.toReadableString()}")
}
internal fun defaultNewItem(position: Int) =
ListItem(
"",
false,
items.isNotEmpty() &&
((position < items.size() && items[position].isChild) ||
(position > 0 && items[position - 1].isChild)),
null,
mutableListOf(),
nextItemId++,
)
private fun isAutoSortByCheckedEnabled() =
preferences.listItemSorting.value == ListItemSorting.autoSortByChecked
private val Int.isBeforeChildItemOfOtherParent: Boolean
get() {
if (this < 0) {
return false
}
val item = items[this]
return item.isNextItemChild(this) && !items[this + item.itemCount].isChildOf(this)
}
private fun ListItem.isNextItemChild(position: Int): Boolean {
return (position < items.size() - itemCount) && (items[position + this.itemCount].isChild)
}
private fun ListItem.isChildOf(otherPosition: Int): Boolean {
return isChildOf(items[otherPosition])
}
// private fun MutableList<ListItem>.sortAndUpdateItems(
// newList: MutableList<ListItem> = items,
// initSortingPositions: Boolean = false,
// adapter: RecyclerView.Adapter<*>,
// ) {
// val sortedList =
// SORTERS[preferences.listItemSorting.value]?.sort(newList, initSortingPositions)
// this.updateList(sortedList ?: newList.toMutableList(), adapter)
// }
companion object {
private val SORTERS = mapOf(ListItemSorting.autoSortByChecked to CheckedSorter())
private const val TAG = "ListManager"
}
}

View file

@ -1,101 +0,0 @@
package com.omgodse.notally.recyclerview.adapter
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.omgodse.notally.databinding.RecyclerBaseNoteBinding
import com.omgodse.notally.databinding.RecyclerHeaderBinding
import com.omgodse.notally.recyclerview.ItemListener
import com.omgodse.notally.recyclerview.viewholder.BaseNoteVH
import com.omgodse.notally.recyclerview.viewholder.HeaderVH
import com.omgodse.notally.room.BaseNote
import com.omgodse.notally.room.Header
import com.omgodse.notally.room.Item
import java.io.File
class BaseNoteAdapter(
private val selectedIds: Set<Long>,
private val dateFormat: String,
private val textSize: String,
private val maxItems: Int,
private val maxLines: Int,
private val maxTitle: Int,
private val mediaRoot: File?,
private val listener: ItemListener,
) : ListAdapter<Item, RecyclerView.ViewHolder>(DiffCallback) {
override fun getItemViewType(position: Int): Int {
return when (getItem(position)) {
is Header -> 0
is BaseNote -> 1
}
}
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
when (val item = getItem(position)) {
is Header -> (holder as HeaderVH).bind(item)
is BaseNote ->
(holder as BaseNoteVH).bind(item, mediaRoot, selectedIds.contains(item.id))
}
}
override fun onBindViewHolder(
holder: RecyclerView.ViewHolder,
position: Int,
payloads: MutableList<Any>,
) {
if (payloads.isEmpty()) {
onBindViewHolder(holder, position)
} else handleCheck(holder, position)
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
val inflater = LayoutInflater.from(parent.context)
return when (viewType) {
0 -> {
val binding = RecyclerHeaderBinding.inflate(inflater, parent, false)
HeaderVH(binding)
}
else -> {
val binding = RecyclerBaseNoteBinding.inflate(inflater, parent, false)
BaseNoteVH(binding, dateFormat, textSize, maxItems, maxLines, maxTitle, listener)
}
}
}
private fun handleCheck(holder: RecyclerView.ViewHolder, position: Int) {
val baseNote = getItem(position) as BaseNote
(holder as BaseNoteVH).updateCheck(selectedIds.contains(baseNote.id))
}
private object DiffCallback : DiffUtil.ItemCallback<Item>() {
override fun areItemsTheSame(oldItem: Item, newItem: Item): Boolean {
return when (oldItem) {
is BaseNote ->
if (newItem is BaseNote) {
oldItem.id == newItem.id
} else false
is Header ->
if (newItem is Header) {
oldItem.label == newItem.label
} else false
}
}
override fun areContentsTheSame(oldItem: Item, newItem: Item): Boolean {
return when (oldItem) {
is BaseNote ->
if (newItem is BaseNote) {
oldItem == newItem
} else false
is Header ->
if (newItem is Header) {
oldItem.label == newItem.label
} else false
}
}
}
}

View file

@ -1,24 +0,0 @@
package com.omgodse.notally.recyclerview.adapter
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.ListAdapter
import com.omgodse.notally.databinding.RecyclerLabelBinding
import com.omgodse.notally.recyclerview.ItemListener
import com.omgodse.notally.recyclerview.StringDiffCallback
import com.omgodse.notally.recyclerview.viewholder.LabelVH
class LabelAdapter(private val listener: ItemListener) :
ListAdapter<String, LabelVH>(StringDiffCallback()) {
override fun onBindViewHolder(holder: LabelVH, position: Int) {
val label = getItem(position)
holder.bind(label)
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LabelVH {
val inflater = LayoutInflater.from(parent.context)
val binding = RecyclerLabelBinding.inflate(inflater, parent, false)
return LabelVH(binding, listener)
}
}

View file

@ -1,46 +0,0 @@
package com.omgodse.notally.recyclerview.adapter
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.RecyclerView
import com.omgodse.notally.databinding.RecyclerListItemBinding
import com.omgodse.notally.preferences.Preferences
import com.omgodse.notally.recyclerview.DragCallback
import com.omgodse.notally.recyclerview.ListItemSortedList
import com.omgodse.notally.recyclerview.ListManager
import com.omgodse.notally.recyclerview.viewholder.MakeListVH
class MakeListAdapter(
private val textSize: String,
elevation: Float,
private val preferences: Preferences,
private val listManager: ListManager,
) : RecyclerView.Adapter<MakeListVH>() {
private lateinit var list: ListItemSortedList
private val callback = DragCallback(elevation, listManager)
private val touchHelper = ItemTouchHelper(callback)
override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
touchHelper.attachToRecyclerView(recyclerView)
}
override fun getItemCount() = list.size()
override fun onBindViewHolder(holder: MakeListVH, position: Int) {
val item = list[position]
holder.bind(item, position == 0, preferences.listItemSorting.value)
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MakeListVH {
val inflater = LayoutInflater.from(parent.context)
val binding = RecyclerListItemBinding.inflate(inflater, parent, false)
binding.root.background = parent.background
return MakeListVH(binding, listManager, touchHelper, textSize)
}
internal fun setList(list: ListItemSortedList) {
this.list = list
}
}

View file

@ -1,23 +0,0 @@
package com.omgodse.notally.recyclerview.viewholder
import android.text.format.DateUtils
import androidx.recyclerview.widget.RecyclerView
import com.omgodse.notally.databinding.RecyclerAudioBinding
import com.omgodse.notally.room.Audio
import java.text.DateFormat
class AudioVH(
private val binding: RecyclerAudioBinding,
onClick: (Int) -> Unit,
private val formatter: DateFormat,
) : RecyclerView.ViewHolder(binding.root) {
init {
binding.root.setOnClickListener { onClick(adapterPosition) }
}
fun bind(audio: Audio) {
binding.Date.text = formatter.format(audio.timestamp)
binding.Length.text = DateUtils.formatElapsedTime(audio.duration / 1000)
}
}

View file

@ -1,227 +0,0 @@
package com.omgodse.notally.recyclerview.viewholder
import android.graphics.drawable.Drawable
import android.util.TypedValue
import android.view.View
import android.widget.LinearLayout
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.view.children
import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.bumptech.glide.load.engine.GlideException
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import com.bumptech.glide.request.RequestListener
import com.bumptech.glide.request.target.Target
import com.omgodse.notally.R
import com.omgodse.notally.databinding.RecyclerBaseNoteBinding
import com.omgodse.notally.miscellaneous.Operations
import com.omgodse.notally.miscellaneous.applySpans
import com.omgodse.notally.miscellaneous.displayFormattedTimestamp
import com.omgodse.notally.miscellaneous.dp
import com.omgodse.notally.preferences.TextSize
import com.omgodse.notally.recyclerview.ItemListener
import com.omgodse.notally.room.BaseNote
import com.omgodse.notally.room.Color
import com.omgodse.notally.room.Image
import com.omgodse.notally.room.ListItem
import com.omgodse.notally.room.SpanRepresentation
import com.omgodse.notally.room.Type
import java.io.File
class BaseNoteVH(
private val binding: RecyclerBaseNoteBinding,
private val dateFormat: String,
private val textSize: String,
private val maxItems: Int,
maxLines: Int,
maxTitle: Int,
listener: ItemListener,
) : RecyclerView.ViewHolder(binding.root) {
init {
val title = TextSize.getDisplayTitleSize(textSize)
val body = TextSize.getDisplayBodySize(textSize)
binding.Title.setTextSize(TypedValue.COMPLEX_UNIT_SP, title)
binding.Date.setTextSize(TypedValue.COMPLEX_UNIT_SP, body)
binding.Note.setTextSize(TypedValue.COMPLEX_UNIT_SP, body)
binding.LinearLayout.children.forEach { view ->
view as TextView
view.setTextSize(TypedValue.COMPLEX_UNIT_SP, body)
}
binding.Title.maxLines = maxTitle
binding.Note.maxLines = maxLines
binding.root.setOnClickListener { listener.onClick(adapterPosition) }
binding.root.setOnLongClickListener {
listener.onLongClick(adapterPosition)
return@setOnLongClickListener true
}
}
fun updateCheck(checked: Boolean) {
binding.root.isChecked = checked
}
fun bind(baseNote: BaseNote, mediaRoot: File?, checked: Boolean) {
updateCheck(checked)
when (baseNote.type) {
Type.NOTE -> bindNote(baseNote.body, baseNote.spans)
Type.LIST -> bindList(baseNote.items)
}
binding.Date.displayFormattedTimestamp(baseNote.timestamp, dateFormat)
setColor(baseNote.color)
setImages(baseNote.images, mediaRoot)
binding.Title.text = baseNote.title
binding.Title.isVisible = baseNote.title.isNotEmpty()
Operations.bindLabels(binding.LabelGroup, baseNote.labels, textSize)
if (isEmpty(baseNote)) {
binding.Title.setText(getEmptyMessage(baseNote))
binding.Title.visibility = View.VISIBLE
}
}
private fun bindNote(body: String, spans: List<SpanRepresentation>) {
binding.LinearLayout.visibility = View.GONE
binding.Note.text = body.applySpans(spans)
binding.Note.isVisible = body.isNotEmpty()
}
private fun bindList(items: List<ListItem>) {
binding.Note.visibility = View.GONE
if (items.isEmpty()) {
binding.LinearLayout.visibility = View.GONE
} else {
binding.LinearLayout.visibility = View.VISIBLE
val filteredList = items.take(maxItems)
binding.LinearLayout.children.forEachIndexed { index, view ->
if (view.id != R.id.ItemsRemaining) {
if (index < filteredList.size) {
val item = filteredList[index]
view as TextView
view.text = item.body
handleChecked(view, item.checked)
view.visibility = View.VISIBLE
if (item.isChild) {
val layoutParams = view.layoutParams as LinearLayout.LayoutParams
layoutParams.marginStart = 150.dp
view.layoutParams = layoutParams
}
} else view.visibility = View.GONE
}
}
if (items.size > maxItems) {
binding.ItemsRemaining.visibility = View.VISIBLE
binding.ItemsRemaining.text = (items.size - maxItems).toString()
} else binding.ItemsRemaining.visibility = View.GONE
}
}
private fun setColor(color: Color) {
val context = binding.root.context
if (color == Color.DEFAULT) {
val stroke = ContextCompat.getColorStateList(context, R.color.chip_stroke)
binding.root.setStrokeColor(stroke)
binding.root.setCardBackgroundColor(0)
} else {
binding.root.strokeColor = 0
val colorInt = Operations.extractColor(color, context)
binding.root.setCardBackgroundColor(colorInt)
}
}
private fun setImages(images: List<Image>, mediaRoot: File?) {
if (images.isNotEmpty()) {
binding.ImageView.visibility = View.VISIBLE
binding.Message.visibility = View.GONE
val image = images[0]
val file = if (mediaRoot != null) File(mediaRoot, image.name) else null
Glide.with(binding.ImageView)
.load(file)
.centerCrop()
.transition(DrawableTransitionOptions.withCrossFade())
.diskCacheStrategy(DiskCacheStrategy.NONE)
.listener(
object : RequestListener<Drawable> {
override fun onLoadFailed(
e: GlideException?,
model: Any?,
target: Target<Drawable>?,
isFirstResource: Boolean,
): Boolean {
binding.Message.visibility = View.VISIBLE
return false
}
override fun onResourceReady(
resource: Drawable?,
model: Any?,
target: Target<Drawable>?,
dataSource: DataSource?,
isFirstResource: Boolean,
): Boolean {
return false
}
}
)
.into(binding.ImageView)
} else {
binding.ImageView.visibility = View.GONE
binding.Message.visibility = View.GONE
Glide.with(binding.ImageView).clear(binding.ImageView)
}
}
private fun isEmpty(baseNote: BaseNote): Boolean {
return when (baseNote.type) {
Type.NOTE ->
baseNote.title.isBlank() && baseNote.body.isBlank() && baseNote.images.isEmpty()
Type.LIST ->
baseNote.title.isBlank() && baseNote.items.isEmpty() && baseNote.images.isEmpty()
}
}
private fun getEmptyMessage(baseNote: BaseNote): Int {
return when (baseNote.type) {
Type.NOTE -> R.string.empty_note
Type.LIST -> R.string.empty_list
}
}
private fun handleChecked(textView: TextView, checked: Boolean) {
if (checked) {
textView.setCompoundDrawablesRelativeWithIntrinsicBounds(
R.drawable.checkbox_16,
0,
0,
0,
)
} else
textView.setCompoundDrawablesRelativeWithIntrinsicBounds(
R.drawable.checkbox_outline_16,
0,
0,
0,
)
}
}

View file

@ -1,20 +0,0 @@
package com.omgodse.notally.recyclerview.viewholder
import androidx.recyclerview.widget.RecyclerView
import com.omgodse.notally.databinding.RecyclerColorBinding
import com.omgodse.notally.miscellaneous.Operations
import com.omgodse.notally.recyclerview.ItemListener
import com.omgodse.notally.room.Color
class ColorVH(private val binding: RecyclerColorBinding, listener: ItemListener) :
RecyclerView.ViewHolder(binding.root) {
init {
binding.CardView.setOnClickListener { listener.onClick(adapterPosition) }
}
fun bind(color: Color) {
val value = Operations.extractColor(color, binding.root.context)
binding.CardView.setCardBackgroundColor(value)
}
}

View file

@ -1,22 +0,0 @@
package com.omgodse.notally.recyclerview.viewholder
import androidx.recyclerview.widget.RecyclerView
import com.omgodse.notally.databinding.RecyclerLabelBinding
import com.omgodse.notally.recyclerview.ItemListener
class LabelVH(private val binding: RecyclerLabelBinding, listener: ItemListener) :
RecyclerView.ViewHolder(binding.root) {
init {
binding.root.setOnClickListener { listener.onClick(adapterPosition) }
binding.root.setOnLongClickListener {
listener.onLongClick(adapterPosition)
return@setOnLongClickListener true
}
}
fun bind(value: String) {
binding.root.text = value
}
}

View file

@ -1,130 +0,0 @@
package com.omgodse.notally.recyclerview.viewholder
import android.text.TextWatcher
import android.util.TypedValue
import android.view.KeyEvent
import android.view.MotionEvent
import android.view.inputmethod.InputMethodManager
import android.widget.TextView.INVISIBLE
import android.widget.TextView.VISIBLE
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.RecyclerView
import com.omgodse.notally.databinding.RecyclerListItemBinding
import com.omgodse.notally.miscellaneous.createListTextWatcherWithHistory
import com.omgodse.notally.miscellaneous.layout.SwipeLayout.SwipeActionsListener
import com.omgodse.notally.miscellaneous.setOnNextAction
import com.omgodse.notally.preferences.ListItemSorting
import com.omgodse.notally.preferences.TextSize
import com.omgodse.notally.recyclerview.ListManager
import com.omgodse.notally.room.ListItem
class MakeListVH(
val binding: RecyclerListItemBinding,
val listManager: ListManager,
touchHelper: ItemTouchHelper,
textSize: String,
) : RecyclerView.ViewHolder(binding.root) {
private var editTextWatcher: TextWatcher
init {
val body = TextSize.getEditBodySize(textSize)
binding.EditText.setTextSize(TypedValue.COMPLEX_UNIT_SP, body)
binding.EditText.setOnNextAction {
val position = adapterPosition + 1
listManager.add(position)
}
editTextWatcher =
binding.EditText.createListTextWatcherWithHistory(listManager, this::getAdapterPosition)
binding.EditText.addTextChangedListener(editTextWatcher)
binding.EditText.setOnFocusChangeListener { _, hasFocus ->
binding.Delete.visibility = if (hasFocus) VISIBLE else INVISIBLE
}
binding.DragHandle.setOnTouchListener { _, event ->
if (event.actionMasked == MotionEvent.ACTION_DOWN) {
touchHelper.startDrag(this)
}
false
}
}
fun bind(item: ListItem, firstItem: Boolean, autoSort: String) {
updateEditText(item)
updateCheckBox(item)
updateDeleteButton(item)
updateSwipe(item.isChild, !firstItem && !item.checked)
if (item.checked && autoSort == ListItemSorting.autoSortByChecked) {
binding.DragHandle.visibility = INVISIBLE
} else {
binding.DragHandle.visibility = VISIBLE
}
}
fun focusEditText(
selectionStart: Int = binding.EditText.text.length,
inputMethodManager: InputMethodManager,
) {
binding.EditText.requestFocus()
binding.EditText.setSelection(selectionStart)
inputMethodManager.showSoftInput(binding.EditText, InputMethodManager.SHOW_IMPLICIT)
}
private fun updateDeleteButton(item: ListItem) {
binding.Delete.visibility = if (item.checked) VISIBLE else INVISIBLE
binding.Delete.setOnClickListener { listManager.delete(adapterPosition) }
}
private fun updateEditText(item: ListItem) {
binding.EditText.removeTextChangedListener(editTextWatcher)
binding.EditText.setText(item.body)
binding.EditText.isEnabled = !item.checked
binding.EditText.addTextChangedListener(editTextWatcher)
binding.EditText.setOnKeyListener { _, keyCode, event ->
if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_DEL) {
// TODO: when there are multiple checked items above it does not jump to the last
// unchecked item but always re-adds a new item
listManager.delete(adapterPosition, false)
}
true
}
}
private fun updateCheckBox(item: ListItem) {
binding.CheckBox.setOnCheckedChangeListener(null)
binding.CheckBox.isChecked = item.checked
binding.CheckBox.setOnCheckedChangeListener { _, isChecked ->
listManager.changeChecked(adapterPosition, isChecked)
}
}
private fun updateSwipe(open: Boolean, canSwipe: Boolean) {
binding.SwipeLayout.setOnActionsListener(null)
val swipeActionListener =
object : SwipeActionsListener {
override fun onOpen(direction: Int, isContinuous: Boolean) {
listManager.changeIsChild(adapterPosition, true)
}
override fun onClose() {
listManager.changeIsChild(adapterPosition, false)
}
}
binding.SwipeLayout.isEnabledSwipe = canSwipe
binding.SwipeLayout.post {
if (open) {
binding.SwipeLayout.openLeft(false)
} else {
binding.SwipeLayout.close(false)
}
binding.SwipeLayout.setOnActionsListener(swipeActionListener)
}
}
}

View file

@ -1,5 +0,0 @@
package com.omgodse.notally.room
import kotlinx.parcelize.Parcelize
@Parcelize data class Audio(var name: String, val duration: Long, val timestamp: Long) : Attachment

View file

@ -1,22 +0,0 @@
package com.omgodse.notally.room
import androidx.room.Entity
import androidx.room.Index
import androidx.room.PrimaryKey
@Entity(indices = [Index(value = ["id", "folder", "pinned", "timestamp", "labels"])])
data class BaseNote(
@PrimaryKey(autoGenerate = true) val id: Long,
val type: Type,
val folder: Folder,
val color: Color,
val title: String,
val pinned: Boolean,
val timestamp: Long,
val labels: List<String>,
val body: String,
val spans: List<SpanRepresentation>,
val items: List<ListItem>,
val images: List<Image>,
val audios: List<Audio>,
) : Item

View file

@ -1,16 +0,0 @@
package com.omgodse.notally.room
enum class Color {
DEFAULT,
CORAL,
ORANGE,
SAND,
STORM,
FOG,
SAGE,
MINT,
DUSK,
FLOWER,
BLOSSOM,
CLAY,
}

View file

@ -1,148 +0,0 @@
package com.omgodse.notally.room
import androidx.room.TypeConverter
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
object Converters {
@TypeConverter fun labelsToJson(labels: List<String>) = JSONArray(labels).toString()
@TypeConverter fun jsonToLabels(json: String) = JSONArray(json).iterable<String>().toList()
@TypeConverter
fun imagesToJson(images: List<Image>): String {
val objects =
images.map { image ->
val jsonObject = JSONObject()
jsonObject.put("name", image.name)
jsonObject.put("mimeType", image.mimeType)
}
return JSONArray(objects).toString()
}
@TypeConverter
fun jsonToImages(json: String): List<Image> {
val iterable = JSONArray(json).iterable<JSONObject>()
return iterable.map { jsonObject ->
val name = jsonObject.getString("name")
val mimeType = jsonObject.getString("mimeType")
Image(name, mimeType)
}
}
@TypeConverter
fun audiosToJson(audios: List<Audio>): String {
val objects =
audios.map { audio ->
val jsonObject = JSONObject()
jsonObject.put("name", audio.name)
jsonObject.put("duration", audio.duration)
jsonObject.put("timestamp", audio.timestamp)
}
return JSONArray(objects).toString()
}
@TypeConverter
fun jsonToAudios(json: String): List<Audio> {
val iterable = JSONArray(json).iterable<JSONObject>()
return iterable.map { jsonObject ->
val name = jsonObject.getString("name")
val duration = jsonObject.getLong("duration")
val timestamp = jsonObject.getLong("timestamp")
Audio(name, duration, timestamp)
}
}
@TypeConverter
fun jsonToSpans(json: String): List<SpanRepresentation> {
val iterable = JSONArray(json).iterable<JSONObject>()
return iterable.map { jsonObject ->
val bold = jsonObject.getSafeBoolean("bold")
val link = jsonObject.getSafeBoolean("link")
val italic = jsonObject.getSafeBoolean("italic")
val monospace = jsonObject.getSafeBoolean("monospace")
val strikethrough = jsonObject.getSafeBoolean("strikethrough")
val start = jsonObject.getInt("start")
val end = jsonObject.getInt("end")
SpanRepresentation(bold, link, italic, monospace, strikethrough, start, end)
}
}
@TypeConverter
fun spansToJson(list: List<SpanRepresentation>) = spansToJSONArray(list).toString()
@TypeConverter
fun jsonToItems(json: String): List<ListItem> {
val iterable = JSONArray(json).iterable<JSONObject>()
return iterable.map { jsonObject ->
val body = jsonObject.getString("body")
val checked = jsonObject.getBoolean("checked")
val isChild = jsonObject.getSafeBoolean("isChild")
val sortingPosition = jsonObject.getSafeInt("sortingPosition")
ListItem(body, checked, isChild, sortingPosition, mutableListOf())
}
}
@TypeConverter fun itemsToJson(list: List<ListItem>) = itemsToJSONArray(list).toString()
fun itemsToJSONArray(list: List<ListItem>): JSONArray {
val objects =
list.map { item ->
val jsonObject = JSONObject()
jsonObject.put("body", item.body)
jsonObject.put("checked", item.checked)
jsonObject.put("isChild", item.isChild)
jsonObject.put("sortingPosition", item.sortingPosition)
}
return JSONArray(objects)
}
fun spansToJSONArray(list: List<SpanRepresentation>): JSONArray {
val objects =
list.map { representation ->
val jsonObject = JSONObject()
jsonObject.put("bold", representation.bold)
jsonObject.put("link", representation.link)
jsonObject.put("italic", representation.italic)
jsonObject.put("monospace", representation.monospace)
jsonObject.put("strikethrough", representation.strikethrough)
jsonObject.put("start", representation.start)
jsonObject.put("end", representation.end)
}
return JSONArray(objects)
}
private fun JSONObject.getSafeBoolean(name: String): Boolean {
return try {
getBoolean(name)
} catch (exception: JSONException) {
false
}
}
private fun JSONObject.getSafeInt(name: String): Int? {
return try {
getInt(name)
} catch (exception: JSONException) {
null
}
}
private fun <T> JSONArray.iterable() = Iterable {
object : Iterator<T> {
var index = 0
override fun next(): T {
val element = get(index)
index++
return element as T
}
override fun hasNext(): Boolean {
return index < length()
}
}
}
}

View file

@ -1,7 +0,0 @@
package com.omgodse.notally.room
enum class Folder {
NOTES,
DELETED,
ARCHIVED,
}

Some files were not shown because too many files have changed in this diff Show more