5716 Commits

Author SHA1 Message Date
HissPirat
a31ad95765 #2272 merge with one-activity 2020-08-18 13:24:45 +02:00
HissPirat
6bd7421c0c #2278 merge with one-activity 2020-08-18 13:19:54 +02:00
s-ayush2903
e91ba8a0e2
Fix Static Anal. 2020-08-18 16:04:19 +05:30
Seán Mac Gillicuddy
55994a558f
Merge pull request #2252 from kiwix/feature/Frans-Lukas/2251-zimhost-to-fragment
Feature/frans lukas/2251 zimhost to fragment
2020-08-18 11:33:27 +01:00
s-ayush2903
789fd835d0
Getter and backing for textZoom 2020-08-18 15:59:33 +05:30
s-ayush2903
ce3ba7590a
Use real time context in constructor and for instances 2020-08-18 15:48:43 +05:30
s-ayush2903
c17039d364
Add missing comment 2020-08-18 15:42:59 +05:30
s-ayush2903
a1f79410b5
Used getter 2020-08-18 15:37:51 +05:30
HissPirat
e356b3fd65 #2278 merge with one-activity 2020-08-18 11:59:52 +02:00
HissPirat
62097bb602 #2251 merge with one-activity 2020-08-18 11:56:05 +02:00
HissPirat
9bc40a4379 #2272 merge with one-activity 2020-08-18 11:53:05 +02:00
Frans-Lukas Lövenvald
5a25952063
Merge pull request #2255 from kiwix/feature/Frans-Lukas/2253-help-to-fragment
#2253 converted help to fragment
2020-08-18 11:50:29 +02:00
s-ayush2903
e0d06d03be
Back the prefStorages field up 2020-08-18 15:19:08 +05:30
HissPirat
d60d85cde4 #2251 fixed unit tests 2020-08-18 11:42:03 +02:00
HissPirat
97abea0cb3 #2272 fixed navigation to intro 2020-08-18 11:29:45 +02:00
HissPirat
4e2a7731b3 #2253 merge with one-activity 2020-08-18 11:22:58 +02:00
HissPirat
8b7dea11eb #2251 merge with one-activity 2020-08-18 11:08:44 +02:00
HissPirat
4f9078b6be #2272 merge with one-activity 2020-08-18 10:41:24 +02:00
Seán Mac Gillicuddy
e64417a49f
Merge pull request #2247 from kiwix/feature/Frans-Lukas/2241-settings-to-fragment
Feature/frans lukas/2241 settings to fragment
2020-08-18 09:39:09 +01:00
HissPirat
bf3682a8e0 #2272 fixed unit tests 2020-08-18 10:33:52 +02:00
HissPirat
47b72e61bc #2272 fixed IntroFragmentTest not running on ui thread 2020-08-18 10:15:25 +02:00
HissPirat
4d9f5574e4 #2253 fixed unit tests 2020-08-17 15:30:34 +02:00
HissPirat
72cdec5655 #2278 fixed unit test 2020-08-17 15:10:34 +02:00
HissPirat
fe91e7cf92 #2272 potential fix of inst. tests 2020-08-17 14:56:19 +02:00
HissPirat
a40460cda7 #2278 fixed onOptionsItemsSelected function 2020-08-17 14:16:15 +02:00
HissPirat
20fa541639 #2253 small refactor that might have been done in some other branch.. 2020-08-17 14:10:40 +02:00
ritvik
a0ac045b9e solved synatax issues & toast issues 2020-08-17 17:37:47 +05:30
Frans-Lukas Lövenvald
ae1b53124f
Merge branch 'feature/one-activity' into feature/Frans-Lukas/2253-help-to-fragment 2020-08-17 14:05:38 +02:00
HissPirat
8df6ab6f03 #2278 fixed unit tests 2020-08-17 13:54:13 +02:00
HissPirat
6de0f65e42 Merge branch 'feature/one-activity' of https://github.com/kiwix/kiwix-android into feature/Frans-Lukas/2278-language-to-fragment 2020-08-17 13:52:58 +02:00
HissPirat
b2f0c6bfd9 #2253 fixed instrumentation tests 2020-08-17 13:48:38 +02:00
HissPirat
d631e86170 #2280 fixed unit test 2020-08-17 13:28:21 +02:00
ritvik
d2f2cd0de1 solved synatax issues 2020-08-17 15:33:33 +05:30
HissPirat
8e3f3eece9 #2288 fixed tab restoration 2020-08-17 11:07:18 +02:00
HissPirat
8f7402123d #2280 removed open from wifidirectmanager 2020-08-17 10:42:26 +02:00
HissPirat
4c8fe0f192 #2280 added intent to KiwixMainActivity for local file transfer 2020-08-17 10:25:29 +02:00
HissPirat
ed6480a25d #2280 added unbinder 2020-08-17 09:49:30 +02:00
HissPirat
43a9539021 #2251 merge with one-activity 2020-08-17 09:45:42 +02:00
HissPirat
06d48f343a #2251 fixed drawerToggle access 2020-08-17 09:40:35 +02:00
HissPirat
ce3738e333 #2278 slight clean up of onOptionsItemSelected 2020-08-17 09:17:51 +02:00
ritvik
cfe99fc760 solved toast issue 2020-08-16 23:29:59 +05:30
Frans-Lukas Lövenvald
6c5ceef31f
Merge pull request #2286 from s-ayush2903/crashFix/s-ayush2903/#2285-customApp-crashes-on-launch
Fix CustomApp crash on launch
2020-08-16 10:27:35 +02:00
Frans-Lukas
19c3f283ac #2271 merge with one-activity 2020-08-16 10:09:01 +02:00
Frans-Lukas
c58fcabaf5 #2272 added the launcher icon to custom 2020-08-16 09:48:33 +02:00
s-ayush2903
39975bd531
Fix Static Analysis 2020-08-16 13:10:39 +05:30
Ayush Shrivastava
9c77be5652
Merge branch 'feature/navigation' into crashFix/s-ayush2903/#2285-customApp-crashes-on-launch 2020-08-16 12:09:52 +05:30
Frans-Lukas
aef4efdf38 Merge branch 'develop' of https://github.com/kiwix/kiwix-android into feature/navigation 2020-08-16 08:22:10 +02:00
s-ayush2903
8885620d45
#2285 Fixed CustomApp crash on launch 2020-08-16 02:08:31 +05:30
s-ayush2903
ed560b37aa
Merge branch 'develop' of github.com:kiwix/kiwix-android into testing/s-ayush2903/#2269onDevelop 2020-08-16 01:27:51 +05:30
s-ayush2903
9b43945e23
Merge branch 'feature/navigation' of github.com:kiwix/kiwix-android into testing/s-ayush2903/#2269onDevelop 2020-08-16 01:27:30 +05:30