kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-20 10:23:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,257 Commits 70 Branches 45 Tags
Commit Graph

2257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Sean Mac Gillicuddy
57149e8227 #1193 fully replace History database with objectbox version 2019-06-07 14:39:14 +01:00
Sean Mac Gillicuddy
9070e6a16b #1193 fix or migrate unit tests 2019-06-07 11:00:45 +01:00
Sean Mac Gillicuddy
004c274c02 - unify datasource for main and on device tab - fix unit test erroring to std - undo default parameters on data classes,instead have top level test functions - purge powermock 2019-06-06 17:20:38 +01:00
Sean Mac Gillicuddy
019af7be33 #1175 add second dash to dump command 2019-06-05 15:15:33 +01:00
Sean Mac Gillicuddy
0671779d40 fix toolbar not rendering 2019-06-05 14:45:10 +01:00
Sean Mac Gillicuddy
bb00b063a3 -readd deleted activity -revert application supertype to MultiDexApplication -temp solution to stop crash in Repository - readd tables that will be replaced by objectbox - reimplement parcelable Language 2019-06-05 14:16:46 +01:00
Sean Mac Gillicuddy
22e5d3226e re-enable multidex, add ktx libraries and fix some compile errors in Instrumentation tests 2019-06-05 12:37:39 +01:00
Sean Mac Gillicuddy
3cb357f9bd Merge branch 'master' into macgills/2.5-mergeable-to-dev 
# Conflicts:
#	app/build.gradle
#	app/src/androidTest/java/org/kiwix/kiwixmobile/database/KiwixDatabaseTest.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
#	app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
#	app/src/main/java/org/kiwix/kiwixmobile/base/BaseFragment.java
#	app/src/main/java/org/kiwix/kiwixmobile/data/local/dao/BookDao.java
#	app/src/main/java/org/kiwix/kiwixmobile/data/local/dao/NetworkLanguageDao.java
#	app/src/main/java/org/kiwix/kiwixmobile/data/local/entity/BookDataSource.java
#	app/src/main/java/org/kiwix/kiwixmobile/data/remote/KiwixService.java
#	app/src/main/java/org/kiwix/kiwixmobile/database/KiwixDatabase.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/components/ApplicationComponent.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/modules/ApplicationModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/downloader/ChunkUtils.java
#	app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java
#	app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadService.java
#	app/src/main/java/org/kiwix/kiwixmobile/downloader/model/DownloadModel.kt
#	app/src/main/java/org/kiwix/kiwixmobile/downloader/model/DownloadRequest.kt
#	app/src/main/java/org/kiwix/kiwixmobile/error/ErrorActivity.java
#	app/src/main/java/org/kiwix/kiwixmobile/library/LibraryAdapter.java
#	app/src/main/java/org/kiwix/kiwixmobile/library/entity/LibraryNetworkEntity.java
#	app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
#	app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java
#	app/src/main/java/org/kiwix/kiwixmobile/utils/DialogShower.kt
#	app/src/main/java/org/kiwix/kiwixmobile/utils/LanguageUtils.java
#	app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java
#	app/src/main/java/org/kiwix/kiwixmobile/utils/files/FileSearch.java
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/SectionsPagerAdapter.java
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManagePresenter.java
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryPresenter.java
#	app/src/main/res/layout/activity_library.xml
#	app/src/main/res/layout/download_item.xml
#	app/src/main/res/layout/download_management.xml
#	app/src/main/res/layout/language_selection.xml
#	app/src/main/res/layout/library_item.xml
#	app/src/main/res/layout/zim_list.xml
#	app/src/main/res/layout/zim_manager.xml
#	app/src/main/res/values/dimens.xml
#	app/src/main/res/values/strings.xml
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
 2019-06-05 11:45:16 +01:00
soloturn
a43e631de0 switching from apply plugin to pluins {} 
following this migration guide:
https://guides.gradle.org/migrating-build-logic-from-groovy-to-kotlin/
 2019-06-01 17:37:09 +01:00
soloturn
a0977ce446 replace ' with " in build.gradle 
prepare migration to build.gradle.kts, following:
https://guides.gradle.org/migrating-build-logic-from-groovy-to-kotlin/
 2019-06-01 17:37:09 +01:00
soloturn
959670468f remove androidstudio warnings from app/build.gradle 2019-06-01 17:37:09 +01:00
soloturn
4e572fb8d6 update android tools to 3.4.1 2019-06-01 17:37:09 +01:00
soloturn
1b866d6903 proguard, D8: Type 'sun.misc.Unsafe' was not found 2019-06-01 17:37:09 +01:00
soloturn
2b7d12ce14 update gradlew distribution url to gradle-5.4.1 2019-06-01 17:37:09 +01:00
Sean Mac Gillicuddy
82ce6d14da #1175 update listing from changelog 2019-05-30 13:49:18 +01:00
Sean Mac Gillicuddy
6eef46a929 #1175 fix coverage for junit5 tests 2019-05-30 13:31:18 +01:00
macgills
afb933ac6a
Merge branch 'macgills/2.5-kotlin' into macgills/2.5-coverage 2019-05-30 12:41:21 +01:00
Sean Mac Gillicuddy
f95b4ea975 #1175 move play publishing to deploy phase 2019-05-30 12:23:23 +01:00
Sean Mac Gillicuddy
76cd88b60d #1175 add automatic deployment of draft releases to github 2019-05-30 12:00:27 +01:00
Sean Mac Gillicuddy
19c43f544f #1175 rename release notes so they update on alpha 2019-05-30 10:20:26 +01:00
Sean Mac Gillicuddy
e46a71a647 #1175 move play listing to flavor sourceset, correct publishing task for enabled gradle play publisher and move to onSuccess 2019-05-30 10:00:46 +01:00
macgills
fac411fe6f
Merge pull request #1182 from kiwix/macgills/#1174-introduce-unit-testing 
Macgills/#1174 introduce unit testing
 2019-05-30 09:05:35 +01:00
Sean Mac Gillicuddy
4a0d7c3695 #1175 revert leakcanary resolution - add in commented out code for emulator on travis - add dummy files to allow local builds of release 2019-05-29 16:08:57 +01:00
Sean Mac Gillicuddy
9ce9558772 #1175 remove encrypted varaibles, instead rely on repository settings on travis 2019-05-29 14:12:56 +01:00
Sean Mac Gillicuddy
7df9687171 #1175 add new encrypted variables 2019-05-29 13:39:21 +01:00