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

2453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Mac Gillicuddy
39a964bf42 #1238 aim for 100% coverage 2019-06-28 16:23:30 +01:00
Sean Mac Gillicuddy
5079df2469 #1238 just use plus 2019-06-28 15:02:49 +01:00
Sean Mac Gillicuddy
fd9f797105 #1238 Unit test FileSearch 2019-06-28 14:18:16 +01:00
Aditya-Sood
865b579057 Bug fix: Correct the usage of close icon 
MainActivity, AnimationUtils & tab_switcher.xml were using the "ic_close_white_24dp" (whose colouring was corrected in a previous commit of this branch from black to white, which caused the 'Close all tabs' button to appear completely white without any icons)
 2019-06-27 20:40:46 +05:30
Aditya-Sood
f568857952 Refactor & documentation 
- Refactor: AddNoteDialog
- Doucumentation: AddNoteDialog & ZimContentProvider
 2019-06-27 17:13:30 +05:30
Aditya-Sood
ea3490e048 Increment: Change path for storage of note files 
Code now uses ".../Kiwix/Notes/ZimFileName/ArticleUrl.txt" instead of ".../Notes/ZimFileTitle/ArticleTitle.txt" for storing notes

- Changed because multiple zim files can have the same ZimFileTitle, whereas ZimFileName is the actual name of the zim file (& hence unique).
- Chose ArticleUrl over ArticleTitle for greater stability (as article urls, being a core part of Kiwix, will always exist and hence are less likely to break the app)
 2019-06-27 16:50:52 +05:30
Isaac Hutt
0539d56849
Merge pull request #1198 from kiwix/feature/NoteKeeper 
GSoC 2019 Deliverable: Note Keeper
 2019-06-26 21:23:51 +01:00
Sean Mac Gillicuddy
65a28a2f66 #1214 upload universal apk to download.kiwix on nightly build and to Github Releases on a tagged release 2019-06-26 15:09:14 +01:00
Kelson
63599fa685
Merge pull request #1233 from kiwix/https 
Replace a few HTTP links with HTTPS
 2019-06-26 15:53:18 +02:00
Kelson
23347677d0 More links using HTTPS in README 2019-06-26 15:40:37 +02:00
Kelson
624dbe58ef
Merge pull request #1232 from kiwix/macgills/feature/fix-contributing-branching 
Escape angle brackets
 2019-06-26 13:03:47 +02:00
Sean Mac Gillicuddy
51d1729d51 Escape angle brackets 2019-06-26 11:27:43 +01:00
Sean Mac Gillicuddy
62d456ecc4 #1219 use the density from the output file 2019-06-26 10:42:45 +01:00
Sean Mac Gillicuddy
a1094285fb #1229 BuildTypes removed 2019-06-26 10:29:22 +01:00
Sean Mac Gillicuddy
b4e28323e5 Merge branch 'develop' into feature/macgills/#1219-density-splits 2019-06-26 09:34:45 +01:00
macgills
2481ead365
Merge pull request #1225 from kiwix/feature/macgills/#1224-fix-crash-reporting 
#1224 use correct fileProvider suffix
 2019-06-26 09:32:39 +01:00
Sean Mac Gillicuddy
5635a50920 #1224 remove extraneous dash in .travis.yml 2019-06-25 15:52:30 +01:00
Sean Mac Gillicuddy
afb62ba9f1 #1224 attempt to fix build 2019-06-25 15:16:59 +01:00
macgills
5274ba81c0
Merge pull request #1227 from kiwix/feature/macgills/#1226-stalebot 
#1226 create stalebot configuration
 2019-06-25 14:18:18 +01:00
Sean Mac Gillicuddy
c21703a4b3 #1226 create stalebot configuration 2019-06-25 13:25:32 +01:00
Aditya-Sood
87b389109b Merge branch 'feature/NoteKeeper' of https://github.com/kiwix/kiwix-android into feature/NoteKeeper 2019-06-25 16:57:37 +05:30
Aditya-Sood
993dd3f9d0 Correct merging error 2019-06-25 16:53:38 +05:30
Sean Mac Gillicuddy
4bf2d2a3f9 #1224 use correct fileProvider suffix 2019-06-25 11:18:46 +01:00
Aditya-Sood
aa64d91c1f Merge branch 'develop' into feature/NoteKeeper 2019-06-25 15:31:40 +05:30
Kelson
7d5c7c0c87
Merge pull request #1209 from kiwix/macgills/#1200-explain-branching-model 
#1200 explain how the branching model will work post 2.5
 2019-06-24 21:06:19 +02:00
Sean Mac Gillicuddy
3c3d1ce1cf #1219 support densit splits 2019-06-24 17:27:08 +01:00
Sean Mac Gillicuddy
0d945eec9c Merge branch 'master' into macgills/#1200-explain-branching-model 2019-06-24 16:14:37 +01:00
macgills
f1dcc82103
Merge pull request #1208 from kiwix/macgills/update-travis-for-build-pushed-option 
Prevent builds of pushed branches unless it is a tag
 2019-06-24 16:11:21 +01:00
Sean Mac Gillicuddy
c6491281e2 #1200 remove hotfix line, expnd feature line 2019-06-24 16:00:53 +01:00
Justin Biggs
bb4bef5851 force enable bottom toolbar, passed all CI tests 2019-06-24 09:24:44 -05:00
Isaac Hutt
5fbe546dd5
Merge branch 'master' into feature/NoteKeeper 2019-06-23 17:40:54 +01:00
Justin Biggs
699b405991 deleted-bottom-toolbar-inst-test 2019-06-23 08:36:02 -05:00
Kelson
50ad2e00d6
Create FUNDING.yml 2019-06-22 07:55:42 +02:00
Sean Mac Gillicuddy
209cf78311 Increase timeout to 1 minute 2019-06-21 15:23:08 +01:00
Justin Biggs
69e5a7832c eliminated the bottom toolbar 2019-06-20 21:03:23 -05:00
Aditya-Sood
5723554c53 Refactor: Use Field-injection for SharedPreferenceUtil in AddNoteDialog and ConfirmationAlertDialogFragment 
* Replaced previously used constructor-injection with field-injection
* Minor refactoring: Remove extra super() calls & use same names for constructor parameters as member variables
 2019-06-20 21:52:34 +05:30
Aditya-Sood
62c4655622 Refactor: Avoid adding AddNoteDialog to back-stack and related code changes 2019-06-20 21:22:26 +05:30
Aditya-Sood
77c30ac518 Refactor: Correct the use of string resources 2019-06-20 18:35:08 +05:30
Sean Mac Gillicuddy
e42a7320ae #1200 explain how the branching model will work post 2.5 2019-06-20 13:17:19 +01:00
Aditya-Sood
7b8bd2b406 Refactor: Moved ConfirmationAlertDialogFragment to a separate file from AddNoteDialog 
ConfirmationAlertDialogFragment is now a generic helper class for displaying a 2-button (positive & negative) confirmation dialog fragment on top of an existing dialog fragment
 2019-06-20 17:03:30 +05:30
Sean Mac Gillicuddy
3a329a95f0 Prevent builds of pushed branches unless it is a tag 2019-06-20 11:42:45 +01:00
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