Commit graph

1726 commits

Author SHA1 Message Date
Stefan Niedermann
4fab5c43e5 Merge branch 'master' into branding 2020-06-04 17:33:52 +02:00
Stefan Niedermann
c872320b9b Fix Android instrumented tests 2020-06-04 16:23:22 +02:00
Stefan Niedermann
59971eeb28 Merge branch 'master' into api-v1 2020-06-04 16:21:34 +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
Stefan Niedermann
0aa81abd48 Merge branch 'master' into api-v1 2020-06-04 15:55:19 +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
ddb9b9ae9f Adjust excerpt generation 2020-06-04 15:49:29 +02:00
Stefan Niedermann
b9ccfd41ea Keep an empty note if the title has been set manually 2020-06-04 11:46:45 +02:00
Stefan Niedermann
49a0e09a68 Nullcheck for InputMethodManager 2020-06-04 11:24:17 +02:00
Stefan Niedermann
17d3095a03 Generate note title from content only when note has not yet been synchronized (aka "new" notes) 2020-06-04 11:22:38 +02:00
Stefan Niedermann
8faacf4e04 Merge branch 'master' into api-v1
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
#	app/src/main/res/values/strings.xml
2020-06-04 10:38:25 +02:00
Stefan Niedermann
0ac1ee7d3d Adjust selection handles 2020-06-03 18:31:16 +02:00
Stefan Niedermann
2fb0edc853 Update changelog 2020-06-03 13:07:11 +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