389 Commits

Author	SHA1	Message	Date
HissPirat	d9b434248c	Merge branch 'develop' of https://github.com/kiwix/kiwix-android into feature/one-activity	2020-08-25 15:14:18 +02:00
HissPirat	8465f3a796	Merge branch 'feature/one-activity' of https://github.com/kiwix/kiwix-android into feature/Frans-Lukas/2319-search-to-fragment	2020-08-25 15:13:56 +02:00
HissPirat	c80cdd4810	Merge branch 'develop' of https://github.com/kiwix/kiwix-android into feature/one-activity	2020-08-25 13:35:24 +02:00
HissPirat	f1f0831732	Merge branch 'develop' of https://github.com/kiwix/kiwix-android into feature/Frans-Lukas/2288-restore-custom-tabs	2020-08-24 15:42:37 +02:00
Seán Mac Gillicuddy	3f2fe41e61	Merge pull request #2325 from kiwix/revert-2201-refactor_to_kt ... Revert "chore: Converted SharedPreferencesUtil class to Kotlin"	2020-08-24 12:18:03 +01:00
Seán Mac Gillicuddy	885d600fa3	Revert "chore: Converted SharedPreferencesUtil class to Kotlin"	2020-08-24 11:57:35 +01:00
HissPirat	ca8362f8b3	#2319 search is popped after item opening	2020-08-23 11:39:48 +02:00
translatewiki.net	92b9189bbb	Localisation updates from https://translatewiki.net.	2020-08-21 17:23:54 +02:00
HissPirat	8426c2d92b	#2319 merge with one-activity	2020-08-21 14:38:34 +02:00
HissPirat	88b65384fb	merge with develop	2020-08-21 14:32:04 +02:00
HissPirat	d1ff09c6da	#2319 opening search item works	2020-08-21 14:10:44 +02:00
HissPirat	a2cb85dea1	#2288 merge with develop	2020-08-21 12:26:38 +02:00
HissPirat	6e41a33a9a	#2319 initial half-working activity->fragment	2020-08-21 10:54:44 +02:00
Seán Mac Gillicuddy	5513c0f865	Merge pull request #2313 from kiwix/feature/Frans-Lukas/2301-fix-rate-dialog ... Feature/frans lukas/2301 fix rate dialog	2020-08-21 09:41:38 +01:00
HissPirat	05066f3063	merge with develop	2020-08-21 09:58:53 +02:00
HissPirat	a915362e53	#2301 move rate dialog handling to class and created dialog package	2020-08-20 14:19:52 +02:00
Seán Mac Gillicuddy	1e53829688	Merge pull request #2284 from kiwix/feature/abdulwd/2260-minSdk-lollipop ... Stop supporting android versions less than Lollipop	2020-08-20 11:58:08 +01:00
HissPirat	c95cc583a5	#2301 moved rate dialog counting to core main	2020-08-20 12:45:17 +02:00
HissPirat	6e2b00b707	#2288 moved some tab restoration to core	2020-08-19 14:50:17 +02:00
Abdul Wadood	214cb18ac0	Remove more obsolete version checks	2020-08-19 16:31:23 +05:30
Abdul Wadood	8cbbdb266b	Fix html tag in credits.html	2020-08-19 16:30:53 +05:30
HissPirat	f375151677	#2288 moved tab restoration to core	2020-08-19 12:16:41 +02:00
s-ayush2903	fbcdd34abb	Resolve Conflicts	2020-08-19 15:41:33 +05:30
HissPirat	52dc221941	#2288 base class moving WIP	2020-08-19 11:51:14 +02:00
HissPirat	a31ad95765	#2272 merge with one-activity	2020-08-18 13:24:45 +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
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	20fa541639	#2253 small refactor that might have been done in some other branch..	2020-08-17 14:10:40 +02:00
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	8e3f3eece9	#2288 fixed tab restoration	2020-08-17 11:07:18 +02:00
HissPirat	43a9539021	#2251 merge with one-activity	2020-08-17 09:45:42 +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
translatewiki.net	a4308b9329	Localisation updates from https://translatewiki.net.	2020-08-13 19:18:14 +02:00
Frans-Lukas	4e23f1b605	#2241 moved settings navigation to core	2020-08-12 11:31:20 +02:00
Frans-Lukas	a34ea936be	#2251 zim host pending intent now uses navigation deep link	2020-08-12 09:53:18 +02:00
Frans-Lukas	1e9188cea0	#2272 removed onPostCreate from CoreMainActivity	2020-08-11 14:54:16 +02:00
Frans-Lukas	06db90c55e	#2112 fixed drawer hiding on any navigation except top level	2020-08-10 23:24:58 +02:00
HissPirat	ecab0e84a0	#2272 intro converted to fragment	2020-08-07 15:18:25 +02:00
HissPirat	a742503635	#2241 merge with 2238	2020-08-06 15:28:02 +02:00