kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 14:52:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 3.0

Browse Source
This commit is contained in:
Isaac Hutt 2018-10-08 22:25:38 +01:00 committed by GitHub
commit 10ffc83685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -10,6 +10,7 @@ buildscript {
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$androidGradlePluginVersion" classpath "com.android.tools.build:gradle:$androidGradlePluginVersion"
classpath "com.testdroid:gradle:$testdroidGradlePluginVersion" classpath "com.testdroid:gradle:$testdroidGradlePluginVersion"
classpath 'org.apache.httpcomponents:httpclient-android:4.3.3'
} }
} }
@ -48,7 +49,6 @@ dependencies {
implementation "com.android.support:design:$supportLibraryVersion" implementation "com.android.support:design:$supportLibraryVersion"
implementation "com.android.support:cardview-v7:$supportLibraryVersion" implementation "com.android.support:cardview-v7:$supportLibraryVersion"
implementation "com.android.support:multidex:$multidexVersion" implementation "com.android.support:multidex:$multidexVersion"
implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion" implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3' androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
@ -183,6 +183,8 @@ android {
cruncherEnabled true cruncherEnabled true
} }
testBuildType "coverage"
lintOptions { lintOptions {
// Treat lint seriously // Treat lint seriously
abortOnError true abortOnError true
@ -260,7 +262,7 @@ android {
if (project.hasProperty('version_name')) { if (project.hasProperty('version_name')) {
versionName project.property('version_name') versionName project.property('version_name')
} else { } else {
versionName "2.3" versionName "2.4"
} }
} }
// Custom apps built from a json file, zim file and icon set // Custom apps built from a json file, zim file and icon set

4
app/src/main/res/layout/search.xml
View File

@ -15,12 +15,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar_layout" android:id="@+id/toolbar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?actionBarSize"> android:layout_height="?android:attr/actionBarSize">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?actionBarSize" android:layout_height="?android:attr/actionBarSize"
android:background="?colorPrimaryDark" android:background="?colorPrimaryDark"
app:popupTheme="@style/AppTheme.PopupOverlay" app:popupTheme="@style/AppTheme.PopupOverlay"
app:theme="@style/AppTheme.AppBarOverlay" /> app:theme="@style/AppTheme.AppBarOverlay" />

1
gradle.properties
View File

@ -1,3 +1,4 @@
android.enableD8=true android.enableD8=true
android.enableD8.desugaring=true android.enableD8.desugaring=true
org.gradle.configureondemand=false
org.gradle.jvmargs=-Xmx4096m org.gradle.jvmargs=-Xmx4096m