kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 03:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,359 Commits 70 Branches 45 Tags
Commit Graph

2359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
macgills
55aa28e7d2
Merge pull request #1192 from kiwix/macgills/2.5-mergeable-to-dev 
Merge 2.5 to dev
 2019-06-20 09:55:30 +01:00
Aditya-Sood
ffba82e0c7 Refactor: Extract the display of all toasts (related to AddNoteDialog) to a common method showToast() 2019-06-20 13:27:47 +05:30
Sean Mac Gillicuddy
5431afa1f7 Merge branch 'release' into macgills/2.5-mergeable-to-dev 
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java
#	app/src/main/res/xml/network_security_config.xml
 2019-06-19 11:55:07 +01:00
macgills
7da84c0b90
Merge pull request #1204 from kiwix/macgills/hotfix/use-http 
- Use http instead of https - Increase read timeout - bump abi codes …
2.5.1 		2019-06-19 09:34:02 +01:00
Sean Mac Gillicuddy
e680155430 - add network security config from master 2019-06-18 13:05:08 +01:00
Sean Mac Gillicuddy
f7b263280b - Use http instead of https - Increase read timeout - bump abi codes to remove shadowing complaint - increase version to 2.5.1 2019-06-18 12:39:03 +01:00
macgills
d91e500897
Merge pull request #1194 from kiwix/macgills/#1193-migrate-db 
Macgills/#1193 migrate db
 2019-06-18 10:05:53 +01:00
Sean Mac Gillicuddy
6f0eecf79b #1193 fix null pointer in test 2019-06-17 17:43:15 +01:00
Sean Mac Gillicuddy
0099e45dfd #1193 fix tests and ignore broken one 2019-06-17 17:09:11 +01:00
Sean Mac Gillicuddy
d9b45ddeaa #1193 correct migration of zimId 2019-06-17 16:57:31 +01:00
Sean Mac Gillicuddy
22b651a79e Merge branch 'macgills/2.5-mergeable-to-dev' into macgills/#1193-migrate-db 2019-06-17 16:06:26 +01:00
Sean Mac Gillicuddy
51aa3a4939 - Readd deleted depndency - fix import 2019-06-17 15:42:34 +01:00
Sean Mac Gillicuddy
08099255ee fix lint errors 2019-06-17 15:34:49 +01:00
Sean Mac Gillicuddy
d88b39eec9 Merge branch 'release' into macgills/2.5-mergeable-to-dev 
# Conflicts:
#	.travis.yml
 2019-06-17 15:16:06 +01:00
Sean Mac Gillicuddy
09ba7a34a5 tidy up dependencies 2019-06-17 15:12:47 +01:00
Sean Mac Gillicuddy
dc6b1ff63c Merge branch 'develop' into macgills/2.5-mergeable-to-dev 2019-06-17 14:54:57 +01:00
Sean Mac Gillicuddy
d10c2e3b60 - increase numbering for abi splits to resolve error on play store 2.5.0 2019-06-17 12:25:41 +01:00
Sean Mac Gillicuddy
f35c2e44f4 -attempt draft release - remove branchname as tags do not build on a branch 2019-06-17 11:39:42 +01:00
Sean Mac Gillicuddy
4924eea71c -build release variant so apks can be uploaded to github releases - playstore does not accept universal apks for abi splits that have a total mapping for the available code, deactivate 2019-06-17 09:44:35 +01:00
Aditya-Sood
891cb950ca Refactor: Use ButterKnife to initialise views in AddNoteDialog 2019-06-16 21:49:12 +05:30
Aditya-Sood
11d3e8dea3 Refactor: Use injection (Dagger) for SharedPreferenceUtil in AddNoteDialog 2019-06-16 19:22:13 +05:30
Aditya-Sood
873eb2bce8 Refactor: Refer comments by @macgills in PR #1198 2019-06-15 23:02:56 +05:30
Sean Mac Gillicuddy
d2726c80b9 set play publisher to be enabled because branchname is unreliable on travis 2019-06-14 16:44:33 +01:00
Sean Mac Gillicuddy
d4363ae951 disable body of github release, broken on travis 2019-06-14 16:32:37 +01:00
Sean Mac Gillicuddy
14df2a1dbd update deployment to be on any tag 2019-06-14 15:45:40 +01:00
macgills
5fd479c9fb
Merge pull request #1185 from kiwix/macgills/2.5-kotlin 
2.5
 2019-06-14 14:56:26 +01:00
