1881 Commits

Author SHA1 Message Date
Brian Cherin
69d76cdb36 #1648 merge with upstream 2020-07-02 22:19:56 -04:00
Brian Cherin
21c8c9ae2c #1648 Fix search layout overflow and button style 2020-07-02 22:06:03 -04:00
Frans-Lukas
252e8c6740 #2179 back button now exits app if on last page instead of closing book 2020-07-02 15:09:11 +02:00
Frans-Lukas
b522af1b69 #2179 fixed back press exiting if no book is open 2020-07-02 14:38:57 +02:00
Frans-Lukas
8f42078278 #2179 closing of book in reader now works 2020-07-02 14:20:56 +02:00
Sean Mac Gillicuddy
91b09bda92 Merge remote-tracking branch 'origin/develop' into release/3.3.2 2020-07-02 11:40:43 +01:00
Sean Mac Gillicuddy
3a5cc5c2ec update objectbox schema 2020-07-02 10:58:54 +01:00
Frans-Lukas
22dd635c85 #2179 working on when reader should not have a book open 2020-07-02 11:16:01 +02:00
Frans-Lukas
66c77b0c59 Merge branch 'develop' of https://github.com/kiwix/kiwix-android into 2111-contrib-style-guide 2020-07-02 10:23:32 +02:00
Frans-Lukas
bbb566622c #2154 merge with dev 2020-07-02 10:15:11 +02:00
Frans-Lukas
b145267ca8 #2154 moved init to function in pageviewmodel 2020-07-02 09:18:00 +02:00
Frans-Lukas
ad3d79a2ad #2154 moved numberOfSelectedItems to page state and made it a function 2020-07-02 09:10:05 +02:00
Frans-Lukas
c57b9c9f3b #2154 lots of rewrite between viewmodels, working now but should be possible to improve 2020-07-01 21:40:07 +02:00
Frans-Lukas
37418efb53 #2154 more merging of viewmodels bookmark and history 2020-07-01 20:01:24 +02:00
Frans-Lukas
8679e390f2 #2154 moved state initialization to function 2020-07-01 17:03:44 +02:00
Frans-Lukas
e2c901bf22 #2154 merged history and book delegate and view holders 2020-07-01 16:53:10 +02:00
Frans-Lukas
76a427bcd6 #2111 updated comments in themes.xml 2020-07-01 15:55:15 +02:00
HissPirat
f13b9235f2 #2179 updated string resource 2020-07-01 14:11:26 +02:00
HissPirat
f5281a49a3 #2179 restore tab works if all tabs are closed 2020-07-01 13:38:04 +02:00
Sean Mac Gillicuddy
e6f195c706 secure mainMenu acces is null safe 2020-07-01 10:15:10 +01:00
Sean Mac Gillicuddy
726679a112 bump library versions 2020-07-01 10:08:25 +01:00
HissPirat
72abffc43e #2179 home page is effectively removed 2020-07-01 10:54:52 +02:00
HissPirat
bed288429d #2179 reader hides book specific menu items on close all tabs 2020-07-01 10:17:08 +02:00
Sean Mac Gillicuddy
8c6c471e9a safeguard against errors related to fragment conversion 2020-07-01 09:08:44 +01:00
HissPirat
c3f866aa5e #2179 all tabs are closed and no book open items are shown on tab clearing 2020-07-01 10:06:58 +02:00
HissPirat
470d39efe2 Merge branch 'develop' of https://github.com/kiwix/kiwix-android into 2179-remove-home-webview-library 2020-07-01 09:10:24 +02:00
HissPirat
756dde33f6 #2179 content view is now hidden when tabs are closed 2020-07-01 09:08:43 +02:00
Kelson
4b00a4c69e
Merge pull request #2172 from kiwix/feature/macgills/2157-remove-download-pause
#2157 Cannot resume download after pausing
2020-06-30 21:15:35 +02:00
HissPirat
ad26d9ffd8 #2154 generified history/bookmark page 2020-06-30 15:41:47 +02:00
HissPirat
fdd31f8d39 #2154 merged bookmarks and history activity 2020-06-30 15:32:16 +02:00
HissPirat
b8d267ee6a #2159 moved navigationview style to kiwix theme 2020-06-30 15:19:58 +02:00
HissPirat
954b24a08d #2154 missed bookmarks activity in last commit 2020-06-30 15:16:54 +02:00
HissPirat
1806f15851 #2154 made bookmarks and history use same layout, WIP 2020-06-30 15:16:00 +02:00
HissPirat
cbfa81bf23 #2159 changed name of bottom navigation view style 2020-06-30 14:44:09 +02:00
HissPirat
3b630c6b43 #2159 moved setup to onActivityCreated instead of onCreateView 2020-06-30 13:45:55 +02:00
HissPirat
87bb722d7b #2159 getValidTitle checks that fragment has context 2020-06-30 12:01:09 +02:00
HissPirat
7c6fbe8d8f #2159 merge with develop 2020-06-30 10:46:12 +02:00
Seán Mac Gillicuddy
0bdf902beb
Merge pull request #2176 from kiwix/macgills/feature/2175-dispose-native-memory
#2175 ZimFileReaders not being disposed
2020-06-30 09:36:46 +01:00
Sean Mac Gillicuddy
348e030414 #2175 ZimFileReaders not being disposed - make file detection and searching dispose - remove fulltext search 2020-06-30 09:04:17 +01:00
HissPirat
6c693eb220 #2159 added text and button if no book is open in core reader fragment 2020-06-30 09:38:47 +02:00
Sean Mac Gillicuddy
1b29420e20 fix lint issues 2020-06-30 08:22:15 +01:00
Brian Cherin
303bf57df9 #1648 Use TextView instead of include for search item layout 2020-06-29 19:51:04 -04:00
translatewiki.net
e10e786669 Localisation updates from https://translatewiki.net. 2020-06-29 16:22:51 +02:00
HissPirat
eae54f69c5 #2154 tests are now working for bookmarks/history, also removed unecessary string resources 2020-06-29 15:06:13 +02:00
HissPirat
149efbed0a #2154 merge with develop 2020-06-29 14:26:40 +02:00
HissPirat
7af77cc274 #2154 moved delete history/bookmark to delete pages 2020-06-29 14:20:59 +02:00
Sean Mac Gillicuddy
b62d5a0005 #2157 Cannot resume download after pausing - remove pause button in notification 2020-06-29 12:45:25 +01:00
Seán Mac Gillicuddy
64b46a3c87
Merge pull request #2165 from Frans-Lukas/2098-change-wording-when-deleting-selected-items-vs-all-items
2098 change wording when deleting selected items vs all items
2020-06-29 10:47:25 +01:00
HissPirat
4308f29482 Merge branch 'develop' of https://github.com/kiwix/kiwix-android into 2159-add-navigation 2020-06-29 11:02:21 +02:00
HissPirat
8ca1405927 #2111 merge with upstream 2020-06-29 10:30:31 +02:00