diff --git a/HowToBuild b/HowToBuild index e612eef9a..26e06ae51 100644 --- a/HowToBuild +++ b/HowToBuild @@ -20,6 +20,13 @@ E.g., on my computer 'local.properties' consists of 2 lines: sdk.dir=/Users/geometer/android-sdk-mac_86 ndk.dir=/Users/geometer/android-ndk-r4b + The same file shall be copied to following four folders as well: + + cp local.properties third-party/SuperToasts/ + cp local.properties third-party/android-filechooser/code/ + cp local.properties third-party/drag-sort-listview/library/ + cp local.properties third-party/AmbilWarna/ + 2. If you use Linux or MacOS, just run 'ant package' and go to step 3. For debugging purposes, you might want to run 'ant dbg' for building the package in debug mode, signing with your debug key (in this case, you can skip step 3). diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java index 11d56b1be..c74fc8266 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java @@ -21,7 +21,7 @@ package org.geometerplus.fbreader.library; import java.util.*; -import org.fbreader.util.NaturalOrderComparator; +import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator; import org.fbreader.util.Pair; import org.geometerplus.zlibrary.core.filesystem.ZLFile; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java index 2818531dd..f9b8b7cd4 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java @@ -26,7 +26,7 @@ import java.util.Map; import android.annotation.TargetApi; import android.os.Build; -import org.fbreader.util.NaturalOrderComparator; +import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator; public abstract class TitledEntity> implements Comparable { private static final NaturalOrderComparator ourComparator = new NaturalOrderComparator(); diff --git a/third-party/AmbilWarna/project.properties b/third-party/AmbilWarna/project.properties index ce256fda4..e21e21085 100644 --- a/third-party/AmbilWarna/project.properties +++ b/third-party/AmbilWarna/project.properties @@ -11,4 +11,4 @@ android.library=true # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-11 +target=android-19 diff --git a/third-party/android-filechooser/code/project.properties b/third-party/android-filechooser/code/project.properties index d52557723..8e4bc5fdc 100755 --- a/third-party/android-filechooser/code/project.properties +++ b/third-party/android-filechooser/code/project.properties @@ -8,5 +8,5 @@ # project structure. # Project target. -target=android-14 +target=android-19 android.library=true diff --git a/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java b/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java index 31990d27a..3e2a4e1f9 100755 --- a/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java +++ b/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java @@ -13,7 +13,7 @@ import group.pals.android.lib.ui.filechooser.services.IFileProvider; import java.util.Comparator; -import org.fbreader.util.NaturalOrderComparator; +//import org.fbreader.util.NaturalOrderComparator; /** * {@link IFile} comparator.
diff --git a/fbreader/app/src/main/java/org/fbreader/util/NaturalOrderComparator.java b/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/NaturalOrderComparator.java similarity index 98% rename from fbreader/app/src/main/java/org/fbreader/util/NaturalOrderComparator.java rename to third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/NaturalOrderComparator.java index 904829209..c0a16cb3e 100644 --- a/fbreader/app/src/main/java/org/fbreader/util/NaturalOrderComparator.java +++ b/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/NaturalOrderComparator.java @@ -1,4 +1,4 @@ -package org.fbreader.util; +package group.pals.android.lib.ui.filechooser.utils; /* NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java. diff --git a/third-party/drag-sort-listview/library/libs/android-support-v4.jar b/third-party/drag-sort-listview/library/libs/android-support-v4.jar new file mode 100644 index 000000000..c31cede47 Binary files /dev/null and b/third-party/drag-sort-listview/library/libs/android-support-v4.jar differ diff --git a/third-party/drag-sort-listview/library/project.properties b/third-party/drag-sort-listview/library/project.properties index e80f2971a..61afc8fe5 100644 --- a/third-party/drag-sort-listview/library/project.properties +++ b/third-party/drag-sort-listview/library/project.properties @@ -12,4 +12,4 @@ android.library=true # Project target. -target=android-5 +target=android-19