macgills
1a37cb0f09
Merge pull request #1199 from kiwix/macgills/2.5-contribution-update 
Update CONTRIBUTING.md
 2019-06-14 13:27:33 +01:00
Kelson
92cf08c233 Remove SquiDB from README.md 2019-06-14 13:53:49 +02:00
Kelson
a24818ff9a Light reformatting of CONTRIBUTING.md 2019-06-14 13:52:12 +02:00
Sean Mac Gillicuddy
54eed3fc9c Merge branch 'macgills/2.5-kotlin' into macgills/2.5-mergeable-to-dev 
# Conflicts:
#	.travis.yml
#	app/build.gradle
#	app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/di/components/TestComponent.java
#	app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/di/modules/TestJNIModule.java
#	app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/DownloadTest.java
#	app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java
#	app/src/main/AndroidManifest.xml
#	build.gradle
 2019-06-14 12:14:19 +01:00
Sean Mac Gillicuddy
3ddebc3096 Update CONTRIBUTING.md 2019-06-14 11:06:29 +01:00
macgills
45295e5455
Merge pull request #1176 from kiwix/macgills/2.5-coverage 
#1175 automate code coverage
 2019-06-14 09:15:56 +01:00
Aditya-Sood
c4bd6a8ee3 Increment: Use ConstraintLayout instead of LinearLayout as root view of AddNoteDialog 2019-06-14 00:04:36 +05:30
Sean Mac Gillicuddy
38020ed874 #1175 Use new lib with v7a support, re-enable emulator for instrumented tests 2019-06-13 13:58:06 +01:00
Aditya-Sood
c79aa8a9f9 Increment: Confirmation dialog before deleting all notes + Documentation 
The 'Clear All Notes' option in the menu now shows a confirmation dialog for deleting all notes. Also added documentation for the feature.
 2019-06-12 22:17:50 +05:30
Aditya-Sood
7ff8b67263 Increment: Feature to clear all notes 
Option to delete all notes and the folder itself from storage. Added in the menu options of MainActivity
 2019-06-10 21:42:25 +05:30
soloturn
d4d9af2975 update androidx.test to 1.2.0, androidx.test.ext:junit to 1.1.1 2019-06-09 22:56:16 +02:00
Sean Mac Gillicuddy
24cc545eb0 #1193 fully replace RecentSearchesDao with objectbox version 2019-06-07 16:47:13 +01:00
Sean Mac Gillicuddy
f86720256f #1193 fully replace BookmarksDao with objectbox version 2019-06-07 16:11:31 +01:00
Aditya-Sood
b2df5b3d28 Bug fix: Added response to pressing Back button in AddNoteDialog 
In case of an edited note the 'Discard unsaved changes' dialog is displayed for the Back button (same response as is for the cross (X) on top of the dialog)
 2019-06-07 19:42:36 +05:30
Aditya-Sood
a7f48d5168 Corrected string resource value for android:hint 
In the AddNoteDialog, use the correct value ("Wiki Article Title") instead of "Wiki Book Title" as the android:hint for the note heading
 2019-06-07 19:42:36 +05:30
Aditya-Sood
4586530be8 Removed commented code 2019-06-07 19:42:36 +05:30
Aditya-Sood
42909cac3a Remove non-essential files (NoteKeeper.txt, abstract.txt) 2019-06-07 19:41:39 +05:30
Aditya-Sood
c540519332 Minor UI adjustment 
Corrected overcrowding in the action bar of MainActivity
 2019-06-07 19:41:39 +05:30
Aditya-Sood
3bba631bc6 Refactor AddNoteDialog.java 
ConfirmationAlert dialog now shows 'Cancel' as the neutral action button instead of the negative action button
 2019-06-07 19:41:39 +05:30
Aditya-Sood
b1949b39d7 Documentaion & code clean-up: AddNoteDialog.java 2019-06-07 19:41:39 +05:30
Aditya-Sood
5f2716dcbf Update NoteKeeper.txt 2019-06-07 19:41:39 +05:30
Aditya-Sood
02087b0986 Documentaion & code clean-up: MainActivity.java 2019-06-07 19:41:39 +05:30
Aditya-Sood
4c18fddcb9 Increment: Added support for Night Mode 2019-06-07 19:41:39 +05:30
Aditya-Sood
c5b94b5f22 Minor UI improvement 2019-06-07 19:41:39 +05:30