diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..275b68a48
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# Eclipse specific
+
+/.settings
+/bin
+/gen
+/.classpath
+/.project
+/project.properties
+
+# Android Studio specific
+
+/.gradle
+/.idea
+/*.iml
+/build
+/local.properties
+/javadoc.xml
+/doc/
diff --git a/BUILDING b/BUILDING
index 8c6f43755..6a834642f 100644
--- a/BUILDING
+++ b/BUILDING
@@ -6,3 +6,13 @@ To build in Eclipse (bare bones version)
- set both project targets to Android 4.2
- reference ABS as a library project in BC
- clean and rebuild
+
+Building in Android Studio (ver. 1.0.2+):
+1. Open Android Studio
+2. Select "Open an existing Android Studio project"
+3. Point to `build.gradle` file in 'Book-Catalogue' folder
+4. Click OK
+5. In next dialog select "Use default Gradle wrapper"
+6. Click OK
+7. Click menu "Tools - Android - Sync Project with Gradle files"
+8. Done
diff --git a/artwork/glossy-silver-icon-business-www-search-ps-081182.png b/artwork/glossy-silver-icon-business-www-search-ps-081182.png
new file mode 100644
index 000000000..5ae5b0f80
Binary files /dev/null and b/artwork/glossy-silver-icon-business-www-search-ps-081182.png differ
diff --git a/artwork/glossy-silver-icon-business-www-search-ps-081182.xcf b/artwork/glossy-silver-icon-business-www-search-ps-081182.xcf
new file mode 100644
index 000000000..30ac55420
Binary files /dev/null and b/artwork/glossy-silver-icon-business-www-search-ps-081182.xcf differ
diff --git a/artwork/glossy-silver-icon-business-www-search-ps-081182_edited.png b/artwork/glossy-silver-icon-business-www-search-ps-081182_edited.png
new file mode 100644
index 000000000..10f9ddb28
Binary files /dev/null and b/artwork/glossy-silver-icon-business-www-search-ps-081182_edited.png differ
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..4c5d57ada
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,52 @@
+apply plugin: 'com.android.application'
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.0.0'
+ }
+}
+
+allprojects {
+ repositories {
+ mavenCentral()
+ }
+}
+
+dependencies {
+ compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
+ compile 'com.android.support:support-v4:21.0.3'
+ // Compile all libraries from 'libs' folder
+ compile fileTree(dir: 'libs', include: '*.jar' )
+}
+
+android {
+ compileSdkVersion 21
+ buildToolsVersion '20.0.0'
+
+ // !!! Commented to use values from the manifest
+// defaultConfig {
+// minSdkVersion 7
+// targetSdkVersion 16
+// versionCode 169
+// }
+
+ packagingOptions {
+ exclude 'META-INF/NOTICE.txt'
+ exclude 'META-INF/LICENSE.txt'
+ }
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ resources.srcDirs = ['src']
+ aidl.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+ }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..8c0fb64a8
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..0c71e760d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
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/res/drawable-hdpi/ic_www_search_2_holo_dark.png b/res/drawable-hdpi/ic_www_search_2_holo_dark.png
new file mode 100644
index 000000000..ee53a6fa1
Binary files /dev/null and b/res/drawable-hdpi/ic_www_search_2_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_www_search_2_holo_dark.png b/res/drawable-mdpi/ic_www_search_2_holo_dark.png
new file mode 100644
index 000000000..0dc636c71
Binary files /dev/null and b/res/drawable-mdpi/ic_www_search_2_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_www_search_2_holo_dark.png b/res/drawable-xhdpi/ic_www_search_2_holo_dark.png
new file mode 100644
index 000000000..92ac9f23d
Binary files /dev/null and b/res/drawable-xhdpi/ic_www_search_2_holo_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_www_search_2_holo_dark.png b/res/drawable-xxhdpi/ic_www_search_2_holo_dark.png
new file mode 100644
index 000000000..65cb85901
Binary files /dev/null and b/res/drawable-xxhdpi/ic_www_search_2_holo_dark.png differ
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0b7f6c955..999fc9eb4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -239,8 +239,8 @@
Bulunan verinin üstüne yazar
İptal ediliyor…
Arama başlatılıyor…
- >Bu uygulama kitap serileri hakkında bilgi almak ve ek kapakları indirmek üzere LibraryThing\'den yararlanır. Bu özellikleri kullanmak için LibraryThing'e kayıt olmanız (ücretsiz) ve LibraryThing geliştirici anahtarı almanız gerekmektedir (yine ücretsiz).
- LibraryThing'e kayıt ol
+ >Bu uygulama kitap serileri hakkında bilgi almak ve ek kapakları indirmek üzere LibraryThing\'den yararlanır. Bu özellikleri kullanmak için LibraryThing\'e kayıt olmanız (ücretsiz) ve LibraryThing geliştirici anahtarı almanız gerekmektedir (yine ücretsiz).
+ LibraryThing\'e kayıt ol
LibraryThing geliştirici anahtarı iste
LibraryThing
Geliştirici anahtarını aldığınızda (veya sizde halihazırda varsa) yalnızca aşağıdaki alana girin, sonrasında bu anahtar ek verileri almak için kullanılacaktır.
diff --git a/src/com/eleybourn/bookcatalogue/BookEditFragmentAbstract.java b/src/com/eleybourn/bookcatalogue/BookEditFragmentAbstract.java
index cc93a3774..142ab840a 100644
--- a/src/com/eleybourn/bookcatalogue/BookEditFragmentAbstract.java
+++ b/src/com/eleybourn/bookcatalogue/BookEditFragmentAbstract.java
@@ -131,17 +131,17 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
boolean hasAuthor = mEditManager.getBookData().getAuthorList().size() > 0;
if (hasAuthor) {
MenuItem item = menu.add(0, R.id.MENU_AMAZON_BOOKS_BY_AUTHOR, 0, R.string.amazon_books_by_author);
- item.setIcon(R.drawable.ic_amazon_holo_dark);
+ item.setIcon(R.drawable.ic_www_search_2_holo_dark);
}
if (mEditManager.getBookData().getSeriesList().size() > 0) {
if (hasAuthor) {
MenuItem item = menu.add(0, R.id.MENU_AMAZON_BOOKS_BY_AUTHOR_IN_SERIES, 0, R.string.amazon_books_by_author_in_series);
- item.setIcon(R.drawable.ic_amazon_holo_dark);
+ item.setIcon(R.drawable.ic_www_search_2_holo_dark);
}
{
MenuItem item = menu.add(0, R.id.MENU_AMAZON_BOOKS_IN_SERIES, 0, R.string.amazon_books_in_series);
- item.setIcon(R.drawable.ic_amazon_holo_dark);
+ item.setIcon(R.drawable.ic_www_search_2_holo_dark);
}
}
}
diff --git a/src/com/eleybourn/bookcatalogue/BooksMultitypeListHandler.java b/src/com/eleybourn/bookcatalogue/BooksMultitypeListHandler.java
index 4ab28a4fc..c941aa0f2 100644
--- a/src/com/eleybourn/bookcatalogue/BooksMultitypeListHandler.java
+++ b/src/com/eleybourn/bookcatalogue/BooksMultitypeListHandler.java
@@ -863,11 +863,11 @@ public void buildContextMenu(BooklistRowView rowView, ArrayList