kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-25 05:51:33 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,504 Commits 69 Branches 45 Tags
Commit Graph

2504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aditya-Sood
af5a4e1c65 Increment: Update code to use FileItem to represent files for transfer 2019-06-26 01:05:31 +05:30
Aditya-Sood
b40cfe779a Refactor: Fix margin errors in file item layout 2019-06-26 01:04:31 +05:30
Aditya-Sood
4b82f254e2 Increment: Setup file item to show status of transfer 
3 possible states: To be sent (wait icon) -> sending (progress bar) -> sent (check icon)
 2019-06-26 00:20:31 +05:30
Aditya-Sood
f90ba10b75 Add 'FileItem' class to represent files when being transferred 
Fields: File name and transfer status (to be sent, sending, sent)
 2019-06-26 00:17:39 +05:30
Aditya-Sood
be5c377917 Increment: After handshake, both devices display list of files being transferred 
Next step - Use this list to display progress of transfer
 2019-06-25 23:29:02 +05:30
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
Aditya-Sood
8ba431d00a Refactor: Updated LocalFileTransfer to open WiFi settings page 
Instead of the general 'Wireless' settings page, incase the wifi hasn't been turned on for file transfer
 2019-06-24 23:29:54 +05:30
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
Aditya-Sood
fa5cdf8f5c Refactor: Add black close icon & correct tint of white close icon 
White icon tint was corrected in the commit before the previous one
 2019-06-24 17:52:16 +05:30
Aditya-Sood
86f45a087b Refactor: LocalFileActivity layout file 2019-06-24 17:46:38 +05:30
Isaac Hutt
5fbe546dd5
Merge branch 'master' into feature/NoteKeeper 2019-06-23 17:40:54 +01:00
Aditya-Sood
32b0043e5f Increment: Add navigation icon and functionality to action bar of LocalFileTransferActivity 2019-06-23 21:58:33 +05:30
Aditya-Sood
d3704e8f9f Increment: Transferred files now saved in the user-preference 'Kiwix' folder 
Location obtained from the SharedPreferenceUtil
 2019-06-23 20:44:09 +05:30
Aditya-Sood
2066db6bd9 Increment: Improve flow of LocalFileTransfer activity 
- File receiver device can not initiate connection anymore
- Activity closes on both devices once transfer is complete
 2019-06-23 19:26:14 +05:30
Aditya-Sood
459a087728 Increment: LocalFileTransferActivity now supports sending multiple files 
All selected files (not just the first one) are trasferred to the receiving device
 2019-06-23 16:39:31 +05:30
Aditya-Sood
72d1694150 Upgrade: Share file transfer details during handshake 
- During handshake, sender device informs the receiver of:
	1) Total no. of files
	2) Name of files to be sent
- The file name is now being used instead of "temp.zim" to save the received file in the 'KiwixWifi' directory
 2019-06-23 15:39:07 +05:30
Aditya-Sood
596a7fda00 Increment: Shift file transfer fucntionality to AsynTask 
Instead of using a service, so that the progress can be visually displayed
 2019-06-22 18:29:13 +05:30
Kelson
50ad2e00d6
Create FUNDING.yml 2019-06-22 07:55:42 +02:00
Aditya-Sood
e357d47d49 Increment: LocalFileTransferActivity now has core functionality 
The activity can now be used to send one selected ZIM file to a nearby device
(Cleanup and refactoring yet to be done)
 2019-06-22 01:00:57 +05:30
Sean Mac Gillicuddy
209cf78311 Increase timeout to 1 minute 2019-06-21 15:23:08 +01:00
Aditya-Sood
25e0ef4dd7 Initial commit: LocalFileTransferActivity shows up as option to transfer ZIM files 2019-06-21 19:51:01 +05:30
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