Commit graph

1401 commits

Author SHA1 Message Date
Stefan Niedermann
caf63c4a07 Move trigger for new account chooser to toolbar 2020-06-04 21:08:02 +02:00
Stefan Niedermann
2774844e74 Implement new account chooser 2020-06-04 18:59:03 +02:00
Stefan Niedermann
4fab5c43e5 Merge branch 'master' into branding 2020-06-04 17:33:52 +02:00
Stefan Niedermann
62405ecfd3 Use for each account an own API instance for Glide 2020-06-04 16:19:02 +02:00
Stefan Niedermann
cde522d3b5 Enhance cursor handle color 2020-06-04 16:05:08 +02:00
Stefan Niedermann
5c135ad4ec Merge branch 'master' into branding 2020-06-04 15:55:33 +02:00
Nextcloud bot
be61d512c0 [tx-robot] updated from transifex 2020-06-04 15:54:53 +02:00
Stefan Niedermann
5f57fbec04 Fix Android instrumented tests 2020-06-04 15:54:26 +02:00
Stefan Niedermann
0ac1ee7d3d Adjust selection handles 2020-06-03 18:31:16 +02:00
Stefan Niedermann
a5687e3d5f Merge branch 'master' into branding 2020-06-03 13:03:05 +02:00
Stefan Niedermann
b25d75562f Merge branch 'master' into 832-nlw-to-db
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidget.java
2020-06-03 12:57:18 +02:00
Nextcloud bot
2a213355e2 [tx-robot] updated from transifex 2020-06-03 12:55:54 +02:00
Stefan Niedermann
8f7036cdf9 Change highlight color based on theme 2020-06-02 21:15:10 +02:00
Stefan Niedermann
e6c117bded Enhance cursors 2020-06-02 20:35:14 +02:00
Stefan Niedermann
88370cfcc3 Update splashscreen 2020-06-02 19:23:08 +02:00
Stefan Niedermann
fef7e2ead1 Make sidebar background match primary color 2020-06-02 18:14:40 +02:00
Stefan Niedermann
ba95962e27 Merge branch 'master' into branding
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/MultiSelectedActionModeCallback.java
#	app/src/main/res/values/strings.xml
2020-06-02 17:10:40 +02:00
Stefan Niedermann
634a5ed6b9 Remove dead code 2020-06-02 17:09:40 +02:00
Stefan Niedermann
75fc39c2d3 Bulk share content of multiple notes 2020-06-02 17:08:37 +02:00
Stefan Niedermann
764b9bc050 Colorize switches when branding is disabled 2020-06-02 12:18:46 +02:00
Stefan Niedermann
46359ae84f Colorize license button when branding is enabled 2020-06-02 11:58:44 +02:00
Stefan Niedermann
bbb4e50bff Colorize tab indicator when branding is enabled 2020-06-02 11:53:34 +02:00
Stefan Niedermann
67c1d47f1f Set title correctly when share / append to note 2020-06-02 11:45:07 +02:00
Stefan Niedermann
8b99d787f0 Enhance category branding 2020-06-02 11:40:22 +02:00
Stefan Niedermann
5fba27cdae Enhance in-note-search highlight brand 2020-06-02 11:02:52 +02:00
Stefan Niedermann
aa5a349661 Fix in-note-search highlight brand 2020-06-02 10:44:56 +02:00
Stefan Niedermann
89177339af Android 4.4 does not colorize categories correctly 2020-06-02 09:40:52 +02:00
Stefan Niedermann
d08bd12498 Proper tinting of menu icons 2020-06-02 09:28:21 +02:00
Stefan Niedermann
13259b5e90 Fallback for disabled branding 2020-06-01 22:38:38 +02:00
Stefan Niedermann
3f72660dcd Branded snackbar actions 2020-06-01 22:31:31 +02:00
Stefan Niedermann
93cb684791 Fix some coloring issues with dark theme 2020-06-01 22:09:23 +02:00
Stefan Niedermann
9664561935 Enhance in-note search coloring 2020-06-01 21:51:52 +02:00
Stefan Niedermann
ac5c0d7e0b Fix color of search matches in-note search 2020-06-01 21:47:04 +02:00
Stefan Niedermann
f1a50724d3 Fix color of search matches 2020-06-01 21:28:06 +02:00
Stefan Niedermann
3a899c1f6e Fix favorite checkbox color 2020-06-01 18:20:10 +02:00
Stefan Niedermann
e1ba4569d0 Make toolbars the same background color as the main content 2020-06-01 17:57:32 +02:00
Stefan Niedermann
77d9d4ffb4 Tint icons grey600, so they will be visible on both, day and night theme on Android 4 2020-06-01 17:19:48 +02:00
Stefan Niedermann
b9168bf98a Fix statusbar 2020-06-01 16:45:03 +02:00
Stefan Niedermann
0b7f82e76d Use simplified branding similar to the upcoming files app release 2020-06-01 16:27:05 +02:00
Stefan Niedermann
14c8d04ece Fix build 2020-06-01 14:30:04 +02:00
Stefan Niedermann
5e04817640 Merge branch 'master' into branding
# Conflicts:
#	app/src/main/res/values/strings.xml
2020-06-01 14:28:24 +02:00
Stefan Niedermann
558f68e201 version bump to 2.12.2 2020-06-01 14:15:15 +02:00
Stefan Niedermann
09ac1d5287 Prepare release 2020-06-01 14:11:45 +02:00
Stefan Niedermann
200a70cd2e Enhance layout of create note widget 2020-06-01 14:01:46 +02:00
Stefan Niedermann
ef0f535c27 Limit NLW title to one line (ellipsized) 2020-06-01 13:53:37 +02:00
Daniel Bailey
9377485eec Add appWidgetId to PendingIntent's request code
Ensures uniqueness with multiple widgets.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
2020-06-01 13:31:49 +02:00
IF-ACT
f6467ca972 Revert "Revert "Revert "Add comment for final pre"""
This reverts commit 61a8fc25c7.
2020-05-30 18:20:49 +08:00
IF-ACT
75516dc2f3 Revert "Revert "Revert "Add comment on test"""
This reverts commit 98c1d96d34.
2020-05-30 18:20:28 +08:00
IF-ACT
98c1d96d34 Revert "Revert "Add comment on test""
This reverts commit 431983af8d.
2020-05-30 18:07:41 +08:00
IF-ACT
61a8fc25c7 Revert "Revert "Add comment for final pre""
This reverts commit fab225710e.
2020-05-30 18:07:35 +08:00
IF-ACT
fab225710e Revert "Add comment for final pre"
This reverts commit de6ad5c8ea.
2020-05-30 17:52:41 +08:00
IF-ACT
431983af8d Revert "Add comment on test"
This reverts commit b81b6cdfab.
2020-05-30 17:52:37 +08:00
IF-ACT
b81b6cdfab Add comment on test 2020-05-30 17:44:54 +08:00
IF-ACT
de6ad5c8ea Add comment for final pre 2020-05-30 17:42:05 +08:00
Daniel Bailey
e8f93754bc
Small bugfix when retreiving category count
Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
2020-05-29 22:44:49 +01:00
Peter S
41e393c117 fix the version conflict bug in AbstractNotesDatabase.java 2020-05-29 15:05:42 +08:00
Stefan Niedermann
592e45ce71 Merge branch 'master' into 603-sorting-method 2020-05-26 23:45:47 +02:00
Nextcloud bot
196e64151d [tx-robot] updated from transifex 2020-05-26 22:20:15 +02:00
Stefan Niedermann
1f4a17e5d2 Fix ID 2020-05-26 14:29:33 +02:00
Stefan Niedermann
3a5c3311cf Fix ID 2020-05-26 14:29:19 +02:00
Stefan Niedermann
1519efb011 Merge branch 'master' into 832-nlw-to-db
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidget.java
#	app/src/main/res/layout/widget_note_list.xml
2020-05-26 14:28:46 +02:00
Stefan Niedermann
ce54629029 Upgrade note list widget style 2020-05-26 14:27:25 +02:00
Stefan Niedermann
ba4ac3e7de Add final keyword and @Nullable 2020-05-26 13:00:13 +02:00
Stefan Niedermann
81f71ca574 Fix #841 "Link" functionality in text menu causes error 2020-05-26 12:59:08 +02:00
Stefan Niedermann
85021909f3 Update create note widget 2020-05-25 21:23:04 +02:00
Stefan Niedermann
f9bf0841af Update splashscreen and launcher icon 2020-05-25 20:48:43 +02:00
Stefan Niedermann
196e677b76 Adapt new icon 2020-05-25 19:32:32 +02:00
Peter S
9558374632 Merge branch 'master' of https://github.com/stefan-niedermann/nextcloud-notes into 603-sorting-method 2020-05-24 23:07:16 +08:00
Daniel Bailey
2ff81a67dc
Re-added setData() to serviceIntent in updateAppWidget
This is necessary so that multiple calls to the RemoteViews service are
detected.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
2020-05-24 15:56:59 +01:00
IF-ACT
22a4776948 Add test & document 2020-05-24 21:56:57 +08:00
IF-ACT
25dddd1dc8 Merge branch '814-normalize-database' into 603-sorting-method 2020-05-24 20:53:33 +08:00
IF-ACT
9e677e52a6 Seperates function getCategoryOrder & modifyCategoryOrder 2020-05-24 20:29:25 +08:00
IF-ACT
5b0ec91c86 Fixed wrong icon on activity start 2020-05-24 19:10:56 +08:00
Daniel Bailey
d4f740d64a Fixes #817
Added a unique request code to each of the pending intents used by NoteListWidget.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
2020-05-23 17:34:46 +02:00
Stefan Niedermann
7ef59df1cb #832 Move note list widget preferences to database 2020-05-23 16:36:10 +02:00
IF-ACT
b4eaefd6d4 Fixed sort 2020-05-23 21:38:24 +08:00
IF-ACT
fdf0adb5b8 Add sorting method to special categories 2020-05-23 21:15:17 +08:00
Stefan Niedermann
afce9831a6 #832 Move note list widget preferences to database
Create table and migrate existing values
2020-05-23 13:57:16 +02:00
IF-ACT
87b3fb03ba Can sort by certern sorting method now 2020-05-23 19:40:04 +08:00
Stefan Niedermann
302f988495 Revert #817 2020-05-23 13:20:51 +02:00
IF-ACT
248233f670 Fixed wrong icon on activity start 2020-05-23 19:19:26 +08:00
Stefan Niedermann
7729d27b0b Merge branch '814-normalize-database' 2020-05-23 13:18:46 +02:00
Isc
116ce2a49a Remove useless foreign key 2020-05-23 18:29:40 +08:00
Isc
910f465fc8 Bug fixed: incorrect accountID in category table 2020-05-23 18:28:29 +08:00
Isc
c045948f81 Merge 2020-05-23 18:28:01 +08:00
Isc
16aabd8629 Merge 2020-05-23 17:32:27 +08:00
Stefan Niedermann
e0e0033efa Fix table creation 2020-05-23 11:30:45 +02:00
Stefan Niedermann
625ca9ca5f Fix table creation 2020-05-23 11:29:16 +02:00
Stefan Niedermann
d69003109d Remove category param from NLW 2020-05-23 11:22:01 +02:00
Stefan Niedermann
012800e028 Add FOREIGN KEY constraint to CATEGORY_ACCOUNT_ID 2020-05-23 10:41:58 +02:00
Stefan Niedermann
b2d07fd520 Migrate excerpt 2020-05-23 09:49:25 +02:00
Isc
9c8148ebbd Merge latest database 2020-05-23 11:42:24 +08:00
IF-ACT
6b457cee94 Fixed null exception in All notes, Favourite, and Uncategorized notes 2020-05-23 06:28:43 +08:00
IF-ACT
3dab7989ff Add icon and frontend code 2020-05-23 05:16:55 +08:00
Hui-Ouyang16
c9da790226 overload searchNotes method for supporting choose ordering method 2020-05-23 04:11:16 +08:00
Hui-Ouyang16
f36b94e025 modify get/modify ordering method from byId to byTitle 2020-05-23 03:40:00 +08:00
Hui-Ouyang16
17687b2511 Merge branch '814-normalize-database' of https://github.com/stefan-niedermann/nextcloud-notes into 603-sorting-method 2020-05-23 03:24:01 +08:00
Hui-Ouyang16
0dc19d0134 fixed a bug in junit test 2020-05-23 03:11:22 +08:00
Hui-Ouyang16
ab89852b22 finish the backend API and corresponding test case for category sorting method 2020-05-23 00:20:10 +08:00
Peter S
a6580bcdbc add a new column in category table to store the sorting method, and modify CategorySortingMethod enum class 2020-05-22 23:07:54 +08:00
Stefan Niedermann
4000abd733 Fix #817 Note list widget should create a note in it's respective category 2020-05-20 17:23:39 +02:00
Stefan Niedermann
2c78acd984 Fix #754 Move single note widget preferences to database 2020-05-20 16:19:18 +02:00
Stefan Niedermann
d9cceb96c8 Remove deprecated DBStatus 2020-05-20 09:31:49 +02:00
Stefan Niedermann
963b245f85 Fix migration paths using hardcoded strings instead of variables (which might change) 2020-05-20 09:09:16 +02:00
Peter S
d40800c666 add test for enum and corresponding methods 2020-05-20 00:17:19 +08:00
Peter S
f6b9b8c48e add two sorting methods: lexicographical_asc & modified_desc 2020-05-20 00:00:29 +08:00
Peter S
491f2c1230 add a enum for category note list sorting method 2020-05-19 23:43:14 +08:00
Nextcloud bot
56d6e53ebb [tx-robot] updated from transifex 2020-05-19 08:27:59 +02:00
Stefan Niedermann
c9dd881ead version bump to 2.12.1 2020-05-18 07:51:01 +02:00
Isc
81389d847a Remove random test for fixed test is good enough 2020-05-12 18:26:31 +08:00
Isc
415813b26c Fix CI error 2020-05-12 12:19:32 +08:00
Isc
94dce5a20a Add unique over category_account_id and category_title 2020-05-12 12:11:57 +08:00
Isc
43f88a2387 Fix CI error 2020-05-12 03:01:22 +08:00
Isc
895f1b0eab Persist the capabilities values in addAccount 2020-05-12 02:20:18 +08:00
Isc
b2203285c2 Add @NonNull in the constructor for response in the constructor in Capabilities 2020-05-12 01:43:37 +08:00
Isaac-Graham
4e53d7ff93
Merge branch '814-normalize-database' into master 2020-05-12 00:55:35 +08:00
Nextcloud bot
3b2c2a3314 [tx-robot] updated from transifex 2020-05-11 13:12:45 +02:00
Stefan Niedermann
af22d0022d version bump to 2.12.0 2020-05-11 12:48:35 +02:00
Stefan Niedermann
a11a127f50 #174 Allow to share into exiting note 2020-05-11 12:46:48 +02:00
Stefan Niedermann
dfc3943124 Merge remote-tracking branch 'origin/share-into-existing-note'
# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/2012000.txt
2020-05-11 12:42:13 +02:00
Stefan Niedermann
15d69022d2 #824 Error 302 when notes app is not installed on server
Added explicit hint in ExceptionDialogFragment
2020-05-11 11:51:27 +02:00
Stefan Niedermann
0676b195fb 🐞 Fix upgrading from version <= 1.0.1 to a current version 2020-05-11 11:47:25 +02:00
Isc
29d23f4d9d Remove random 2020-05-11 14:40:17 +08:00
Isc
916a5fef7b Remove useless random in SearchableBaseNoteFragmentTest 2020-05-11 05:40:18 +08:00
Isc
aaf994054e Switch arguments for consistency in NotesDatabase.java 2020-05-11 05:33:36 +08:00
korelstar
83c841a1eb fix synchronization (push local changes) 2020-05-10 22:29:40 +02:00
Stefan Niedermann
f3c49094a9 #174 Allow to share into exiting note 2020-05-09 20:41:29 +02:00
Isc
35fafaf557 Remove useless group by and order by in NotesDatabase.java 2020-05-09 16:26:37 +08:00
Isc
5854b90877 Clean up NotesDatabase 2020-05-09 14:05:00 +08:00
Peter S
9107c54058 fulfill all tests to reach full coverage for modified methods 2020-05-08 23:10:21 +08:00
Stefan Niedermann
cefb6a9df2 Fix Pull 2 Refresh in Preview (outdated note) 2020-05-08 11:40:05 +02:00
Hui-Ouyang16
6415e8d220 add coverage enable for testing coverages 2020-05-08 03:38:34 +08:00
Peter S
68c565a0c6 update test_12_getCategoryIdByTitle 2020-05-08 03:30:14 +08:00
Isaac_Chen
855ea87836 Update test_12_getCategoryIdByTitle() 2020-05-08 03:14:51 +08:00
Peter S
9d7566be2a minor update 2020-05-08 02:54:28 +08:00
Peter S
15e9ff36f1 Merge branch 'master' of https://github.com/Isaac-Graham/nextcloud-notes 2020-05-08 02:36:24 +08:00
Peter S
4e777bff70 clean up useless tests, add new tests for changes 2020-05-08 02:34:09 +08:00
Isaac_Chen
53b9f2df1a 1) update searchCategories for maintain; 2) Remove useless paramter 'create' in getCategoryIdByTitle; 2020-05-08 02:28:21 +08:00
Peter S
5f655d608a Add one more test to reach full coverage for the test method 2020-05-08 01:28:51 +08:00
Isaac_Chen
fc32639f8b Prevent too many SQL query in database when getting notes 2020-05-08 00:57:57 +08:00
Isaac_Chen
4dccc3eee0 Rename column account id in table category as category_account_id 2020-05-07 23:55:05 +08:00
Isaac_Chen
c6fedb1c5c Change Id of table category to category_id and titole to category_title 2020-05-07 23:31:26 +08:00
Isaac_Chen
9aba743b3c Remove empty categories 2020-05-07 22:53:26 +08:00
Isaac_Chen
46fa52a9a7 1) Use subquery in searchNotes(long, CharSequence, String, Boolean); 2) Remove comments with old codes; 3) Merge getCategories(long) and searchCategories(long, String); 4) Abandon recursion in getCategoryIdByTitle(long, String, boolean) 2020-05-07 22:14:04 +08:00
Nextcloud bot
463dee551e [tx-robot] updated from transifex 2020-05-06 20:26:38 +02:00
Isaac_Chen
313b13d5c4 Add some comments for previous pr 2020-05-07 01:31:08 +08:00
Isaac_Chen
e02bd35309 Final check about normalization 2020-05-07 01:27:03 +08:00
Isaac_Chen
4f01955c60 Bug fixed: Wrong result in sub-category 2020-05-06 20:10:37 +08:00
Isaac_Chen
6889989c3e Merge branch 'master' of https://github.com/Isaac-Graham/nextcloud-notes 2020-05-06 14:44:37 +08:00
Peter S
98d7187d55 Remove invalid tests 2020-05-06 14:38:42 +08:00