Sean Mac Gillicuddy
|
a596e34ace
|
#1370 install git hooks on prebuild - update editorconfig from project codestyle settings
|
2019-07-25 12:45:18 +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
|
a0fdfa13f4
|
add continuation_indent_size to editorconfig, android studio / intellij
Default Android Studio code formatting style uses this, as well
SquareAndroid style has it.
|
2019-02-03 18:58:18 +01:00 |
|
soloturn
|
30340e2cb3
|
add .editorconfig to make formatting rules more explicit
see https://editorconfig.org/ for details, quite a number of editors
support it out of the box. fixes #923.
|
2019-02-01 10:47:42 +01:00 |
|