4483 Commits

Author SHA1 Message Date
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
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
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
fae7c69f80 #2154 merge 2020-06-30 14:58:25 +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
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
0afc160179 #2154 removed variable from dialogs 2020-06-29 10:25:16 +02:00
HissPirat
1e7de12484 #2098 updated history and bookmark tests 2020-06-29 09:53:48 +02:00
HissPirat
a92ecdde66 Merge branch '2098-change-wording-when-deleting-selected-items-vs-all-items' of https://github.com/Frans-Lukas/kiwix-android into 2098-change-wording-when-deleting-selected-items-vs-all-items 2020-06-29 09:36:04 +02:00
HissPirat
f1dc6ece37 #2098 removed variable dialog type for history and bookmarks dialog 2020-06-29 09:33:56 +02:00
HissPirat
b47bdffd10 #2154 PageActivity sets correct title 2020-06-26 17:28:10 +02:00
HissPirat
9fb075c9be #2154 made bookmarks lazy 2020-06-26 17:24:33 +02:00
HissPirat
149b3afe37 #2154 History and Bookmarks now implements PageActivity 2020-06-26 17:18:54 +02:00
Seán Mac Gillicuddy
0ebbdf5bf8
Merge pull request #2148 from Frans-Lukas/2147-custom-as-fragment
2147 custom activity uses experimental navigation menu and fragment
2020-06-26 16:09:49 +01:00
HissPirat
376b7a18e0 #2154 implemented PageViewModel in HistoryViewModel 2020-06-26 16:12:39 +02:00
HissPirat
8b9b88796a #2154 added and implemented PageViewModel to BookmarkViewModel 2020-06-26 15:46:38 +02:00
HissPirat
ecb780bb36 #2154 generified adapter 2020-06-26 14:46:14 +02:00
Frans-Lukas
453b6fe67e #2098 added tests for dialog options when deleting bookmarks/history items 2020-06-26 13:45:41 +02:00
Frans-Lukas
103d86594a #2098 added clear selected bookmarks toast and test 2020-06-26 13:26:01 +02:00
Frans-Lukas
f946310285 Merge branch 'develop' of https://github.com/kiwix/kiwix-android into 2098-change-wording-when-deleting-selected-items-vs-all-items 2020-06-26 13:16:32 +02:00
HissPirat
d0c233e015 #2147 added safelyGetWebView which was accidentaly removed in previous commit 2020-06-26 09:33:08 +02:00
HissPirat
0765b8a24e #2147 fixed so that instrumentation test should work 2020-06-25 11:30:06 +02:00
HissPirat
3fa74b8f77 #2147 fixed progressbar 2020-06-25 10:25:19 +02:00
Seán Mac Gillicuddy
e547b87878
Merge pull request #2162 from Frans-Lukas/2161-bookmark-history-bug
#2161 moved isChecked to above where the onCheckedListener is set for…
2020-06-24 16:07:44 +01:00
Seán Mac Gillicuddy
d301e0b569
Merge pull request #2158 from s-ayush2903/refactor_to_kt
chore: converted KiwixWifiP2pBroadcastReceiver class to kotlin
2020-06-24 15:35:43 +01:00
HissPirat
0825eaa9b5 #2161 moved isChecked to above where the onCheckedListener is set for bookmarks and history activity. 2020-06-24 16:06:43 +02:00
HissPirat
eea7e4013e #2098 updated delete history and bookmarks dialog strings 2020-06-24 15:56:39 +02:00
HissPirat
34cbaa1447 #2147 made BaseFragmentActivityExtensions default to return ShouldCall 2020-06-24 10:43:41 +02:00
HissPirat
d51575b056 #2147 moved duplicated methods to CoreMainActivity 2020-06-24 10:31:55 +02:00
HissPirat
dd9c3f07de #2147 custom can now exit the app on back press from the main page 2020-06-24 10:27:12 +02:00
HissPirat
fe061b1cec #2147 converted CoreNewNavigationActivity/NewNavigationActivity to kotlin 2020-06-24 10:02:12 +02:00
HissPirat
2cef6ed578 #2147 converted CoreMainActivity to kotlin 2020-06-24 09:57:31 +02:00
HissPirat
3d43ad151b #2147 renamed KiwixMainFragment -> KiwixReaderFragment and removed (FRAGMENT) title string 2020-06-24 09:47:23 +02:00
HissPirat
e0c3ec6186 #2147 newNavigation menu is now hidden if debug is on 2020-06-24 09:38:18 +02:00
s-ayush2903
824ee0868f
Reverted useless logging 2020-06-24 02:25:28 +05:30
HissPirat
d3a760ee81 #2147 lint and baseline fixes 2020-06-23 10:41:12 +02:00
s-ayush2903
9273e3146b
linted file 2020-06-22 23:08:39 +05:30
HissPirat
f5d98948ff #2147 merge with develop 2020-06-22 10:00:07 +02:00
HissPirat
0e9071423e #2147 added WebViewProvider interface and implementations 2020-06-22 09:48:59 +02:00
s-ayush2903
a1e9967771
fix #2155 converted KiwixWifiP2pBroadcastReceiver class to kotlin 2020-06-21 21:14:18 +05:30
Seán Mac Gillicuddy
1912597e04
Merge pull request #2125 from Frans-Lukas/2124-rewrite-bookmarks-activity
2124 rewrite bookmarks activity
2020-06-19 15:19:29 +01:00
HissPirat
72c1046b65 Merge branch 'develop' of https://github.com/kiwix/kiwix-android into 2147-custom-as-fragment 2020-06-19 11:32:45 +02:00
HissPirat
f76393e090 #2147 made kiwixMainActivity use fragment 2020-06-19 11:32:28 +02:00