1628 Commits

Author SHA1 Message Date
mhutti1
d4737248e2 Added very basic content activity check 2017-04-08 10:17:03 +02:00
mhutti1
e9fe10fb2f Fixed duplication of help page 2017-04-07 23:05:15 +02:00
Elad Keyshawn
901d24c393 Merge pull request #90 from kiwix/elad/etc
cleanup and structure changes
2017-04-07 22:35:49 +02:00
mhutti1
4a7ec66f75 Added first kiwix specific ui instrumentation test 2017-04-07 22:05:42 +02:00
Elad Keyshawn
cbe4643713 added KiwixService creator class 2017-04-07 21:39:29 +02:00
Elad Keyshawn
62d9fdf060 moved base classes for mvp to dedicated folder 2017-04-07 21:36:52 +02:00
mhutti1
dcf90cda78 Changed custom flavour name 2017-04-07 21:33:37 +02:00
Isaac Hutt
52ce549281 Merge pull request #89 from kiwix/mhutti1/travis
Mhutti1/travis
2017-04-07 21:06:09 +02:00
mhutti1
87bd4cdac8 Rearranged travis.yml 2017-04-07 20:51:46 +02:00
mhutti1
71d516836b Added travis cache and updated travis build command 2017-04-07 20:34:28 +02:00
mhutti1
2094cbd7b6 travis.yml fix 2017-04-07 20:16:19 +02:00
mhutti1
d72b171fba Try to use travis' files 2017-04-07 20:15:06 +02:00
mhutti1
046f1339ae Merge branch 'mhutti1/travis' of https://github.com/kiwix/kiwix-android into mhutti1/travis 2017-04-07 20:12:22 +02:00
mhutti1
55f4d089c8 Removed travis emmulator and slimmed build setup 2017-04-07 20:12:02 +02:00
mhutti1
e1ae5fe792 Removed travis emmulator and slimmed build setup 2017-04-07 20:00:32 +02:00
Isaac Hutt
301fadf42d Merge pull request #87 from kiwix/mhutti1/customapps
Mhutti1/customapps
2017-04-07 19:57:52 +02:00
mhutti1
9d3bb80554 Merge 2017-04-07 17:56:21 +02:00
mhutti1
5d7b3b3041 Merge branch 'mhutti1/fragments' 2017-04-07 17:53:25 +02:00
mhutti1
607298dfd6 Merge branch 'master' into mhutti1/fragments 2017-04-07 17:53:03 +02:00
mhutti1
d5d8a60867 Updated device selection and finished fragement upgrade minus preferences 2017-04-07 17:51:43 +02:00
Elad Keyshawn
5481e42a00 Merge pull request #83 from kiwix/elad/zim_manager_mvp
Elad/zim manager mvp
2017-04-07 17:31:14 +02:00
mhutti1
077c32fdeb Added comments 2017-04-07 17:15:11 +02:00
mhutti1
e9567f197b Embed zim should work and moved jni files 2017-04-07 17:03:40 +02:00
mhutti1
94fb6776bd Urls in the info file are downloaded 2017-04-06 18:30:43 +02:00
Elad Keyshawn
ba3bc3e7f6 partial mvp in ZimFileSelectFragment 2017-04-06 18:11:19 +02:00
mhutti1
9684783248 Added test json 2017-04-06 17:30:01 +02:00
mhutti1
ea345a6ca8 Gradle can build the majority of a custom app 2017-04-06 16:54:37 +02:00
Elad Keyshawn
5a4b49dda0 running previous downloads now in presenter 2017-04-06 15:48:10 +02:00
Elad Keyshawn
2872fb2026 fixed small issue 2017-04-06 15:38:59 +02:00
mhutti1
b0e8d967a8 Transformed constants into build variables 2017-04-06 15:24:38 +02:00
mhutti1
6514cc885e Updated custom apps to new structure 2017-04-06 14:41:31 +02:00
mhutti1
c1817cf0f8 Temporarily disable proguard 2017-04-06 14:40:48 +02:00
Elad Keyshawn
c827a50f05 moved static functions to util class 2017-04-06 13:12:50 +02:00
Elad Keyshawn
ab5155b1d3 Merge branch 'master' of https://github.com/kiwix/kiwix-android into elad/zim_manager_mvp 2017-04-06 12:51:40 +02:00
Elad Keyshawn
160f05f6ca - moved library to dedicated folder
- getLibraryData now in presenter
2017-04-06 12:42:53 +02:00
Elad Keyshawn
7f6ddb16b1 Merge pull request #82 from kiwix/elad/bookmarksmvp
basic mvp for old (bookmarks)
2017-04-06 11:41:13 +02:00
mhutti1
fb5bdaf3fd Added style guidelines 2017-04-06 11:30:24 +02:00
Elad Keyshawn
f5e0efcf75 fixed indentation 2017-04-06 10:25:22 +02:00
Elad Keyshawn
8c84688108 basic mvp for old (bookmarks) 2017-04-06 00:29:59 +02:00
mhutti1
76be3da9a3 Merge branch 'master' into mhutti1/fragments 2017-04-05 18:06:20 +02:00
mhutti1
53bfd184f3 Merge branch 'ISNIT0/stop-button-fix' 2017-04-05 18:03:39 +02:00
mhutti1
6b3d75ad1e Merge branch 'master' into ISNIT0/stop-button-fix 2017-04-05 18:03:08 +02:00
mhutti1
aaceeceb2b Merge branch 'mhutti1/restructure' 2017-04-05 17:55:31 +02:00
mhutti1
c9bafec8b8 Merged restructure 2017-04-05 17:55:15 +02:00
mhutti1
fe2b02064e Updated fragment to support fragment 2017-04-05 17:24:20 +02:00
Joe Reeve
e5738710da download stop button now pauses downloads and handles resume state 2017-04-05 14:36:15 +01:00
mhutti1
373e66ad88 Changed proguard config 2017-04-05 15:07:12 +02:00
Rashiq
af4a8d8c95 Merge pull request #79 from kiwix/rashiq/dagger
Add dagger
2017-04-05 12:47:33 +02:00
mhutti1
fce53f2ef1 More heap changes 2017-04-05 12:42:55 +02:00
Rashiq
31e5a9f5c8 Add dagger
For now only OkHttp, Retrofit and the LocationManager are being supplied for dagger, but I will add more as I go
2017-04-05 11:49:07 +02:00