diff --git a/.gitignore b/.gitignore index 456e18c7..4df66b60 100644 --- a/.gitignore +++ b/.gitignore @@ -19,42 +19,30 @@ gen/ .gradle/ build/ -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -################# -## Eclipse -################# -*.pydevproject -.project -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath +#built application files +*.apk +*.ap_ -# External tool builders -.externalToolBuilders/ +# files for the dex VM +*.dex -# Locally stored "Eclipse launch configurations" -*.launch +# Java class files +*.class -# CDT-specific -.cproject +# generated files +bin/ +gen/ -# PDT-specific -.buildpath +# Local configuration file (sdk path, etc) +local.properties +# Android Studio +.idea +#.idea/workspace.xml - remove # and delete .idea if it better suit your needs. +.gradle +build/ +*.iml ## Windows detritus ############# diff --git a/Clover/app/build.gradle b/Clover/app/build.gradle new file mode 100644 index 00000000..8bc285c8 --- /dev/null +++ b/Clover/app/build.gradle @@ -0,0 +1,27 @@ +apply plugin: 'android' + +android { + compileSdkVersion 19 + buildToolsVersion "19.0.2" + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 19 + } + + buildTypes { + release { + runProguard false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + compile 'org.jsoup:jsoup:1.7.3' + compile 'com.j256.ormlite:ormlite-core:4.48' + compile 'com.j256.ormlite:ormlite-android:4.48' + + compile files('libs/android-support-v13.jar') + compile files('libs/httpclientandroidlib-1.1.2.jar') +} diff --git a/Clover/libs/android-support-v13.jar b/Clover/app/libs/android-support-v13.jar similarity index 100% rename from Clover/libs/android-support-v13.jar rename to Clover/app/libs/android-support-v13.jar diff --git a/Clover/libs/httpclientandroidlib-1.1.2.jar b/Clover/app/libs/httpclientandroidlib-1.1.2.jar similarity index 100% rename from Clover/libs/httpclientandroidlib-1.1.2.jar rename to Clover/app/libs/httpclientandroidlib-1.1.2.jar diff --git a/Clover/lint.xml b/Clover/app/lint.xml similarity index 100% rename from Clover/lint.xml rename to Clover/app/lint.xml diff --git a/Clover/AndroidManifest.xml b/Clover/app/src/main/AndroidManifest.xml similarity index 100% rename from Clover/AndroidManifest.xml rename to Clover/app/src/main/AndroidManifest.xml diff --git a/Clover/assets/html/licences.html b/Clover/app/src/main/assets/html/licences.html similarity index 100% rename from Clover/assets/html/licences.html rename to Clover/app/src/main/assets/html/licences.html diff --git a/Clover/src/com/android/volley/AuthFailureError.java b/Clover/app/src/main/java/com/android/volley/AuthFailureError.java similarity index 100% rename from Clover/src/com/android/volley/AuthFailureError.java rename to Clover/app/src/main/java/com/android/volley/AuthFailureError.java diff --git a/Clover/src/com/android/volley/Cache.java b/Clover/app/src/main/java/com/android/volley/Cache.java similarity index 100% rename from Clover/src/com/android/volley/Cache.java rename to Clover/app/src/main/java/com/android/volley/Cache.java diff --git a/Clover/src/com/android/volley/CacheDispatcher.java b/Clover/app/src/main/java/com/android/volley/CacheDispatcher.java similarity index 100% rename from Clover/src/com/android/volley/CacheDispatcher.java rename to Clover/app/src/main/java/com/android/volley/CacheDispatcher.java diff --git a/Clover/src/com/android/volley/DefaultRetryPolicy.java b/Clover/app/src/main/java/com/android/volley/DefaultRetryPolicy.java similarity index 100% rename from Clover/src/com/android/volley/DefaultRetryPolicy.java rename to Clover/app/src/main/java/com/android/volley/DefaultRetryPolicy.java diff --git a/Clover/src/com/android/volley/ExecutorDelivery.java b/Clover/app/src/main/java/com/android/volley/ExecutorDelivery.java similarity index 100% rename from Clover/src/com/android/volley/ExecutorDelivery.java rename to Clover/app/src/main/java/com/android/volley/ExecutorDelivery.java diff --git a/Clover/src/com/android/volley/Network.java b/Clover/app/src/main/java/com/android/volley/Network.java similarity index 100% rename from Clover/src/com/android/volley/Network.java rename to Clover/app/src/main/java/com/android/volley/Network.java diff --git a/Clover/src/com/android/volley/NetworkDispatcher.java b/Clover/app/src/main/java/com/android/volley/NetworkDispatcher.java similarity index 100% rename from Clover/src/com/android/volley/NetworkDispatcher.java rename to Clover/app/src/main/java/com/android/volley/NetworkDispatcher.java diff --git a/Clover/src/com/android/volley/NetworkError.java b/Clover/app/src/main/java/com/android/volley/NetworkError.java similarity index 100% rename from Clover/src/com/android/volley/NetworkError.java rename to Clover/app/src/main/java/com/android/volley/NetworkError.java diff --git a/Clover/src/com/android/volley/NetworkResponse.java b/Clover/app/src/main/java/com/android/volley/NetworkResponse.java similarity index 100% rename from Clover/src/com/android/volley/NetworkResponse.java rename to Clover/app/src/main/java/com/android/volley/NetworkResponse.java diff --git a/Clover/src/com/android/volley/NoConnectionError.java b/Clover/app/src/main/java/com/android/volley/NoConnectionError.java similarity index 100% rename from Clover/src/com/android/volley/NoConnectionError.java rename to Clover/app/src/main/java/com/android/volley/NoConnectionError.java diff --git a/Clover/src/com/android/volley/ParseError.java b/Clover/app/src/main/java/com/android/volley/ParseError.java similarity index 100% rename from Clover/src/com/android/volley/ParseError.java rename to Clover/app/src/main/java/com/android/volley/ParseError.java diff --git a/Clover/src/com/android/volley/Request.java b/Clover/app/src/main/java/com/android/volley/Request.java similarity index 100% rename from Clover/src/com/android/volley/Request.java rename to Clover/app/src/main/java/com/android/volley/Request.java diff --git a/Clover/src/com/android/volley/RequestQueue.java b/Clover/app/src/main/java/com/android/volley/RequestQueue.java similarity index 100% rename from Clover/src/com/android/volley/RequestQueue.java rename to Clover/app/src/main/java/com/android/volley/RequestQueue.java diff --git a/Clover/src/com/android/volley/Response.java b/Clover/app/src/main/java/com/android/volley/Response.java similarity index 100% rename from Clover/src/com/android/volley/Response.java rename to Clover/app/src/main/java/com/android/volley/Response.java diff --git a/Clover/src/com/android/volley/ResponseDelivery.java b/Clover/app/src/main/java/com/android/volley/ResponseDelivery.java similarity index 100% rename from Clover/src/com/android/volley/ResponseDelivery.java rename to Clover/app/src/main/java/com/android/volley/ResponseDelivery.java diff --git a/Clover/src/com/android/volley/RetryPolicy.java b/Clover/app/src/main/java/com/android/volley/RetryPolicy.java similarity index 100% rename from Clover/src/com/android/volley/RetryPolicy.java rename to Clover/app/src/main/java/com/android/volley/RetryPolicy.java diff --git a/Clover/src/com/android/volley/ServerError.java b/Clover/app/src/main/java/com/android/volley/ServerError.java similarity index 100% rename from Clover/src/com/android/volley/ServerError.java rename to Clover/app/src/main/java/com/android/volley/ServerError.java diff --git a/Clover/src/com/android/volley/TimeoutError.java b/Clover/app/src/main/java/com/android/volley/TimeoutError.java similarity index 100% rename from Clover/src/com/android/volley/TimeoutError.java rename to Clover/app/src/main/java/com/android/volley/TimeoutError.java diff --git a/Clover/src/com/android/volley/VolleyError.java b/Clover/app/src/main/java/com/android/volley/VolleyError.java similarity index 100% rename from Clover/src/com/android/volley/VolleyError.java rename to Clover/app/src/main/java/com/android/volley/VolleyError.java diff --git a/Clover/src/com/android/volley/VolleyLog.java b/Clover/app/src/main/java/com/android/volley/VolleyLog.java similarity index 100% rename from Clover/src/com/android/volley/VolleyLog.java rename to Clover/app/src/main/java/com/android/volley/VolleyLog.java diff --git a/Clover/src/com/android/volley/toolbox/AndroidAuthenticator.java b/Clover/app/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/AndroidAuthenticator.java rename to Clover/app/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java diff --git a/Clover/src/com/android/volley/toolbox/Authenticator.java b/Clover/app/src/main/java/com/android/volley/toolbox/Authenticator.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/Authenticator.java rename to Clover/app/src/main/java/com/android/volley/toolbox/Authenticator.java diff --git a/Clover/src/com/android/volley/toolbox/BasicNetwork.java b/Clover/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/BasicNetwork.java rename to Clover/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java diff --git a/Clover/src/com/android/volley/toolbox/ByteArrayPool.java b/Clover/app/src/main/java/com/android/volley/toolbox/ByteArrayPool.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/ByteArrayPool.java rename to Clover/app/src/main/java/com/android/volley/toolbox/ByteArrayPool.java diff --git a/Clover/src/com/android/volley/toolbox/ClearCacheRequest.java b/Clover/app/src/main/java/com/android/volley/toolbox/ClearCacheRequest.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/ClearCacheRequest.java rename to Clover/app/src/main/java/com/android/volley/toolbox/ClearCacheRequest.java diff --git a/Clover/src/com/android/volley/toolbox/DiskBasedCache.java b/Clover/app/src/main/java/com/android/volley/toolbox/DiskBasedCache.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/DiskBasedCache.java rename to Clover/app/src/main/java/com/android/volley/toolbox/DiskBasedCache.java diff --git a/Clover/src/com/android/volley/toolbox/HttpClientStack.java b/Clover/app/src/main/java/com/android/volley/toolbox/HttpClientStack.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/HttpClientStack.java rename to Clover/app/src/main/java/com/android/volley/toolbox/HttpClientStack.java diff --git a/Clover/src/com/android/volley/toolbox/HttpHeaderParser.java b/Clover/app/src/main/java/com/android/volley/toolbox/HttpHeaderParser.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/HttpHeaderParser.java rename to Clover/app/src/main/java/com/android/volley/toolbox/HttpHeaderParser.java diff --git a/Clover/src/com/android/volley/toolbox/HttpStack.java b/Clover/app/src/main/java/com/android/volley/toolbox/HttpStack.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/HttpStack.java rename to Clover/app/src/main/java/com/android/volley/toolbox/HttpStack.java diff --git a/Clover/src/com/android/volley/toolbox/HurlStack.java b/Clover/app/src/main/java/com/android/volley/toolbox/HurlStack.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/HurlStack.java rename to Clover/app/src/main/java/com/android/volley/toolbox/HurlStack.java diff --git a/Clover/src/com/android/volley/toolbox/ImageLoader.java b/Clover/app/src/main/java/com/android/volley/toolbox/ImageLoader.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/ImageLoader.java rename to Clover/app/src/main/java/com/android/volley/toolbox/ImageLoader.java diff --git a/Clover/src/com/android/volley/toolbox/ImageRequest.java b/Clover/app/src/main/java/com/android/volley/toolbox/ImageRequest.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/ImageRequest.java rename to Clover/app/src/main/java/com/android/volley/toolbox/ImageRequest.java diff --git a/Clover/src/com/android/volley/toolbox/JsonArrayRequest.java b/Clover/app/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/JsonArrayRequest.java rename to Clover/app/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java diff --git a/Clover/src/com/android/volley/toolbox/JsonObjectRequest.java b/Clover/app/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/JsonObjectRequest.java rename to Clover/app/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java diff --git a/Clover/src/com/android/volley/toolbox/JsonRequest.java b/Clover/app/src/main/java/com/android/volley/toolbox/JsonRequest.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/JsonRequest.java rename to Clover/app/src/main/java/com/android/volley/toolbox/JsonRequest.java diff --git a/Clover/src/com/android/volley/toolbox/NetworkImageView.java b/Clover/app/src/main/java/com/android/volley/toolbox/NetworkImageView.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/NetworkImageView.java rename to Clover/app/src/main/java/com/android/volley/toolbox/NetworkImageView.java diff --git a/Clover/src/com/android/volley/toolbox/NoCache.java b/Clover/app/src/main/java/com/android/volley/toolbox/NoCache.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/NoCache.java rename to Clover/app/src/main/java/com/android/volley/toolbox/NoCache.java diff --git a/Clover/src/com/android/volley/toolbox/PoolingByteArrayOutputStream.java b/Clover/app/src/main/java/com/android/volley/toolbox/PoolingByteArrayOutputStream.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/PoolingByteArrayOutputStream.java rename to Clover/app/src/main/java/com/android/volley/toolbox/PoolingByteArrayOutputStream.java diff --git a/Clover/src/com/android/volley/toolbox/RequestFuture.java b/Clover/app/src/main/java/com/android/volley/toolbox/RequestFuture.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/RequestFuture.java rename to Clover/app/src/main/java/com/android/volley/toolbox/RequestFuture.java diff --git a/Clover/src/com/android/volley/toolbox/StringRequest.java b/Clover/app/src/main/java/com/android/volley/toolbox/StringRequest.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/StringRequest.java rename to Clover/app/src/main/java/com/android/volley/toolbox/StringRequest.java diff --git a/Clover/src/com/android/volley/toolbox/Volley.java b/Clover/app/src/main/java/com/android/volley/toolbox/Volley.java similarity index 100% rename from Clover/src/com/android/volley/toolbox/Volley.java rename to Clover/app/src/main/java/com/android/volley/toolbox/Volley.java diff --git a/Clover/src/com/micromobs/android/floatlabel/FloatLabelEditText.java b/Clover/app/src/main/java/com/micromobs/android/floatlabel/FloatLabelEditText.java similarity index 100% rename from Clover/src/com/micromobs/android/floatlabel/FloatLabelEditText.java rename to Clover/app/src/main/java/com/micromobs/android/floatlabel/FloatLabelEditText.java diff --git a/Clover/src/com/mobeta/android/dslv/DragSortController.java b/Clover/app/src/main/java/com/mobeta/android/dslv/DragSortController.java similarity index 100% rename from Clover/src/com/mobeta/android/dslv/DragSortController.java rename to Clover/app/src/main/java/com/mobeta/android/dslv/DragSortController.java diff --git a/Clover/src/com/mobeta/android/dslv/DragSortCursorAdapter.java b/Clover/app/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java similarity index 100% rename from Clover/src/com/mobeta/android/dslv/DragSortCursorAdapter.java rename to Clover/app/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java diff --git a/Clover/src/com/mobeta/android/dslv/DragSortItemView.java b/Clover/app/src/main/java/com/mobeta/android/dslv/DragSortItemView.java similarity index 100% rename from Clover/src/com/mobeta/android/dslv/DragSortItemView.java rename to Clover/app/src/main/java/com/mobeta/android/dslv/DragSortItemView.java diff --git a/Clover/src/com/mobeta/android/dslv/DragSortItemViewCheckable.java b/Clover/app/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java similarity index 100% rename from Clover/src/com/mobeta/android/dslv/DragSortItemViewCheckable.java rename to Clover/app/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java diff --git a/Clover/src/com/mobeta/android/dslv/DragSortListView.java b/Clover/app/src/main/java/com/mobeta/android/dslv/DragSortListView.java similarity index 100% rename from Clover/src/com/mobeta/android/dslv/DragSortListView.java rename to Clover/app/src/main/java/com/mobeta/android/dslv/DragSortListView.java diff --git a/Clover/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java b/Clover/app/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java similarity index 100% rename from Clover/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java rename to Clover/app/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java diff --git a/Clover/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java b/Clover/app/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java similarity index 100% rename from Clover/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java rename to Clover/app/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java diff --git a/Clover/src/com/mobeta/android/dslv/SimpleFloatViewManager.java b/Clover/app/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java similarity index 100% rename from Clover/src/com/mobeta/android/dslv/SimpleFloatViewManager.java rename to Clover/app/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java diff --git a/Clover/src/org/floens/chan/ChanApplication.java b/Clover/app/src/main/java/org/floens/chan/ChanApplication.java similarity index 100% rename from Clover/src/org/floens/chan/ChanApplication.java rename to Clover/app/src/main/java/org/floens/chan/ChanApplication.java index 33f54383..64182d21 100644 --- a/Clover/src/org/floens/chan/ChanApplication.java +++ b/Clover/app/src/main/java/org/floens/chan/ChanApplication.java @@ -17,7 +17,15 @@ */ package org.floens.chan; -import java.lang.reflect.Field; +import android.app.Application; +import android.content.SharedPreferences; +import android.os.StrictMode; +import android.preference.PreferenceManager; +import android.view.ViewConfiguration; + +import com.android.volley.RequestQueue; +import com.android.volley.toolbox.ImageLoader; +import com.android.volley.toolbox.Volley; import org.floens.chan.core.manager.BoardManager; import org.floens.chan.core.manager.PinnedManager; @@ -28,15 +36,7 @@ import org.floens.chan.database.DatabaseManager; import org.floens.chan.service.WatchService; import org.floens.chan.utils.IconCache; -import android.app.Application; -import android.content.SharedPreferences; -import android.os.StrictMode; -import android.preference.PreferenceManager; -import android.view.ViewConfiguration; - -import com.android.volley.RequestQueue; -import com.android.volley.toolbox.ImageLoader; -import com.android.volley.toolbox.Volley; +import java.lang.reflect.Field; public class ChanApplication extends Application implements PinListener { public static final boolean DEVELOPER_MODE = false; diff --git a/Clover/src/org/floens/chan/chan/ChanUrls.java b/Clover/app/src/main/java/org/floens/chan/chan/ChanUrls.java similarity index 100% rename from Clover/src/org/floens/chan/chan/ChanUrls.java rename to Clover/app/src/main/java/org/floens/chan/chan/ChanUrls.java diff --git a/Clover/src/org/floens/chan/core/ChanPreferences.java b/Clover/app/src/main/java/org/floens/chan/core/ChanPreferences.java similarity index 100% rename from Clover/src/org/floens/chan/core/ChanPreferences.java rename to Clover/app/src/main/java/org/floens/chan/core/ChanPreferences.java diff --git a/Clover/src/org/floens/chan/core/loader/EndOfLineException.java b/Clover/app/src/main/java/org/floens/chan/core/loader/EndOfLineException.java similarity index 100% rename from Clover/src/org/floens/chan/core/loader/EndOfLineException.java rename to Clover/app/src/main/java/org/floens/chan/core/loader/EndOfLineException.java diff --git a/Clover/src/org/floens/chan/core/loader/Loader.java b/Clover/app/src/main/java/org/floens/chan/core/loader/Loader.java similarity index 100% rename from Clover/src/org/floens/chan/core/loader/Loader.java rename to Clover/app/src/main/java/org/floens/chan/core/loader/Loader.java diff --git a/Clover/src/org/floens/chan/core/loader/LoaderPool.java b/Clover/app/src/main/java/org/floens/chan/core/loader/LoaderPool.java similarity index 100% rename from Clover/src/org/floens/chan/core/loader/LoaderPool.java rename to Clover/app/src/main/java/org/floens/chan/core/loader/LoaderPool.java diff --git a/Clover/src/org/floens/chan/core/manager/BoardManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java similarity index 100% rename from Clover/src/org/floens/chan/core/manager/BoardManager.java rename to Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java diff --git a/Clover/src/org/floens/chan/core/manager/PinnedManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/PinnedManager.java similarity index 100% rename from Clover/src/org/floens/chan/core/manager/PinnedManager.java rename to Clover/app/src/main/java/org/floens/chan/core/manager/PinnedManager.java diff --git a/Clover/src/org/floens/chan/core/manager/ReplyManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/ReplyManager.java similarity index 100% rename from Clover/src/org/floens/chan/core/manager/ReplyManager.java rename to Clover/app/src/main/java/org/floens/chan/core/manager/ReplyManager.java diff --git a/Clover/src/org/floens/chan/core/manager/ThreadManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java similarity index 100% rename from Clover/src/org/floens/chan/core/manager/ThreadManager.java rename to Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java diff --git a/Clover/src/org/floens/chan/core/model/Board.java b/Clover/app/src/main/java/org/floens/chan/core/model/Board.java similarity index 100% rename from Clover/src/org/floens/chan/core/model/Board.java rename to Clover/app/src/main/java/org/floens/chan/core/model/Board.java diff --git a/Clover/src/org/floens/chan/core/model/Loadable.java b/Clover/app/src/main/java/org/floens/chan/core/model/Loadable.java similarity index 100% rename from Clover/src/org/floens/chan/core/model/Loadable.java rename to Clover/app/src/main/java/org/floens/chan/core/model/Loadable.java diff --git a/Clover/src/org/floens/chan/core/model/Pass.java b/Clover/app/src/main/java/org/floens/chan/core/model/Pass.java similarity index 100% rename from Clover/src/org/floens/chan/core/model/Pass.java rename to Clover/app/src/main/java/org/floens/chan/core/model/Pass.java diff --git a/Clover/src/org/floens/chan/core/model/Pin.java b/Clover/app/src/main/java/org/floens/chan/core/model/Pin.java similarity index 100% rename from Clover/src/org/floens/chan/core/model/Pin.java rename to Clover/app/src/main/java/org/floens/chan/core/model/Pin.java diff --git a/Clover/src/org/floens/chan/core/model/Post.java b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java similarity index 100% rename from Clover/src/org/floens/chan/core/model/Post.java rename to Clover/app/src/main/java/org/floens/chan/core/model/Post.java diff --git a/Clover/src/org/floens/chan/core/model/PostLinkable.java b/Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java similarity index 100% rename from Clover/src/org/floens/chan/core/model/PostLinkable.java rename to Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java diff --git a/Clover/src/org/floens/chan/core/model/Reply.java b/Clover/app/src/main/java/org/floens/chan/core/model/Reply.java similarity index 100% rename from Clover/src/org/floens/chan/core/model/Reply.java rename to Clover/app/src/main/java/org/floens/chan/core/model/Reply.java diff --git a/Clover/src/org/floens/chan/core/model/SavedReply.java b/Clover/app/src/main/java/org/floens/chan/core/model/SavedReply.java similarity index 100% rename from Clover/src/org/floens/chan/core/model/SavedReply.java rename to Clover/app/src/main/java/org/floens/chan/core/model/SavedReply.java diff --git a/Clover/src/org/floens/chan/core/net/BitmapLruImageCache.java b/Clover/app/src/main/java/org/floens/chan/core/net/BitmapLruImageCache.java similarity index 100% rename from Clover/src/org/floens/chan/core/net/BitmapLruImageCache.java rename to Clover/app/src/main/java/org/floens/chan/core/net/BitmapLruImageCache.java diff --git a/Clover/src/org/floens/chan/core/net/BoardsRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java similarity index 100% rename from Clover/src/org/floens/chan/core/net/BoardsRequest.java rename to Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java diff --git a/Clover/src/org/floens/chan/core/net/ByteArrayRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ByteArrayRequest.java similarity index 100% rename from Clover/src/org/floens/chan/core/net/ByteArrayRequest.java rename to Clover/app/src/main/java/org/floens/chan/core/net/ByteArrayRequest.java diff --git a/Clover/src/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java similarity index 100% rename from Clover/src/org/floens/chan/core/net/ChanReaderRequest.java rename to Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java diff --git a/Clover/src/org/floens/chan/core/net/FileRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/FileRequest.java similarity index 100% rename from Clover/src/org/floens/chan/core/net/FileRequest.java rename to Clover/app/src/main/java/org/floens/chan/core/net/FileRequest.java diff --git a/Clover/src/org/floens/chan/core/net/GIFRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/GIFRequest.java similarity index 100% rename from Clover/src/org/floens/chan/core/net/GIFRequest.java rename to Clover/app/src/main/java/org/floens/chan/core/net/GIFRequest.java diff --git a/Clover/src/org/floens/chan/core/net/JsonReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/JsonReaderRequest.java similarity index 100% rename from Clover/src/org/floens/chan/core/net/JsonReaderRequest.java rename to Clover/app/src/main/java/org/floens/chan/core/net/JsonReaderRequest.java diff --git a/Clover/src/org/floens/chan/core/watch/PinWatcher.java b/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java similarity index 100% rename from Clover/src/org/floens/chan/core/watch/PinWatcher.java rename to Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java diff --git a/Clover/src/org/floens/chan/core/watch/WatchNotifier.java b/Clover/app/src/main/java/org/floens/chan/core/watch/WatchNotifier.java similarity index 100% rename from Clover/src/org/floens/chan/core/watch/WatchNotifier.java rename to Clover/app/src/main/java/org/floens/chan/core/watch/WatchNotifier.java diff --git a/Clover/src/org/floens/chan/database/DatabaseHelper.java b/Clover/app/src/main/java/org/floens/chan/database/DatabaseHelper.java similarity index 100% rename from Clover/src/org/floens/chan/database/DatabaseHelper.java rename to Clover/app/src/main/java/org/floens/chan/database/DatabaseHelper.java index b9c00e28..d8a07407 100644 --- a/Clover/src/org/floens/chan/database/DatabaseHelper.java +++ b/Clover/app/src/main/java/org/floens/chan/database/DatabaseHelper.java @@ -17,14 +17,6 @@ */ package org.floens.chan.database; -import java.sql.SQLException; - -import org.floens.chan.core.model.Board; -import org.floens.chan.core.model.Loadable; -import org.floens.chan.core.model.Pin; -import org.floens.chan.core.model.SavedReply; -import org.floens.chan.utils.Logger; - import android.content.Context; import android.database.sqlite.SQLiteDatabase; @@ -33,6 +25,14 @@ import com.j256.ormlite.dao.Dao; import com.j256.ormlite.support.ConnectionSource; import com.j256.ormlite.table.TableUtils; +import org.floens.chan.core.model.Board; +import org.floens.chan.core.model.Loadable; +import org.floens.chan.core.model.Pin; +import org.floens.chan.core.model.SavedReply; +import org.floens.chan.utils.Logger; + +import java.sql.SQLException; + public class DatabaseHelper extends OrmLiteSqliteOpenHelper { private static final String TAG = "DatabaseHelper"; diff --git a/Clover/src/org/floens/chan/database/DatabaseManager.java b/Clover/app/src/main/java/org/floens/chan/database/DatabaseManager.java similarity index 100% rename from Clover/src/org/floens/chan/database/DatabaseManager.java rename to Clover/app/src/main/java/org/floens/chan/database/DatabaseManager.java index cdbdf4e5..62cbb087 100644 --- a/Clover/src/org/floens/chan/database/DatabaseManager.java +++ b/Clover/app/src/main/java/org/floens/chan/database/DatabaseManager.java @@ -17,9 +17,7 @@ */ package org.floens.chan.database; -import java.sql.SQLException; -import java.util.List; -import java.util.concurrent.Callable; +import android.content.Context; import org.floens.chan.core.model.Board; import org.floens.chan.core.model.Pin; @@ -27,7 +25,9 @@ import org.floens.chan.core.model.SavedReply; import org.floens.chan.utils.Logger; import org.floens.chan.utils.Time; -import android.content.Context; +import java.sql.SQLException; +import java.util.List; +import java.util.concurrent.Callable; public class DatabaseManager { private static final String TAG = "DatabaseManager"; diff --git a/Clover/src/org/floens/chan/service/WatchService.java b/Clover/app/src/main/java/org/floens/chan/service/WatchService.java similarity index 100% rename from Clover/src/org/floens/chan/service/WatchService.java rename to Clover/app/src/main/java/org/floens/chan/service/WatchService.java diff --git a/Clover/src/org/floens/chan/ui/BadgeDrawable.java b/Clover/app/src/main/java/org/floens/chan/ui/BadgeDrawable.java similarity index 100% rename from Clover/src/org/floens/chan/ui/BadgeDrawable.java rename to Clover/app/src/main/java/org/floens/chan/ui/BadgeDrawable.java diff --git a/Clover/src/org/floens/chan/ui/ScrollerRunnable.java b/Clover/app/src/main/java/org/floens/chan/ui/ScrollerRunnable.java similarity index 100% rename from Clover/src/org/floens/chan/ui/ScrollerRunnable.java rename to Clover/app/src/main/java/org/floens/chan/ui/ScrollerRunnable.java diff --git a/Clover/src/org/floens/chan/ui/SwipeDismissListViewTouchListener.java b/Clover/app/src/main/java/org/floens/chan/ui/SwipeDismissListViewTouchListener.java similarity index 100% rename from Clover/src/org/floens/chan/ui/SwipeDismissListViewTouchListener.java rename to Clover/app/src/main/java/org/floens/chan/ui/SwipeDismissListViewTouchListener.java diff --git a/Clover/src/org/floens/chan/ui/ViewFlipperAnimations.java b/Clover/app/src/main/java/org/floens/chan/ui/ViewFlipperAnimations.java similarity index 100% rename from Clover/src/org/floens/chan/ui/ViewFlipperAnimations.java rename to Clover/app/src/main/java/org/floens/chan/ui/ViewFlipperAnimations.java diff --git a/Clover/src/org/floens/chan/ui/activity/AboutActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/AboutActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/AboutActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/AboutActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/BaseActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/BaseActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/BaseActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/BaseActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/BoardActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/BoardActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/BoardActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/BoardEditor.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardEditor.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/BoardEditor.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/BoardEditor.java diff --git a/Clover/src/org/floens/chan/ui/activity/DeveloperActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/DeveloperActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/DeveloperActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/DeveloperActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/ImagePickActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ImagePickActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/ImagePickActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/ImagePickActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/ImageViewActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ImageViewActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/ImageViewActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/ImageViewActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/PassSettingsActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/PassSettingsActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/PassSettingsActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/PassSettingsActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/ReplyActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ReplyActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/ReplyActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/ReplyActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/SettingsActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/SettingsActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/SettingsActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/SettingsActivity.java diff --git a/Clover/src/org/floens/chan/ui/activity/WatchSettingsActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/WatchSettingsActivity.java similarity index 100% rename from Clover/src/org/floens/chan/ui/activity/WatchSettingsActivity.java rename to Clover/app/src/main/java/org/floens/chan/ui/activity/WatchSettingsActivity.java diff --git a/Clover/src/org/floens/chan/ui/adapter/ImageViewAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/ImageViewAdapter.java similarity index 100% rename from Clover/src/org/floens/chan/ui/adapter/ImageViewAdapter.java rename to Clover/app/src/main/java/org/floens/chan/ui/adapter/ImageViewAdapter.java diff --git a/Clover/src/org/floens/chan/ui/adapter/PinnedAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinnedAdapter.java similarity index 100% rename from Clover/src/org/floens/chan/ui/adapter/PinnedAdapter.java rename to Clover/app/src/main/java/org/floens/chan/ui/adapter/PinnedAdapter.java diff --git a/Clover/src/org/floens/chan/ui/adapter/PostAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostAdapter.java similarity index 100% rename from Clover/src/org/floens/chan/ui/adapter/PostAdapter.java rename to Clover/app/src/main/java/org/floens/chan/ui/adapter/PostAdapter.java diff --git a/Clover/src/org/floens/chan/ui/fragment/ImageViewFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java similarity index 100% rename from Clover/src/org/floens/chan/ui/fragment/ImageViewFragment.java rename to Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java diff --git a/Clover/src/org/floens/chan/ui/fragment/PostRepliesFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java similarity index 100% rename from Clover/src/org/floens/chan/ui/fragment/PostRepliesFragment.java rename to Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java diff --git a/Clover/src/org/floens/chan/ui/fragment/ReplyFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java similarity index 100% rename from Clover/src/org/floens/chan/ui/fragment/ReplyFragment.java rename to Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java diff --git a/Clover/src/org/floens/chan/ui/fragment/SettingsFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/SettingsFragment.java similarity index 100% rename from Clover/src/org/floens/chan/ui/fragment/SettingsFragment.java rename to Clover/app/src/main/java/org/floens/chan/ui/fragment/SettingsFragment.java diff --git a/Clover/src/org/floens/chan/ui/fragment/ThreadFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java similarity index 100% rename from Clover/src/org/floens/chan/ui/fragment/ThreadFragment.java rename to Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java diff --git a/Clover/src/org/floens/chan/ui/view/CustomNetworkImageView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/CustomNetworkImageView.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/CustomNetworkImageView.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/CustomNetworkImageView.java diff --git a/Clover/src/org/floens/chan/ui/view/DragGripView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/DragGripView.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/DragGripView.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/DragGripView.java diff --git a/Clover/src/org/floens/chan/ui/view/GIFView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/GIFView.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/GIFView.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/GIFView.java diff --git a/Clover/src/org/floens/chan/ui/view/HackyViewPager.java b/Clover/app/src/main/java/org/floens/chan/ui/view/HackyViewPager.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/HackyViewPager.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/HackyViewPager.java diff --git a/Clover/src/org/floens/chan/ui/view/LoadView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/LoadView.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/LoadView.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/LoadView.java diff --git a/Clover/src/org/floens/chan/ui/view/NetworkPhotoView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/NetworkPhotoView.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/NetworkPhotoView.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/NetworkPhotoView.java diff --git a/Clover/src/org/floens/chan/ui/view/PostView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/PostView.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java diff --git a/Clover/src/org/floens/chan/ui/view/ThreadWatchCounterView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/ThreadWatchCounterView.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/ThreadWatchCounterView.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/ThreadWatchCounterView.java diff --git a/Clover/src/org/floens/chan/ui/view/ThumbnailImageView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/ThumbnailImageView.java similarity index 100% rename from Clover/src/org/floens/chan/ui/view/ThumbnailImageView.java rename to Clover/app/src/main/java/org/floens/chan/ui/view/ThumbnailImageView.java diff --git a/Clover/src/org/floens/chan/utils/IOUtils.java b/Clover/app/src/main/java/org/floens/chan/utils/IOUtils.java similarity index 100% rename from Clover/src/org/floens/chan/utils/IOUtils.java rename to Clover/app/src/main/java/org/floens/chan/utils/IOUtils.java diff --git a/Clover/src/org/floens/chan/utils/IconCache.java b/Clover/app/src/main/java/org/floens/chan/utils/IconCache.java similarity index 100% rename from Clover/src/org/floens/chan/utils/IconCache.java rename to Clover/app/src/main/java/org/floens/chan/utils/IconCache.java diff --git a/Clover/src/org/floens/chan/utils/ImageDecoder.java b/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java similarity index 100% rename from Clover/src/org/floens/chan/utils/ImageDecoder.java rename to Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java diff --git a/Clover/src/org/floens/chan/utils/ImageSaver.java b/Clover/app/src/main/java/org/floens/chan/utils/ImageSaver.java similarity index 100% rename from Clover/src/org/floens/chan/utils/ImageSaver.java rename to Clover/app/src/main/java/org/floens/chan/utils/ImageSaver.java diff --git a/Clover/src/org/floens/chan/utils/Logger.java b/Clover/app/src/main/java/org/floens/chan/utils/Logger.java similarity index 100% rename from Clover/src/org/floens/chan/utils/Logger.java rename to Clover/app/src/main/java/org/floens/chan/utils/Logger.java diff --git a/Clover/src/org/floens/chan/utils/SimpleAnimatorListener.java b/Clover/app/src/main/java/org/floens/chan/utils/SimpleAnimatorListener.java similarity index 100% rename from Clover/src/org/floens/chan/utils/SimpleAnimatorListener.java rename to Clover/app/src/main/java/org/floens/chan/utils/SimpleAnimatorListener.java diff --git a/Clover/src/org/floens/chan/utils/Time.java b/Clover/app/src/main/java/org/floens/chan/utils/Time.java similarity index 100% rename from Clover/src/org/floens/chan/utils/Time.java rename to Clover/app/src/main/java/org/floens/chan/utils/Time.java diff --git a/Clover/src/org/floens/chan/utils/Utils.java b/Clover/app/src/main/java/org/floens/chan/utils/Utils.java similarity index 100% rename from Clover/src/org/floens/chan/utils/Utils.java rename to Clover/app/src/main/java/org/floens/chan/utils/Utils.java diff --git a/Clover/src/uk/co/senab/photoview/Compat.java b/Clover/app/src/main/java/uk/co/senab/photoview/Compat.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/Compat.java rename to Clover/app/src/main/java/uk/co/senab/photoview/Compat.java diff --git a/Clover/src/uk/co/senab/photoview/DefaultOnDoubleTapListener.java b/Clover/app/src/main/java/uk/co/senab/photoview/DefaultOnDoubleTapListener.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/DefaultOnDoubleTapListener.java rename to Clover/app/src/main/java/uk/co/senab/photoview/DefaultOnDoubleTapListener.java diff --git a/Clover/src/uk/co/senab/photoview/IPhotoView.java b/Clover/app/src/main/java/uk/co/senab/photoview/IPhotoView.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/IPhotoView.java rename to Clover/app/src/main/java/uk/co/senab/photoview/IPhotoView.java diff --git a/Clover/src/uk/co/senab/photoview/PhotoView.java b/Clover/app/src/main/java/uk/co/senab/photoview/PhotoView.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/PhotoView.java rename to Clover/app/src/main/java/uk/co/senab/photoview/PhotoView.java diff --git a/Clover/src/uk/co/senab/photoview/PhotoViewAttacher.java b/Clover/app/src/main/java/uk/co/senab/photoview/PhotoViewAttacher.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/PhotoViewAttacher.java rename to Clover/app/src/main/java/uk/co/senab/photoview/PhotoViewAttacher.java diff --git a/Clover/src/uk/co/senab/photoview/gestures/CupcakeGestureDetector.java b/Clover/app/src/main/java/uk/co/senab/photoview/gestures/CupcakeGestureDetector.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/gestures/CupcakeGestureDetector.java rename to Clover/app/src/main/java/uk/co/senab/photoview/gestures/CupcakeGestureDetector.java diff --git a/Clover/src/uk/co/senab/photoview/gestures/EclairGestureDetector.java b/Clover/app/src/main/java/uk/co/senab/photoview/gestures/EclairGestureDetector.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/gestures/EclairGestureDetector.java rename to Clover/app/src/main/java/uk/co/senab/photoview/gestures/EclairGestureDetector.java diff --git a/Clover/src/uk/co/senab/photoview/gestures/FroyoGestureDetector.java b/Clover/app/src/main/java/uk/co/senab/photoview/gestures/FroyoGestureDetector.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/gestures/FroyoGestureDetector.java rename to Clover/app/src/main/java/uk/co/senab/photoview/gestures/FroyoGestureDetector.java diff --git a/Clover/src/uk/co/senab/photoview/gestures/GestureDetector.java b/Clover/app/src/main/java/uk/co/senab/photoview/gestures/GestureDetector.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/gestures/GestureDetector.java rename to Clover/app/src/main/java/uk/co/senab/photoview/gestures/GestureDetector.java diff --git a/Clover/src/uk/co/senab/photoview/gestures/OnGestureListener.java b/Clover/app/src/main/java/uk/co/senab/photoview/gestures/OnGestureListener.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/gestures/OnGestureListener.java rename to Clover/app/src/main/java/uk/co/senab/photoview/gestures/OnGestureListener.java diff --git a/Clover/src/uk/co/senab/photoview/gestures/VersionedGestureDetector.java b/Clover/app/src/main/java/uk/co/senab/photoview/gestures/VersionedGestureDetector.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/gestures/VersionedGestureDetector.java rename to Clover/app/src/main/java/uk/co/senab/photoview/gestures/VersionedGestureDetector.java diff --git a/Clover/src/uk/co/senab/photoview/log/LogManager.java b/Clover/app/src/main/java/uk/co/senab/photoview/log/LogManager.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/log/LogManager.java rename to Clover/app/src/main/java/uk/co/senab/photoview/log/LogManager.java diff --git a/Clover/src/uk/co/senab/photoview/log/Logger.java b/Clover/app/src/main/java/uk/co/senab/photoview/log/Logger.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/log/Logger.java rename to Clover/app/src/main/java/uk/co/senab/photoview/log/Logger.java diff --git a/Clover/src/uk/co/senab/photoview/log/LoggerDefault.java b/Clover/app/src/main/java/uk/co/senab/photoview/log/LoggerDefault.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/log/LoggerDefault.java rename to Clover/app/src/main/java/uk/co/senab/photoview/log/LoggerDefault.java diff --git a/Clover/src/uk/co/senab/photoview/scrollerproxy/GingerScroller.java b/Clover/app/src/main/java/uk/co/senab/photoview/scrollerproxy/GingerScroller.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/scrollerproxy/GingerScroller.java rename to Clover/app/src/main/java/uk/co/senab/photoview/scrollerproxy/GingerScroller.java diff --git a/Clover/src/uk/co/senab/photoview/scrollerproxy/IcsScroller.java b/Clover/app/src/main/java/uk/co/senab/photoview/scrollerproxy/IcsScroller.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/scrollerproxy/IcsScroller.java rename to Clover/app/src/main/java/uk/co/senab/photoview/scrollerproxy/IcsScroller.java diff --git a/Clover/src/uk/co/senab/photoview/scrollerproxy/PreGingerScroller.java b/Clover/app/src/main/java/uk/co/senab/photoview/scrollerproxy/PreGingerScroller.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/scrollerproxy/PreGingerScroller.java rename to Clover/app/src/main/java/uk/co/senab/photoview/scrollerproxy/PreGingerScroller.java diff --git a/Clover/src/uk/co/senab/photoview/scrollerproxy/ScrollerProxy.java b/Clover/app/src/main/java/uk/co/senab/photoview/scrollerproxy/ScrollerProxy.java similarity index 100% rename from Clover/src/uk/co/senab/photoview/scrollerproxy/ScrollerProxy.java rename to Clover/app/src/main/java/uk/co/senab/photoview/scrollerproxy/ScrollerProxy.java diff --git a/Clover/res/anim/fade_in.xml b/Clover/app/src/main/res/anim/fade_in.xml similarity index 100% rename from Clover/res/anim/fade_in.xml rename to Clover/app/src/main/res/anim/fade_in.xml diff --git a/Clover/res/anim/fade_out.xml b/Clover/app/src/main/res/anim/fade_out.xml similarity index 100% rename from Clover/res/anim/fade_out.xml rename to Clover/app/src/main/res/anim/fade_out.xml diff --git a/Clover/res/anim/slide_from_bottom.xml b/Clover/app/src/main/res/anim/slide_from_bottom.xml similarity index 100% rename from Clover/res/anim/slide_from_bottom.xml rename to Clover/app/src/main/res/anim/slide_from_bottom.xml diff --git a/Clover/res/anim/slide_to_bottom.xml b/Clover/app/src/main/res/anim/slide_to_bottom.xml similarity index 100% rename from Clover/res/anim/slide_to_bottom.xml rename to Clover/app/src/main/res/anim/slide_to_bottom.xml diff --git a/Clover/res/drawable-hdpi/drawer_shadow.9.png b/Clover/app/src/main/res/drawable-hdpi/drawer_shadow.9.png similarity index 100% rename from Clover/res/drawable-hdpi/drawer_shadow.9.png rename to Clover/app/src/main/res/drawable-hdpi/drawer_shadow.9.png diff --git a/Clover/res/drawable-hdpi/ic_action_back.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_back.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_back.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_back.png diff --git a/Clover/res/drawable-hdpi/ic_action_cancel.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_cancel.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_cancel.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_cancel.png diff --git a/Clover/res/drawable-hdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_chat.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_chat.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_chat.png diff --git a/Clover/res/drawable-hdpi/ic_action_discard.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_discard.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_discard.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_discard.png diff --git a/Clover/res/drawable-hdpi/ic_action_done.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_done.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_done.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_done.png diff --git a/Clover/res/drawable-hdpi/ic_action_make_available_offline.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_make_available_offline.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_make_available_offline.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_make_available_offline.png diff --git a/Clover/res/drawable-hdpi/ic_action_new.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_new.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_new.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_new.png diff --git a/Clover/res/drawable-hdpi/ic_action_pause.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_pause.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_pause.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_pause.png diff --git a/Clover/res/drawable-hdpi/ic_action_picture.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_picture.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_picture.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_picture.png diff --git a/Clover/res/drawable-hdpi/ic_action_play.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_play.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_play.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_play.png diff --git a/Clover/res/drawable-hdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_refresh.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_action_refresh.png rename to Clover/app/src/main/res/drawable-hdpi/ic_action_refresh.png diff --git a/Clover/res/drawable-hdpi/ic_drawer.png b/Clover/app/src/main/res/drawable-hdpi/ic_drawer.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_drawer.png rename to Clover/app/src/main/res/drawable-hdpi/ic_drawer.png diff --git a/Clover/res/drawable-hdpi/ic_launcher.png b/Clover/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_launcher.png rename to Clover/app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/Clover/res/drawable-hdpi/ic_navigation_previous_item.png b/Clover/app/src/main/res/drawable-hdpi/ic_navigation_previous_item.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_navigation_previous_item.png rename to Clover/app/src/main/res/drawable-hdpi/ic_navigation_previous_item.png diff --git a/Clover/res/drawable-hdpi/ic_stat_notify.png b/Clover/app/src/main/res/drawable-hdpi/ic_stat_notify.png similarity index 100% rename from Clover/res/drawable-hdpi/ic_stat_notify.png rename to Clover/app/src/main/res/drawable-hdpi/ic_stat_notify.png diff --git a/Clover/res/drawable-hdpi/panel_shadow.9.png b/Clover/app/src/main/res/drawable-hdpi/panel_shadow.9.png similarity index 100% rename from Clover/res/drawable-hdpi/panel_shadow.9.png rename to Clover/app/src/main/res/drawable-hdpi/panel_shadow.9.png diff --git a/Clover/res/drawable-hdpi/skip_arrow_down.png b/Clover/app/src/main/res/drawable-hdpi/skip_arrow_down.png similarity index 100% rename from Clover/res/drawable-hdpi/skip_arrow_down.png rename to Clover/app/src/main/res/drawable-hdpi/skip_arrow_down.png diff --git a/Clover/res/drawable-hdpi/skip_arrow_up.png b/Clover/app/src/main/res/drawable-hdpi/skip_arrow_up.png similarity index 100% rename from Clover/res/drawable-hdpi/skip_arrow_up.png rename to Clover/app/src/main/res/drawable-hdpi/skip_arrow_up.png diff --git a/Clover/res/drawable-mdpi/closed_icon.png b/Clover/app/src/main/res/drawable-mdpi/closed_icon.png similarity index 100% rename from Clover/res/drawable-mdpi/closed_icon.png rename to Clover/app/src/main/res/drawable-mdpi/closed_icon.png diff --git a/Clover/res/drawable-mdpi/drawer_shadow.9.png b/Clover/app/src/main/res/drawable-mdpi/drawer_shadow.9.png similarity index 100% rename from Clover/res/drawable-mdpi/drawer_shadow.9.png rename to Clover/app/src/main/res/drawable-mdpi/drawer_shadow.9.png diff --git a/Clover/res/drawable-mdpi/ic_action_back.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_back.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_back.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_back.png diff --git a/Clover/res/drawable-mdpi/ic_action_cancel.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_cancel.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_cancel.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_cancel.png diff --git a/Clover/res/drawable-mdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_chat.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_chat.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_chat.png diff --git a/Clover/res/drawable-mdpi/ic_action_discard.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_discard.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_discard.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_discard.png diff --git a/Clover/res/drawable-mdpi/ic_action_done.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_done.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_done.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_done.png diff --git a/Clover/res/drawable-mdpi/ic_action_make_available_offline.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_make_available_offline.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_make_available_offline.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_make_available_offline.png diff --git a/Clover/res/drawable-mdpi/ic_action_new.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_new.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_new.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_new.png diff --git a/Clover/res/drawable-mdpi/ic_action_pause.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_pause.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_pause.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_pause.png diff --git a/Clover/res/drawable-mdpi/ic_action_picture.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_picture.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_picture.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_picture.png diff --git a/Clover/res/drawable-mdpi/ic_action_play.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_play.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_play.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_play.png diff --git a/Clover/res/drawable-mdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_refresh.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_action_refresh.png rename to Clover/app/src/main/res/drawable-mdpi/ic_action_refresh.png diff --git a/Clover/res/drawable-mdpi/ic_drawer.png b/Clover/app/src/main/res/drawable-mdpi/ic_drawer.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_drawer.png rename to Clover/app/src/main/res/drawable-mdpi/ic_drawer.png diff --git a/Clover/res/drawable-mdpi/ic_launcher.png b/Clover/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_launcher.png rename to Clover/app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/Clover/res/drawable-mdpi/ic_navigation_previous_item.png b/Clover/app/src/main/res/drawable-mdpi/ic_navigation_previous_item.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_navigation_previous_item.png rename to Clover/app/src/main/res/drawable-mdpi/ic_navigation_previous_item.png diff --git a/Clover/res/drawable-mdpi/ic_stat_notify.png b/Clover/app/src/main/res/drawable-mdpi/ic_stat_notify.png similarity index 100% rename from Clover/res/drawable-mdpi/ic_stat_notify.png rename to Clover/app/src/main/res/drawable-mdpi/ic_stat_notify.png diff --git a/Clover/res/drawable-mdpi/panel_shadow.9.png b/Clover/app/src/main/res/drawable-mdpi/panel_shadow.9.png similarity index 100% rename from Clover/res/drawable-mdpi/panel_shadow.9.png rename to Clover/app/src/main/res/drawable-mdpi/panel_shadow.9.png diff --git a/Clover/res/drawable-mdpi/skip_arrow_down.png b/Clover/app/src/main/res/drawable-mdpi/skip_arrow_down.png similarity index 100% rename from Clover/res/drawable-mdpi/skip_arrow_down.png rename to Clover/app/src/main/res/drawable-mdpi/skip_arrow_down.png diff --git a/Clover/res/drawable-mdpi/skip_arrow_up.png b/Clover/app/src/main/res/drawable-mdpi/skip_arrow_up.png similarity index 100% rename from Clover/res/drawable-mdpi/skip_arrow_up.png rename to Clover/app/src/main/res/drawable-mdpi/skip_arrow_up.png diff --git a/Clover/res/drawable-mdpi/sticky_icon.png b/Clover/app/src/main/res/drawable-mdpi/sticky_icon.png similarity index 100% rename from Clover/res/drawable-mdpi/sticky_icon.png rename to Clover/app/src/main/res/drawable-mdpi/sticky_icon.png diff --git a/Clover/res/drawable-xhdpi/drawer_shadow.9.png b/Clover/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png similarity index 100% rename from Clover/res/drawable-xhdpi/drawer_shadow.9.png rename to Clover/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/Clover/res/drawable-xhdpi/ic_action_back.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_back.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_back.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_back.png diff --git a/Clover/res/drawable-xhdpi/ic_action_cancel.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_cancel.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_cancel.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_cancel.png diff --git a/Clover/res/drawable-xhdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_chat.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_chat.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_chat.png diff --git a/Clover/res/drawable-xhdpi/ic_action_discard.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_discard.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_discard.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_discard.png diff --git a/Clover/res/drawable-xhdpi/ic_action_done.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_done.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_done.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_done.png diff --git a/Clover/res/drawable-xhdpi/ic_action_make_available_offline.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_make_available_offline.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_make_available_offline.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_make_available_offline.png diff --git a/Clover/res/drawable-xhdpi/ic_action_new.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_new.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_new.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_new.png diff --git a/Clover/res/drawable-xhdpi/ic_action_pause.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_pause.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_pause.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_pause.png diff --git a/Clover/res/drawable-xhdpi/ic_action_picture.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_picture.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_picture.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_picture.png diff --git a/Clover/res/drawable-xhdpi/ic_action_play.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_play.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_play.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_play.png diff --git a/Clover/res/drawable-xhdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_refresh.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_action_refresh.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_action_refresh.png diff --git a/Clover/res/drawable-xhdpi/ic_drawer.png b/Clover/app/src/main/res/drawable-xhdpi/ic_drawer.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_drawer.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_drawer.png diff --git a/Clover/res/drawable-xhdpi/ic_launcher.png b/Clover/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_launcher.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/Clover/res/drawable-xhdpi/ic_navigation_previous_item.png b/Clover/app/src/main/res/drawable-xhdpi/ic_navigation_previous_item.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_navigation_previous_item.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_navigation_previous_item.png diff --git a/Clover/res/drawable-xhdpi/ic_stat_notify.png b/Clover/app/src/main/res/drawable-xhdpi/ic_stat_notify.png similarity index 100% rename from Clover/res/drawable-xhdpi/ic_stat_notify.png rename to Clover/app/src/main/res/drawable-xhdpi/ic_stat_notify.png diff --git a/Clover/res/drawable-xhdpi/panel_shadow.9.png b/Clover/app/src/main/res/drawable-xhdpi/panel_shadow.9.png similarity index 100% rename from Clover/res/drawable-xhdpi/panel_shadow.9.png rename to Clover/app/src/main/res/drawable-xhdpi/panel_shadow.9.png diff --git a/Clover/res/drawable-xhdpi/skip_arrow_down.png b/Clover/app/src/main/res/drawable-xhdpi/skip_arrow_down.png similarity index 100% rename from Clover/res/drawable-xhdpi/skip_arrow_down.png rename to Clover/app/src/main/res/drawable-xhdpi/skip_arrow_down.png diff --git a/Clover/res/drawable-xhdpi/skip_arrow_up.png b/Clover/app/src/main/res/drawable-xhdpi/skip_arrow_up.png similarity index 100% rename from Clover/res/drawable-xhdpi/skip_arrow_up.png rename to Clover/app/src/main/res/drawable-xhdpi/skip_arrow_up.png diff --git a/Clover/res/drawable-xxhdpi/drawer_shadow.9.png b/Clover/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png similarity index 100% rename from Clover/res/drawable-xxhdpi/drawer_shadow.9.png rename to Clover/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_back.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_back.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_back.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_back.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_cancel.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_cancel.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_cancel.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_cancel.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_chat.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_chat.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_chat.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_discard.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_discard.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_discard.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_discard.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_done.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_done.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_done.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_done.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_make_available_offline.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_make_available_offline.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_make_available_offline.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_make_available_offline.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_new.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_new.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_new.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_new.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_pause.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_pause.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_pause.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_pause.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_picture.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_picture.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_picture.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_picture.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_play.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_play.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_play.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_play.png diff --git a/Clover/res/drawable-xxhdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_action_refresh.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png diff --git a/Clover/res/drawable-xxhdpi/ic_drawer.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_drawer.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_drawer.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_drawer.png diff --git a/Clover/res/drawable-xxhdpi/ic_launcher.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_launcher.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/Clover/res/drawable-xxhdpi/ic_navigation_previous_item.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_navigation_previous_item.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_navigation_previous_item.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_navigation_previous_item.png diff --git a/Clover/res/drawable-xxhdpi/ic_stat_notify.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png similarity index 100% rename from Clover/res/drawable-xxhdpi/ic_stat_notify.png rename to Clover/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png diff --git a/Clover/res/drawable-xxhdpi/panel_shadow.9.png b/Clover/app/src/main/res/drawable-xxhdpi/panel_shadow.9.png similarity index 100% rename from Clover/res/drawable-xxhdpi/panel_shadow.9.png rename to Clover/app/src/main/res/drawable-xxhdpi/panel_shadow.9.png diff --git a/Clover/res/drawable-xxhdpi/skip_arrow_down.png b/Clover/app/src/main/res/drawable-xxhdpi/skip_arrow_down.png similarity index 100% rename from Clover/res/drawable-xxhdpi/skip_arrow_down.png rename to Clover/app/src/main/res/drawable-xxhdpi/skip_arrow_down.png diff --git a/Clover/res/drawable-xxhdpi/skip_arrow_up.png b/Clover/app/src/main/res/drawable-xxhdpi/skip_arrow_up.png similarity index 100% rename from Clover/res/drawable-xxhdpi/skip_arrow_up.png rename to Clover/app/src/main/res/drawable-xxhdpi/skip_arrow_up.png diff --git a/Clover/res/drawable-xxxhdpi/ic_launcher.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from Clover/res/drawable-xxxhdpi/ic_launcher.png rename to Clover/app/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/Clover/res/drawable-xxxhdpi/skip_arrow_down.png b/Clover/app/src/main/res/drawable-xxxhdpi/skip_arrow_down.png similarity index 100% rename from Clover/res/drawable-xxxhdpi/skip_arrow_down.png rename to Clover/app/src/main/res/drawable-xxxhdpi/skip_arrow_down.png diff --git a/Clover/res/drawable-xxxhdpi/skip_arrow_up.png b/Clover/app/src/main/res/drawable-xxxhdpi/skip_arrow_up.png similarity index 100% rename from Clover/res/drawable-xxxhdpi/skip_arrow_up.png rename to Clover/app/src/main/res/drawable-xxxhdpi/skip_arrow_up.png diff --git a/Clover/res/drawable/pin_icon_blue.xml b/Clover/app/src/main/res/drawable/pin_icon_blue.xml similarity index 100% rename from Clover/res/drawable/pin_icon_blue.xml rename to Clover/app/src/main/res/drawable/pin_icon_blue.xml diff --git a/Clover/res/drawable/pin_icon_gray.xml b/Clover/app/src/main/res/drawable/pin_icon_gray.xml similarity index 100% rename from Clover/res/drawable/pin_icon_gray.xml rename to Clover/app/src/main/res/drawable/pin_icon_gray.xml diff --git a/Clover/res/drawable/pin_icon_red.xml b/Clover/app/src/main/res/drawable/pin_icon_red.xml similarity index 100% rename from Clover/res/drawable/pin_icon_red.xml rename to Clover/app/src/main/res/drawable/pin_icon_red.xml diff --git a/Clover/res/layout/activity_base.xml b/Clover/app/src/main/res/layout/activity_base.xml similarity index 100% rename from Clover/res/layout/activity_base.xml rename to Clover/app/src/main/res/layout/activity_base.xml diff --git a/Clover/res/layout/board_edit_item.xml b/Clover/app/src/main/res/layout/board_edit_item.xml similarity index 100% rename from Clover/res/layout/board_edit_item.xml rename to Clover/app/src/main/res/layout/board_edit_item.xml diff --git a/Clover/res/layout/board_select_spinner.xml b/Clover/app/src/main/res/layout/board_select_spinner.xml similarity index 100% rename from Clover/res/layout/board_select_spinner.xml rename to Clover/app/src/main/res/layout/board_select_spinner.xml diff --git a/Clover/res/layout/floatlabel_edittext.xml b/Clover/app/src/main/res/layout/floatlabel_edittext.xml similarity index 100% rename from Clover/res/layout/floatlabel_edittext.xml rename to Clover/app/src/main/res/layout/floatlabel_edittext.xml diff --git a/Clover/res/layout/image_pager.xml b/Clover/app/src/main/res/layout/image_pager.xml similarity index 100% rename from Clover/res/layout/image_pager.xml rename to Clover/app/src/main/res/layout/image_pager.xml diff --git a/Clover/res/layout/pin_item.xml b/Clover/app/src/main/res/layout/pin_item.xml similarity index 100% rename from Clover/res/layout/pin_item.xml rename to Clover/app/src/main/res/layout/pin_item.xml diff --git a/Clover/res/layout/pin_item_header.xml b/Clover/app/src/main/res/layout/pin_item_header.xml similarity index 100% rename from Clover/res/layout/pin_item_header.xml rename to Clover/app/src/main/res/layout/pin_item_header.xml diff --git a/Clover/res/layout/post_replies.xml b/Clover/app/src/main/res/layout/post_replies.xml similarity index 100% rename from Clover/res/layout/post_replies.xml rename to Clover/app/src/main/res/layout/post_replies.xml diff --git a/Clover/res/layout/preference_pass.xml b/Clover/app/src/main/res/layout/preference_pass.xml similarity index 100% rename from Clover/res/layout/preference_pass.xml rename to Clover/app/src/main/res/layout/preference_pass.xml diff --git a/Clover/res/layout/reply_captcha.xml b/Clover/app/src/main/res/layout/reply_captcha.xml similarity index 100% rename from Clover/res/layout/reply_captcha.xml rename to Clover/app/src/main/res/layout/reply_captcha.xml diff --git a/Clover/res/layout/reply_input.xml b/Clover/app/src/main/res/layout/reply_input.xml similarity index 100% rename from Clover/res/layout/reply_input.xml rename to Clover/app/src/main/res/layout/reply_input.xml diff --git a/Clover/res/layout/reply_view.xml b/Clover/app/src/main/res/layout/reply_view.xml similarity index 100% rename from Clover/res/layout/reply_view.xml rename to Clover/app/src/main/res/layout/reply_view.xml diff --git a/Clover/res/menu/action_bar_switch.xml b/Clover/app/src/main/res/menu/action_bar_switch.xml similarity index 100% rename from Clover/res/menu/action_bar_switch.xml rename to Clover/app/src/main/res/menu/action_bar_switch.xml diff --git a/Clover/res/menu/base.xml b/Clover/app/src/main/res/menu/base.xml similarity index 100% rename from Clover/res/menu/base.xml rename to Clover/app/src/main/res/menu/base.xml diff --git a/Clover/res/menu/board_edit.xml b/Clover/app/src/main/res/menu/board_edit.xml similarity index 100% rename from Clover/res/menu/board_edit.xml rename to Clover/app/src/main/res/menu/board_edit.xml diff --git a/Clover/res/menu/image_view.xml b/Clover/app/src/main/res/menu/image_view.xml similarity index 100% rename from Clover/res/menu/image_view.xml rename to Clover/app/src/main/res/menu/image_view.xml diff --git a/Clover/res/values-sw600dp/dimens.xml b/Clover/app/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from Clover/res/values-sw600dp/dimens.xml rename to Clover/app/src/main/res/values-sw600dp/dimens.xml diff --git a/Clover/res/values-sw720dp-land/dimens.xml b/Clover/app/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from Clover/res/values-sw720dp-land/dimens.xml rename to Clover/app/src/main/res/values-sw720dp-land/dimens.xml diff --git a/Clover/res/values/attrs.xml b/Clover/app/src/main/res/values/attrs.xml similarity index 100% rename from Clover/res/values/attrs.xml rename to Clover/app/src/main/res/values/attrs.xml diff --git a/Clover/res/values/colors.xml b/Clover/app/src/main/res/values/colors.xml similarity index 100% rename from Clover/res/values/colors.xml rename to Clover/app/src/main/res/values/colors.xml diff --git a/Clover/res/values/dimens.xml b/Clover/app/src/main/res/values/dimens.xml similarity index 100% rename from Clover/res/values/dimens.xml rename to Clover/app/src/main/res/values/dimens.xml diff --git a/Clover/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml similarity index 100% rename from Clover/res/values/strings.xml rename to Clover/app/src/main/res/values/strings.xml diff --git a/Clover/res/values/styles.xml b/Clover/app/src/main/res/values/styles.xml similarity index 100% rename from Clover/res/values/styles.xml rename to Clover/app/src/main/res/values/styles.xml diff --git a/Clover/res/xml/preference.xml b/Clover/app/src/main/res/xml/preference.xml similarity index 100% rename from Clover/res/xml/preference.xml rename to Clover/app/src/main/res/xml/preference.xml diff --git a/Clover/res/xml/preference_pass.xml b/Clover/app/src/main/res/xml/preference_pass.xml similarity index 100% rename from Clover/res/xml/preference_pass.xml rename to Clover/app/src/main/res/xml/preference_pass.xml diff --git a/Clover/res/xml/preference_watch.xml b/Clover/app/src/main/res/xml/preference_watch.xml similarity index 100% rename from Clover/res/xml/preference_watch.xml rename to Clover/app/src/main/res/xml/preference_watch.xml diff --git a/Clover/build.gradle b/Clover/build.gradle new file mode 100644 index 00000000..0ffc7372 --- /dev/null +++ b/Clover/build.gradle @@ -0,0 +1,15 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.9.+' + } +} + +allprojects { + repositories { + mavenCentral() + } +} diff --git a/Clover/docs/ormlite-android-4.48-javadoc.jar b/Clover/docs/ormlite-android-4.48-javadoc.jar deleted file mode 100644 index 52326354..00000000 Binary files a/Clover/docs/ormlite-android-4.48-javadoc.jar and /dev/null differ diff --git a/Clover/docs/ormlite-android-4.48-sources.jar b/Clover/docs/ormlite-android-4.48-sources.jar deleted file mode 100644 index ab74f592..00000000 Binary files a/Clover/docs/ormlite-android-4.48-sources.jar and /dev/null differ diff --git a/Clover/docs/ormlite-core-4.48-javadoc.jar b/Clover/docs/ormlite-core-4.48-javadoc.jar deleted file mode 100644 index 7c9d0df4..00000000 Binary files a/Clover/docs/ormlite-core-4.48-javadoc.jar and /dev/null differ diff --git a/Clover/docs/ormlite-core-4.48-sources.jar b/Clover/docs/ormlite-core-4.48-sources.jar deleted file mode 100644 index b411c8f1..00000000 Binary files a/Clover/docs/ormlite-core-4.48-sources.jar and /dev/null differ diff --git a/Clover/gradle/wrapper/gradle-wrapper.jar b/Clover/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..8c0fb64a Binary files /dev/null and b/Clover/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Clover/gradle/wrapper/gradle-wrapper.properties b/Clover/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..5de946b0 --- /dev/null +++ b/Clover/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=http\://services.gradle.org/distributions/gradle-1.10-all.zip diff --git a/Clover/gradlew b/Clover/gradlew new file mode 100644 index 00000000..91a7e269 --- /dev/null +++ b/Clover/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/Clover/gradlew.bat b/Clover/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/Clover/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/Clover/libs/jsoup-1.7.3.jar b/Clover/libs/jsoup-1.7.3.jar deleted file mode 100644 index 654797a3..00000000 Binary files a/Clover/libs/jsoup-1.7.3.jar and /dev/null differ diff --git a/Clover/libs/ormlite-android-4.48.jar b/Clover/libs/ormlite-android-4.48.jar deleted file mode 100644 index 75c2af42..00000000 Binary files a/Clover/libs/ormlite-android-4.48.jar and /dev/null differ diff --git a/Clover/libs/ormlite-core-4.48.jar b/Clover/libs/ormlite-core-4.48.jar deleted file mode 100644 index e3e13371..00000000 Binary files a/Clover/libs/ormlite-core-4.48.jar and /dev/null differ diff --git a/Clover/proguard-project.txt b/Clover/proguard-project.txt deleted file mode 100644 index f2fe1559..00000000 --- a/Clover/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/Clover/project.properties b/Clover/project.properties deleted file mode 100644 index 4ab12569..00000000 --- a/Clover/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-19 diff --git a/Clover/settings.gradle b/Clover/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/Clover/settings.gradle @@ -0,0 +1 @@ +include ':app'