4553 Commits

Author SHA1 Message Date
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
HissPirat
0d932a4879 #2147 removed CustomNewNavigationActivity 2020-06-19 11:17:19 +02:00
HissPirat
d927533de7 #2147 main activites are now shells and experimental naviagation menu is gone in custom fragment 2020-06-19 11:15:01 +02:00
HissPirat
5b8da21b0b #2124 added show toast test for deleting bookmarks 2020-06-19 09:52:56 +02:00
HissPirat
d0a2631115 #2124 removed page activity and fixed tests 2020-06-19 09:46:00 +02:00
Seán Mac Gillicuddy
fdbeb9ddaf
Merge pull request #2150 from kiwix/macgills/feature/2149-ndk-version
#2149 Fix NDK version
2020-06-18 16:08:08 +01:00
Sean Mac Gillicuddy
d5b97dbb84 #2149 Fix NDK version - bump version 2020-06-18 15:56:10 +01:00
HissPirat
550d7896e1 #2124 fixed deletebookmarkitems toast 2020-06-18 15:50:16 +02:00
HissPirat
f524789b99 #2147 sharepreferenceutil is now injected at each activity/fragment separately 2020-06-18 15:24:08 +02:00
HissPirat
38cfa176c1 #2147 fragment activity now works when clicking experimental navigation 2020-06-18 14:58:37 +02:00
HissPirat
5cf93d08cd #2147 added fragments and layouts 2020-06-18 13:22:48 +02:00
HissPirat
669502e5fd #2124 merge with develop 2020-06-18 11:26:39 +02:00
HissPirat
2e4f5d53e8 #2124 added pageActivity 2020-06-18 11:19:52 +02:00
HissPirat
b71feac3aa #2124 updated getBookmarks to not use current book bool 2020-06-18 09:28:53 +02:00
HissPirat
7676c959e5 #2124 added order by bookmark title to bookmarks dao 2020-06-18 09:27:43 +02:00
HissPirat
e8e9e590d5 #2124 update path in core androidManifest.xml 2020-06-18 09:27:14 +02:00
Sean Mac Gillicuddy
a2fbbc6502 Bump version 2020-06-17 17:18:33 +01:00
Seán Mac Gillicuddy
faf751d129
Merge pull request #2142 from kiwix/macgill/feature/2128-upgrade-agp-to-4.0.0
#2128 Upgrade Android Gradle Plugin to 4.0
2020-06-17 16:03:59 +01:00
HissPirat
09fd563bd1 #2124 fixed history and bookmark tests after inheriting page 2020-06-17 11:18:35 +02:00
HissPirat
b00150e546 #2124 added the manifest changes (history & bookmark -> page/history & page/bookmark) 2020-06-17 11:04:53 +02:00
HissPirat
ac790bbae4 #2124 moved history and bookmarks to page and merged actions and an effect 2020-06-17 11:02:50 +02:00
HissPirat
eebc18279a #2124 fixed requested issues 2020-06-17 09:20:34 +02:00
Sean Mac Gillicuddy
407dea0511 Merge remote-tracking branch 'origin/develop' into macgill/feature/2128-upgrade-agp-to-4.0.0 2020-06-16 16:23:15 +01:00
Seán Mac Gillicuddy
b26b24d1a6
Merge pull request #2145 from kiwix/translatewiki
Localisation updates from https://translatewiki.net.
2020-06-16 16:22:54 +01:00
Sean Mac Gillicuddy
5d9b6cb97e Merge remote-tracking branch 'origin/develop' into translatewiki
# Conflicts:
#	core/src/test/java/org/kiwix/kiwixmobile/core/StorageObserverTest.kt
2020-06-16 16:05:03 +01:00
Seán Mac Gillicuddy
49e00b0d55
Merge pull request #2135 from kiwix/macgills/feature/2026-legacy-content-prefix
#2026 Migrate Zim prefix away from "content://"
2020-06-16 16:04:13 +01:00
Sean Mac Gillicuddy
59d8ea5c17 fix test 2020-06-16 15:52:29 +01:00
Sean Mac Gillicuddy
c781c25353 fix errors 2020-06-16 15:24:25 +01:00
HissPirat
07eed7b4cd #2124 fixed unecessary paranthesis 2020-06-16 12:01:57 +02:00
HissPirat
205e411500 #2124 updated bookmark tests 2020-06-16 11:58:49 +02:00
HissPirat
c1df7ccd04 #2124 copy behaviour of history to bookmarks 2020-06-16 11:33:25 +02:00
HissPirat
fd7a24294c #2124 merge with develop 2020-06-16 10:57:09 +02:00
translatewiki.net
e5d182ed67 Localisation updates from https://translatewiki.net. 2020-06-15 22:15:02 +02:00
Seán Mac Gillicuddy
d5d1914b73
Merge pull request #2120 from Frans-Lukas/2119-fix-history-architecture
2119 fix history architecture
2020-06-15 16:46:26 +01:00
Sean Mac Gillicuddy
1dbe7c70d9 #2026 Migrate Zim prefix away from "content://" - remove unnecessary mocking 2020-06-15 16:32:50 +01:00
Sean Mac Gillicuddy
ff0e1c6190 Merge remote-tracking branch 'origin/develop' into macgills/feature/2026-legacy-content-prefix
# Conflicts:
#	core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
#	core/src/test/java/org/kiwix/kiwixmobile/core/StorageObserverTest.kt
2020-06-15 16:27:12 +01:00
Seán Mac Gillicuddy
f9b2f87aa0
Merge pull request #2141 from kiwix/macgills/feature/2105-base-activity-crash
#2105 Crash Report 3.3.1: java.lang.IllegalStateException BaseActivity.onCreate
2020-06-15 16:16:03 +01:00
Seán Mac Gillicuddy
a90ec53983
Merge pull request #2140 from kiwix/macgills/feature/2106-error-activity-crash
#2106 Crash Report 3.3.1: java.lang.ClassNotFoundException ErrorActivity.onCreate
2020-06-15 16:15:31 +01:00
Seán Mac Gillicuddy
7967d9be23
Merge pull request #2116 from kiwix/macgills/26-inconsistent-search-results
#26 Search problem - some results disappear as typing advances
2020-06-15 16:14:44 +01:00
Sean Mac Gillicuddy
c59d79755f Merge branch 'develop' into 2119-fix-history-architecture
# Conflicts:
#	core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.java
2020-06-12 15:25:25 +01:00
Sean Mac Gillicuddy
c0a1e6a51f #2128 Upgrade Android Gradle Plugin to 4.0 - bump ndk 2020-06-12 14:37:05 +01:00
Sean Mac Gillicuddy
2aa7e769cd #2105 Crash Report 3.3.1: java.lang.IllegalStateException BaseActivity.onCreate - fix unit tests 2020-06-12 14:27:42 +01:00
Seán Mac Gillicuddy
5e1f2d6e8f
Update core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivity.java
Co-authored-by: Abdul Wadood <abdulwd97@gmail.com>
2020-06-12 14:20:26 +01:00
Seán Mac Gillicuddy
0aa98c7f49
Merge pull request #2138 from kiwix/macgills/feature/2108-select-tab-crash
#2108 Crash Report 3.3.1: java.lang.ArrayIndexOutOfBoundsException CoreMainActivity.selectTab
2020-06-12 14:06:53 +01:00