diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..0b8620e04 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# Gradle +.gradle +/local.properties + +# IDE +/.idea/workspace.xml +.settings +*.iml + +# Mac OS X +.DS_Store + +# Build files +/build +/gen +/out +/platforms diff --git a/build-android-with-native.py b/build-android-with-native.py index 6947df8f9..f56fbeb4a 100755 --- a/build-android-with-native.py +++ b/build-android-with-native.py @@ -31,7 +31,7 @@ USAGE = '''Usage: %s [--option] --locales Create the locales.txt file --apk Create an APK file - Note that the '--' prefix is optionnal. + Note that the '--' prefix is optional. --on=ARCH Disable steps on all archs and cherry pick the ones wanted. Multiple --on=ARCH can be specified. @@ -526,9 +526,9 @@ for arch in ARCHS: if COMPILE_APK: - syscall('rm -f bin/*.apk', shell=True) - syscall('ant debug') - syscall('ls -lh bin/*.apk', shell=True) + syscall('rm -f build/apk/*.apk', shell=True) + syscall('sh gradlew build') + syscall('ls -lh build/apk/*.apk', shell=True) if LOCALES_TXT: @@ -550,6 +550,6 @@ if LOCALES_TXT: # check that the step went well if COMPILE_APK: - if not os.path.exists(os.path.join('bin', 'Kiwix-debug.apk')): - failed_on_step('The Kiwix-debug.apk package has not been created ' + if not os.path.exists(os.path.join('build', 'apk', 'android-debug-unaligned.apk')): + failed_on_step('The android-debug-unaligned.apk package has not been created ' 'and is not present.') diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..7cc3a135f --- /dev/null +++ b/build.gradle @@ -0,0 +1,60 @@ +buildscript { + + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.7+' + } +} + +apply plugin: 'android' + +dependencies { + compile 'com.android.support:support-v4:19.0.0' + compile files("$buildDir/native-libs/native-libs.jar") + +} + +android { + compileSdkVersion 19 + buildToolsVersion "19" + + defaultConfig { + minSdkVersion 11 + targetSdkVersion 19 + } + + lintOptions { + abortOnError false + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + } +} + +task wrapper(type: Wrapper) { + gradleVersion = '1.9' +} + +task nativeLibsToJar(type: Zip) { + destinationDir file("$buildDir/native-libs") + baseName 'native-libs' + extension 'jar' + from fileTree(dir: 'libs', include: '**/*.so') + into 'lib/' +} + +tasks.withType(Compile) { + compileTask -> compileTask.dependsOn(nativeLibsToJar) +} diff --git a/build.xml b/build.xml deleted file mode 100644 index 96dae6625..000000000 --- a/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/create-signed-android-release.sh b/create-signed-android-release.sh index 3004ab322..1cb89b5a1 100755 --- a/create-signed-android-release.sh +++ b/create-signed-android-release.sh @@ -18,10 +18,10 @@ function die { } ../src/dependencies/android-sdk/sdk/tools/android update project -p . -n Kiwix -t android-14 -ant release || die "ant release error." -jarsigner -verbose -sigalg MD5withRSA -digestalg SHA1 -keystore $CERTIFICATE bin/Kiwix-release-unsigned.apk kiwix || die "Error signing the package." -jarsigner -verify bin/Kiwix-release-unsigned.apk || die "The package is not properly signed." -../src/dependencies/android-sdk/sdk/tools/zipalign -f -v 4 bin/Kiwix-release-unsigned.apk bin/kiwix-android.apk || die "Could not zipalign the signed package. Please check." + +jarsigner -verbose -sigalg MD5withRSA -digestalg SHA1 -keystore $CERTIFICATE build/apk/android-release-unsigned.apk kiwix || die "Error signing the package." +jarsigner -verify build/apk/android-release-unsigned.apk || die "The package is not properly signed." +../src/dependencies/android-sdk/sdk/tools/zipalign -f -v 4 build/apk/android-release-unsigned.apk kiwix-android.apk || die "Could not zipalign the signed package. Please check." echo "[SUCCESS] Your signed release package is ready:" -ls -lh bin/kiwix-android.apk +ls -lh kiwix-android.apk diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..d5c591c9c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..e28894a7d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Dec 21 15:54:38 CET 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..91a7e269e --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..8a0b282aa --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/install-kiwix-on-device.sh b/install-kiwix-on-device.sh index 5cc193e2d..35a4c17e4 100755 --- a/install-kiwix-on-device.sh +++ b/install-kiwix-on-device.sh @@ -1,7 +1,8 @@ #!/bin/bash -if [ -f bin/Kiwix-debug.apk ] +if [ -f build/apk/android-debug-unaligned.apk ] then - ../src/dependencies/android-sdk/sdk/platform-tools/adb uninstall org.kiwix.kiwixmobile ; ../src/dependencies/android-sdk/sdk/platform-tools/adb install bin/Kiwix-debug.apk + ../src/dependencies/android-sdk/sdk/platform-tools/adb uninstall org.kiwix.kiwixmobile ; + ../src/dependencies/android-sdk/sdk/platform-tools/adb install build/apk/android-debug-unaligned.apk else echo "No APK file available!" fi \ No newline at end of file diff --git a/project.properties b/project.properties deleted file mode 100644 index 8937e94b9..000000000 --- a/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-14 diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png deleted file mode 100644 index 23d0f3f48..000000000 Binary files a/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png deleted file mode 100644 index 16ee01454..000000000 Binary files a/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png deleted file mode 100644 index 02e96b960..000000000 Binary files a/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java b/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java index 2aa24f3c6..9426913b3 100644 --- a/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java +++ b/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.provider.MediaStore; import android.support.v4.app.FragmentActivity; @@ -81,11 +82,15 @@ public class ZimFileSelectActivity extends FragmentActivity mZimFileList = (ListView) findViewById(R.id.zimfilelist); mProgressBar.setVisibility(View.VISIBLE); - mZimFileList.setAlpha(0.4f); + // mZimFileList.setAlpha(0.4f); mFiles = new ArrayList(); - startQuery(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + startQuery(); + } else { + new RescanFileSystem().execute(); + } } @Override @@ -113,7 +118,7 @@ public class ZimFileSelectActivity extends FragmentActivity String[] selectionArgs = null; // There is no ? in query so null here - String sortOrder = MediaStore.Images.Media.TITLE; // Sorted alphabetical + String sortOrder = MediaStore.Files.FileColumns.TITLE; // Sorted alphabetical Log.d("kiwix", " Performing query for zim files..."); return new CursorLoader(this, uri, projection, query, selectionArgs, sortOrder); @@ -132,7 +137,7 @@ public class ZimFileSelectActivity extends FragmentActivity if (mProgressBarMessage.getVisibility() == View.GONE) { mProgressBar.setVisibility(View.GONE); - mZimFileList.setAlpha(1f); + // mZimFileList.setAlpha(1f); } mCursorAdapter.notifyDataSetChanged(); @@ -318,6 +323,7 @@ public class ZimFileSelectActivity extends FragmentActivity private class ViewHolder { TextView title; + TextView path; } } @@ -330,7 +336,7 @@ public class ZimFileSelectActivity extends FragmentActivity mProgressBarMessage.setVisibility(View.VISIBLE); mProgressBar.setVisibility(View.VISIBLE); - mZimFileList.setAlpha(0.4f); + // mZimFileList.setAlpha(0.4f); super.onPreExecute(); } @@ -350,7 +356,7 @@ public class ZimFileSelectActivity extends FragmentActivity mProgressBarMessage.setVisibility(View.GONE); mProgressBar.setVisibility(View.GONE); - mZimFileList.setAlpha(1f); + // mZimFileList.setAlpha(1f); new FileWriter(ZimFileSelectActivity.this).saveArray(mFiles);