diff --git a/.gitignore b/.gitignore index 416fd592..462b229e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,16 @@ -# built application files -*.apk -*.ap_ +# ignore Gradle files +.gradle/ +build/ -# files for the dex VM -*.dex - -# Java class files -*.class - -# generated files -bin/ -gen/ -.apt_generated/ - -# Local configuration file (sdk path, etc) +# local configuration file (sdk path, etc) local.properties +signing.gradle -# Eclipse project files -.classpath -.project -.settings/ -.local.properties +# IntelliJ +*.iml +*.ipr +*.iws +.idea -# OS temp files +# Mac .DS_Store diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 00000000..622a9fa6 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,61 @@ +apply plugin: 'com.android.application' +apply plugin: 'android-apt' +apply from: '../signing.gradle' + +android { + compileSdkVersion 19 + buildToolsVersion '20.0.0' + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 19 + versionCode 216 + versionName '2.3.0' + resValue "string", "search_history_authority", applicationId + ".search.SearchHistoryProvider" + } + signingConfigs { + release { + storeFile STORE_FILE + storePassword STORE_PASSWORD + keyAlias KEY_ALIAS + keyPassword KEY_PASSWORD + } + } + buildTypes { + release { + runProguard false + signingConfig signingConfigs.release + } + } + productFlavors { + full { + applicationId 'org.transdroid.full' + } + lite { + applicationId 'org.transdroid.lite' + } + } + lintOptions { + disable 'MissingTranslation', 'ExtraTranslation' + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'org.androidannotations:androidannotations-api:3.1' + compile 'com.j256.ormlite:ormlite-core:4.48' + compile 'com.j256.ormlite:ormlite-android:4.48' + compile 'com.github.chrisbanes.actionbarpulltorefresh:library:0.8' + compile 'de.keyboardsurfer.android.widget:crouton:1.8.+' + compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.+' + apt "org.androidannotations:androidannotations:3.1" +} + +apt { + arguments { + androidManifestFile variant.processResources.manifestFile + resourcePackageName 'org.transdroid' + //logLevel 'INFO' + //logFile '/Users/erickok/Dev/transdroid/transdroid/app/build/aa-log.txt' + } +} diff --git a/full/res/values/bools.xml b/app/src/full/res/values/bools.xml similarity index 100% rename from full/res/values/bools.xml rename to app/src/full/res/values/bools.xml diff --git a/full/res/values/strings.xml b/app/src/full/res/values/strings.xml similarity index 100% rename from full/res/values/strings.xml rename to app/src/full/res/values/strings.xml diff --git a/lite/res/values/bools.xml b/app/src/lite/res/values/bools.xml similarity index 100% rename from lite/res/values/bools.xml rename to app/src/lite/res/values/bools.xml diff --git a/lite/res/values/strings.xml b/app/src/lite/res/values/strings.xml similarity index 100% rename from lite/res/values/strings.xml rename to app/src/lite/res/values/strings.xml diff --git a/full/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 97% rename from full/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index 2c5feef7..ff92f30d 100644 --- a/full/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,13 +17,9 @@ --> + package="org.transdroid" > - + diff --git a/lib/src/com/android/internalcopy/http/multipart/BitCometFilePart.java b/app/src/main/java/com/android/internalcopy/http/multipart/BitCometFilePart.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/BitCometFilePart.java rename to app/src/main/java/com/android/internalcopy/http/multipart/BitCometFilePart.java diff --git a/lib/src/com/android/internalcopy/http/multipart/ByteArrayPartSource.java b/app/src/main/java/com/android/internalcopy/http/multipart/ByteArrayPartSource.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/ByteArrayPartSource.java rename to app/src/main/java/com/android/internalcopy/http/multipart/ByteArrayPartSource.java diff --git a/lib/src/com/android/internalcopy/http/multipart/FilePart.java b/app/src/main/java/com/android/internalcopy/http/multipart/FilePart.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/FilePart.java rename to app/src/main/java/com/android/internalcopy/http/multipart/FilePart.java diff --git a/lib/src/com/android/internalcopy/http/multipart/FilePartSource.java b/app/src/main/java/com/android/internalcopy/http/multipart/FilePartSource.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/FilePartSource.java rename to app/src/main/java/com/android/internalcopy/http/multipart/FilePartSource.java diff --git a/lib/src/com/android/internalcopy/http/multipart/MultipartEntity.java b/app/src/main/java/com/android/internalcopy/http/multipart/MultipartEntity.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/MultipartEntity.java rename to app/src/main/java/com/android/internalcopy/http/multipart/MultipartEntity.java diff --git a/lib/src/com/android/internalcopy/http/multipart/Part.java b/app/src/main/java/com/android/internalcopy/http/multipart/Part.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/Part.java rename to app/src/main/java/com/android/internalcopy/http/multipart/Part.java diff --git a/lib/src/com/android/internalcopy/http/multipart/PartBase.java b/app/src/main/java/com/android/internalcopy/http/multipart/PartBase.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/PartBase.java rename to app/src/main/java/com/android/internalcopy/http/multipart/PartBase.java diff --git a/lib/src/com/android/internalcopy/http/multipart/PartSource.java b/app/src/main/java/com/android/internalcopy/http/multipart/PartSource.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/PartSource.java rename to app/src/main/java/com/android/internalcopy/http/multipart/PartSource.java diff --git a/lib/src/com/android/internalcopy/http/multipart/StringPart.java b/app/src/main/java/com/android/internalcopy/http/multipart/StringPart.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/StringPart.java rename to app/src/main/java/com/android/internalcopy/http/multipart/StringPart.java diff --git a/lib/src/com/android/internalcopy/http/multipart/Utf8StringPart.java b/app/src/main/java/com/android/internalcopy/http/multipart/Utf8StringPart.java similarity index 100% rename from lib/src/com/android/internalcopy/http/multipart/Utf8StringPart.java rename to app/src/main/java/com/android/internalcopy/http/multipart/Utf8StringPart.java diff --git a/lib/src/de/timroes/axmlrpc/Call.java b/app/src/main/java/de/timroes/axmlrpc/Call.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/Call.java rename to app/src/main/java/de/timroes/axmlrpc/Call.java diff --git a/lib/src/de/timroes/axmlrpc/ResponseParser.java b/app/src/main/java/de/timroes/axmlrpc/ResponseParser.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/ResponseParser.java rename to app/src/main/java/de/timroes/axmlrpc/ResponseParser.java diff --git a/lib/src/de/timroes/axmlrpc/XMLRPCCallback.java b/app/src/main/java/de/timroes/axmlrpc/XMLRPCCallback.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/XMLRPCCallback.java rename to app/src/main/java/de/timroes/axmlrpc/XMLRPCCallback.java diff --git a/lib/src/de/timroes/axmlrpc/XMLRPCClient.java b/app/src/main/java/de/timroes/axmlrpc/XMLRPCClient.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/XMLRPCClient.java rename to app/src/main/java/de/timroes/axmlrpc/XMLRPCClient.java diff --git a/lib/src/de/timroes/axmlrpc/XMLRPCException.java b/app/src/main/java/de/timroes/axmlrpc/XMLRPCException.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/XMLRPCException.java rename to app/src/main/java/de/timroes/axmlrpc/XMLRPCException.java diff --git a/lib/src/de/timroes/axmlrpc/XMLRPCRuntimeException.java b/app/src/main/java/de/timroes/axmlrpc/XMLRPCRuntimeException.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/XMLRPCRuntimeException.java rename to app/src/main/java/de/timroes/axmlrpc/XMLRPCRuntimeException.java diff --git a/lib/src/de/timroes/axmlrpc/XMLRPCServerException.java b/app/src/main/java/de/timroes/axmlrpc/XMLRPCServerException.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/XMLRPCServerException.java rename to app/src/main/java/de/timroes/axmlrpc/XMLRPCServerException.java diff --git a/lib/src/de/timroes/axmlrpc/XMLRPCTimeoutException.java b/app/src/main/java/de/timroes/axmlrpc/XMLRPCTimeoutException.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/XMLRPCTimeoutException.java rename to app/src/main/java/de/timroes/axmlrpc/XMLRPCTimeoutException.java diff --git a/lib/src/de/timroes/axmlrpc/XMLUtil.java b/app/src/main/java/de/timroes/axmlrpc/XMLUtil.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/XMLUtil.java rename to app/src/main/java/de/timroes/axmlrpc/XMLUtil.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/ArraySerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/ArraySerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/ArraySerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/ArraySerializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/Base64Serializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/Base64Serializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/Base64Serializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/Base64Serializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/BooleanSerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/BooleanSerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/BooleanSerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/BooleanSerializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/DateTimeSerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/DateTimeSerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/DateTimeSerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/DateTimeSerializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/DoubleSerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/DoubleSerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/DoubleSerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/DoubleSerializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/IntSerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/IntSerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/IntSerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/IntSerializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/LongSerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/LongSerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/LongSerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/LongSerializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/NullSerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/NullSerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/NullSerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/NullSerializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/Serializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/Serializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/Serializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/Serializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/SerializerHandler.java b/app/src/main/java/de/timroes/axmlrpc/serializer/SerializerHandler.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/SerializerHandler.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/SerializerHandler.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/StringSerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/StringSerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/StringSerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/StringSerializer.java diff --git a/lib/src/de/timroes/axmlrpc/serializer/StructSerializer.java b/app/src/main/java/de/timroes/axmlrpc/serializer/StructSerializer.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/serializer/StructSerializer.java rename to app/src/main/java/de/timroes/axmlrpc/serializer/StructSerializer.java diff --git a/lib/src/de/timroes/axmlrpc/xmlcreator/SimpleXMLCreator.java b/app/src/main/java/de/timroes/axmlrpc/xmlcreator/SimpleXMLCreator.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/xmlcreator/SimpleXMLCreator.java rename to app/src/main/java/de/timroes/axmlrpc/xmlcreator/SimpleXMLCreator.java diff --git a/lib/src/de/timroes/axmlrpc/xmlcreator/XmlElement.java b/app/src/main/java/de/timroes/axmlrpc/xmlcreator/XmlElement.java similarity index 100% rename from lib/src/de/timroes/axmlrpc/xmlcreator/XmlElement.java rename to app/src/main/java/de/timroes/axmlrpc/xmlcreator/XmlElement.java diff --git a/lib/src/de/timroes/base64/Base64.java b/app/src/main/java/de/timroes/base64/Base64.java similarity index 100% rename from lib/src/de/timroes/base64/Base64.java rename to app/src/main/java/de/timroes/base64/Base64.java diff --git a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/AlphaPatternDrawable.java b/app/src/main/java/net/margaritov/preference/colorpicker/AlphaPatternDrawable.java similarity index 96% rename from external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/AlphaPatternDrawable.java rename to app/src/main/java/net/margaritov/preference/colorpicker/AlphaPatternDrawable.java index ff9c3c84..dbd04276 100644 --- a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/AlphaPatternDrawable.java +++ b/app/src/main/java/net/margaritov/preference/colorpicker/AlphaPatternDrawable.java @@ -44,7 +44,7 @@ public class AlphaPatternDrawable extends Drawable { /** * Bitmap in which the pattern will be cahched. */ - private Bitmap mBitmap; + private Bitmap mBitmap; public AlphaPatternDrawable(int rectangleSize) { mRectangleSize = rectangleSize; @@ -93,12 +93,12 @@ public class AlphaPatternDrawable extends Drawable { * recreate it each time draw() is called since it * takes a few milliseconds. */ - private void generatePatternBitmap(){ + private void generatePatternBitmap() { - if(getBounds().width() <= 0 || getBounds().height() <= 0){ + if (getBounds().width() <= 0 || getBounds().height() <= 0) { return; } - + mBitmap = Bitmap.createBitmap(getBounds().width(), getBounds().height(), Config.ARGB_8888); Canvas canvas = new Canvas(mBitmap); diff --git a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerDialog.java b/app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java similarity index 90% rename from external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerDialog.java rename to app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java index a63d48c3..fddf6984 100644 --- a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerDialog.java +++ b/app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java @@ -24,12 +24,9 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; -public class ColorPickerDialog - extends - Dialog - implements - ColorPickerView.OnColorChangedListener, - View.OnClickListener { +import org.transdroid.R; + +public class ColorPickerDialog extends Dialog implements ColorPickerView.OnColorChangedListener, View.OnClickListener { private ColorPickerView mColorPicker; @@ -41,7 +38,7 @@ public class ColorPickerDialog public interface OnColorChangedListener { public void onColorChanged(int color); } - + public ColorPickerDialog(Context context, int initialColor) { super(context); @@ -57,26 +54,23 @@ public class ColorPickerDialog } private void setUp(int color) { - + LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); - + View layout = inflater.inflate(R.layout.dialog_color_picker, null); setContentView(layout); setTitle(R.string.dialog_color_picker); - + mColorPicker = (ColorPickerView) layout.findViewById(R.id.color_picker_view); mOldColor = (ColorPickerPanelView) layout.findViewById(R.id.old_color_panel); mNewColor = (ColorPickerPanelView) layout.findViewById(R.id.new_color_panel); - - ((LinearLayout) mOldColor.getParent()).setPadding( - Math.round(mColorPicker.getDrawingOffset()), - 0, - Math.round(mColorPicker.getDrawingOffset()), - 0 - ); - + + ((LinearLayout) mOldColor.getParent()) + .setPadding(Math.round(mColorPicker.getDrawingOffset()), 0, Math.round(mColorPicker.getDrawingOffset()), + 0); + mOldColor.setOnClickListener(this); mNewColor.setOnClickListener(this); mColorPicker.setOnColorChangedListener(this); @@ -101,13 +95,13 @@ public class ColorPickerDialog public void setAlphaSliderVisible(boolean visible) { mColorPicker.setAlphaSliderVisible(visible); } - + /** * Set a OnColorChangedListener to get notified when the color * selected by the user has changed. * @param listener */ - public void setOnColorChangedListener(OnColorChangedListener listener){ + public void setOnColorChangedListener(OnColorChangedListener listener) { mListener = listener; } @@ -124,7 +118,7 @@ public class ColorPickerDialog } dismiss(); } - + @Override public Bundle onSaveInstanceState() { Bundle state = super.onSaveInstanceState(); @@ -132,7 +126,7 @@ public class ColorPickerDialog state.putInt("new_color", mNewColor.getColor()); return state; } - + @Override public void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); diff --git a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerPanelView.java b/app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPanelView.java similarity index 75% rename from external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerPanelView.java rename to app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPanelView.java index b0003662..4b305793 100644 --- a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerPanelView.java +++ b/app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPanelView.java @@ -28,7 +28,6 @@ import android.view.View; * It can be used to show the currently selected color which you will get from * the {@link ColorPickerView}. * @author Daniel Nilsson - * */ public class ColorPickerPanelView extends View { @@ -36,27 +35,27 @@ public class ColorPickerPanelView extends View { * The width in pixels of the border * surrounding the color panel. */ - private final static float BORDER_WIDTH_PX = 1; + private final static float BORDER_WIDTH_PX = 1; private float mDensity = 1f; - private int mBorderColor = 0xff6E6E6E; - private int mColor = 0xff000000; + private int mBorderColor = 0xff6E6E6E; + private int mColor = 0xff000000; - private Paint mBorderPaint; - private Paint mColorPaint; + private Paint mBorderPaint; + private Paint mColorPaint; - private RectF mDrawingRect; - private RectF mColorRect; + private RectF mDrawingRect; + private RectF mColorRect; private AlphaPatternDrawable mAlphaPattern; - public ColorPickerPanelView(Context context){ + public ColorPickerPanelView(Context context) { this(context, null); } - public ColorPickerPanelView(Context context, AttributeSet attrs){ + public ColorPickerPanelView(Context context, AttributeSet attrs) { this(context, attrs, 0); } @@ -65,7 +64,7 @@ public class ColorPickerPanelView extends View { init(); } - private void init(){ + private void init() { mBorderPaint = new Paint(); mColorPaint = new Paint(); mDensity = getContext().getResources().getDisplayMetrics().density; @@ -75,14 +74,14 @@ public class ColorPickerPanelView extends View { @Override protected void onDraw(Canvas canvas) { - final RectF rect = mColorRect; + final RectF rect = mColorRect; - if(BORDER_WIDTH_PX > 0){ + if (BORDER_WIDTH_PX > 0) { mBorderPaint.setColor(mBorderColor); canvas.drawRect(mDrawingRect, mBorderPaint); } - if(mAlphaPattern != null){ + if (mAlphaPattern != null) { mAlphaPattern.draw(canvas); } @@ -105,8 +104,8 @@ public class ColorPickerPanelView extends View { super.onSizeChanged(w, h, oldw, oldh); mDrawingRect = new RectF(); - mDrawingRect.left = getPaddingLeft(); - mDrawingRect.right = w - getPaddingRight(); + mDrawingRect.left = getPaddingLeft(); + mDrawingRect.right = w - getPaddingRight(); mDrawingRect.top = getPaddingTop(); mDrawingRect.bottom = h - getPaddingBottom(); @@ -114,24 +113,20 @@ public class ColorPickerPanelView extends View { } - private void setUpColorRect(){ - final RectF dRect = mDrawingRect; + private void setUpColorRect() { + final RectF dRect = mDrawingRect; float left = dRect.left + BORDER_WIDTH_PX; float top = dRect.top + BORDER_WIDTH_PX; float bottom = dRect.bottom - BORDER_WIDTH_PX; float right = dRect.right - BORDER_WIDTH_PX; - mColorRect = new RectF(left,top, right, bottom); + mColorRect = new RectF(left, top, right, bottom); - mAlphaPattern = new AlphaPatternDrawable((int)(5 * mDensity)); + mAlphaPattern = new AlphaPatternDrawable((int) (5 * mDensity)); - mAlphaPattern.setBounds( - Math.round(mColorRect.left), - Math.round(mColorRect.top), - Math.round(mColorRect.right), - Math.round(mColorRect.bottom) - ); + mAlphaPattern.setBounds(Math.round(mColorRect.left), Math.round(mColorRect.top), Math.round(mColorRect.right), + Math.round(mColorRect.bottom)); } @@ -139,7 +134,7 @@ public class ColorPickerPanelView extends View { * Set the color that should be shown by this view. * @param color */ - public void setColor(int color){ + public void setColor(int color) { mColor = color; invalidate(); } @@ -148,7 +143,7 @@ public class ColorPickerPanelView extends View { * Get the color currently show by this view. * @return */ - public int getColor(){ + public int getColor() { return mColor; } @@ -156,7 +151,7 @@ public class ColorPickerPanelView extends View { * Set the color of the border surrounding the panel. * @param color */ - public void setBorderColor(int color){ + public void setBorderColor(int color) { mBorderColor = color; invalidate(); } @@ -164,7 +159,7 @@ public class ColorPickerPanelView extends View { /** * Get the color of the border surrounding the panel. */ - public int getBorderColor(){ + public int getBorderColor() { return mBorderColor; } diff --git a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerPreference.java b/app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java similarity index 50% rename from external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerPreference.java rename to app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java index 8dded67a..da9a50fe 100644 --- a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerPreference.java +++ b/app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java @@ -34,12 +34,8 @@ import android.widget.LinearLayout; * A preference type that allows a user to choose a time * @author Sergey Margaritov */ -public class ColorPickerPreference - extends - Preference - implements - Preference.OnPreferenceClickListener, - ColorPickerDialog.OnColorChangedListener { +public class ColorPickerPreference extends Preference + implements Preference.OnPreferenceClickListener, ColorPickerDialog.OnColorChangedListener { View mView; ColorPickerDialog mDialog; @@ -88,17 +84,18 @@ public class ColorPickerPreference } private void setPreviewColor() { - if (mView == null) return; + if (mView == null) { + return; + } ImageView iView = new ImageView(getContext()); - LinearLayout widgetFrameView = ((LinearLayout)mView.findViewById(android.R.id.widget_frame)); - if (widgetFrameView == null) return; + LinearLayout widgetFrameView = ((LinearLayout) mView.findViewById(android.R.id.widget_frame)); + if (widgetFrameView == null) { + return; + } widgetFrameView.setVisibility(View.VISIBLE); - widgetFrameView.setPadding( - widgetFrameView.getPaddingLeft(), - widgetFrameView.getPaddingTop(), - (int)(mDensity * 8), - widgetFrameView.getPaddingBottom() - ); + widgetFrameView + .setPadding(widgetFrameView.getPaddingLeft(), widgetFrameView.getPaddingTop(), (int) (mDensity * 8), + widgetFrameView.getPaddingBottom()); // remove already create preview image int count = widgetFrameView.getChildCount(); if (count > 0) { @@ -106,7 +103,7 @@ public class ColorPickerPreference } widgetFrameView.addView(iView); widgetFrameView.setMinimumWidth(0); - iView.setBackgroundDrawable(new AlphaPatternDrawable((int)(5 * mDensity))); + iView.setBackgroundDrawable(new AlphaPatternDrawable((int) (5 * mDensity))); iView.setImageBitmap(getPreviewBitmap()); } @@ -119,7 +116,7 @@ public class ColorPickerPreference int c = color; for (int i = 0; i < w; i++) { for (int j = i; j < h; j++) { - c = (i <= 1 || j <= 1 || i >= w-2 || j >= h-2) ? Color.GRAY : color; + c = (i <= 1 || j <= 1 || i >= w - 2 || j >= h - 2) ? Color.GRAY : color; bm.setPixel(i, j, c); if (i != j) { bm.setPixel(j, i, c); @@ -148,7 +145,7 @@ public class ColorPickerPreference showDialog(null); return false; } - + protected void showDialog(Bundle state) { mDialog = new ColorPickerDialog(getContext(), mValue); mDialog.setOnColorChangedListener(this); @@ -174,114 +171,112 @@ public class ColorPickerPreference * @param color * @author Unknown */ - public static String convertToARGB(int color) { - String alpha = Integer.toHexString(Color.alpha(color)); - String red = Integer.toHexString(Color.red(color)); - String green = Integer.toHexString(Color.green(color)); - String blue = Integer.toHexString(Color.blue(color)); - - if (alpha.length() == 1) { - alpha = "0" + alpha; - } - - if (red.length() == 1) { - red = "0" + red; - } - - if (green.length() == 1) { - green = "0" + green; - } - - if (blue.length() == 1) { - blue = "0" + blue; - } - - return "#" + alpha + red + green + blue; - } - - /** - * For custom purposes. Not used by ColorPickerPreferrence - * @param argb - * @throws NumberFormatException - * @author Unknown - */ - public static int convertToColorInt(String argb) throws NumberFormatException { - - if (argb.startsWith("#")) { - argb = argb.replace("#", ""); - } - - int alpha = -1, red = -1, green = -1, blue = -1; - - if (argb.length() == 8) { - alpha = Integer.parseInt(argb.substring(0, 2), 16); - red = Integer.parseInt(argb.substring(2, 4), 16); - green = Integer.parseInt(argb.substring(4, 6), 16); - blue = Integer.parseInt(argb.substring(6, 8), 16); - } - else if (argb.length() == 6) { - alpha = 255; - red = Integer.parseInt(argb.substring(0, 2), 16); - green = Integer.parseInt(argb.substring(2, 4), 16); - blue = Integer.parseInt(argb.substring(4, 6), 16); - } - - return Color.argb(alpha, red, green, blue); - } - - @Override - protected Parcelable onSaveInstanceState() { - final Parcelable superState = super.onSaveInstanceState(); - if (mDialog == null || !mDialog.isShowing()) { - return superState; - } - - final SavedState myState = new SavedState(superState); - myState.dialogBundle = mDialog.onSaveInstanceState(); - return myState; - } - - @Override - protected void onRestoreInstanceState(Parcelable state) { - if (state == null || !(state instanceof SavedState)) { - // Didn't save state for us in onSaveInstanceState - super.onRestoreInstanceState(state); - return; - } - - SavedState myState = (SavedState) state; - super.onRestoreInstanceState(myState.getSuperState()); - showDialog(myState.dialogBundle); - } - - private static class SavedState extends BaseSavedState { - Bundle dialogBundle; - - public SavedState(Parcel source) { - super(source); - dialogBundle = source.readBundle(); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - super.writeToParcel(dest, flags); - dest.writeBundle(dialogBundle); - } - - public SavedState(Parcelable superState) { - super(superState); - } - - @SuppressWarnings("unused") - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; - } + public static String convertToARGB(int color) { + String alpha = Integer.toHexString(Color.alpha(color)); + String red = Integer.toHexString(Color.red(color)); + String green = Integer.toHexString(Color.green(color)); + String blue = Integer.toHexString(Color.blue(color)); + + if (alpha.length() == 1) { + alpha = "0" + alpha; + } + + if (red.length() == 1) { + red = "0" + red; + } + + if (green.length() == 1) { + green = "0" + green; + } + + if (blue.length() == 1) { + blue = "0" + blue; + } + + return "#" + alpha + red + green + blue; + } + + /** + * For custom purposes. Not used by ColorPickerPreferrence + * @param argb + * @throws NumberFormatException + * @author Unknown + */ + public static int convertToColorInt(String argb) throws NumberFormatException { + + if (argb.startsWith("#")) { + argb = argb.replace("#", ""); + } + + int alpha = -1, red = -1, green = -1, blue = -1; + + if (argb.length() == 8) { + alpha = Integer.parseInt(argb.substring(0, 2), 16); + red = Integer.parseInt(argb.substring(2, 4), 16); + green = Integer.parseInt(argb.substring(4, 6), 16); + blue = Integer.parseInt(argb.substring(6, 8), 16); + } else if (argb.length() == 6) { + alpha = 255; + red = Integer.parseInt(argb.substring(0, 2), 16); + green = Integer.parseInt(argb.substring(2, 4), 16); + blue = Integer.parseInt(argb.substring(4, 6), 16); + } + + return Color.argb(alpha, red, green, blue); + } + + @Override + protected Parcelable onSaveInstanceState() { + final Parcelable superState = super.onSaveInstanceState(); + if (mDialog == null || !mDialog.isShowing()) { + return superState; + } + + final SavedState myState = new SavedState(superState); + myState.dialogBundle = mDialog.onSaveInstanceState(); + return myState; + } + + @Override + protected void onRestoreInstanceState(Parcelable state) { + if (state == null || !(state instanceof SavedState)) { + // Didn't save state for us in onSaveInstanceState + super.onRestoreInstanceState(state); + return; + } + + SavedState myState = (SavedState) state; + super.onRestoreInstanceState(myState.getSuperState()); + showDialog(myState.dialogBundle); + } + + private static class SavedState extends BaseSavedState { + Bundle dialogBundle; + + public SavedState(Parcel source) { + super(source); + dialogBundle = source.readBundle(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + super.writeToParcel(dest, flags); + dest.writeBundle(dialogBundle); + } + + public SavedState(Parcelable superState) { + super(superState); + } + + @SuppressWarnings("unused") + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public SavedState createFromParcel(Parcel in) { + return new SavedState(in); + } + + public SavedState[] newArray(int size) { + return new SavedState[size]; + } + }; + } } \ No newline at end of file diff --git a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerView.java b/app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerView.java similarity index 68% rename from external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerView.java rename to app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerView.java index c0ec0531..48d18d61 100644 --- a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/ColorPickerView.java +++ b/app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerView.java @@ -22,12 +22,12 @@ import android.graphics.Color; import android.graphics.ComposeShader; import android.graphics.LinearGradient; import android.graphics.Paint; +import android.graphics.Paint.Align; +import android.graphics.Paint.Style; import android.graphics.Point; import android.graphics.PorterDuff; import android.graphics.RectF; import android.graphics.Shader; -import android.graphics.Paint.Align; -import android.graphics.Paint.Style; import android.graphics.Shader.TileMode; import android.util.AttributeSet; import android.view.MotionEvent; @@ -42,103 +42,103 @@ import android.view.View; */ public class ColorPickerView extends View { - private final static int PANEL_SAT_VAL = 0; - private final static int PANEL_HUE = 1; - private final static int PANEL_ALPHA = 2; + private final static int PANEL_SAT_VAL = 0; + private final static int PANEL_HUE = 1; + private final static int PANEL_ALPHA = 2; /** * The width in pixels of the border * surrounding all color panels. */ - private final static float BORDER_WIDTH_PX = 1; + private final static float BORDER_WIDTH_PX = 1; /** * The width in dp of the hue panel. */ - private float HUE_PANEL_WIDTH = 30f; + private float HUE_PANEL_WIDTH = 30f; /** * The height in dp of the alpha panel */ - private float ALPHA_PANEL_HEIGHT = 20f; + private float ALPHA_PANEL_HEIGHT = 20f; /** * The distance in dp between the different * color panels. */ - private float PANEL_SPACING = 10f; + private float PANEL_SPACING = 10f; /** * The radius in dp of the color palette tracker circle. */ - private float PALETTE_CIRCLE_TRACKER_RADIUS = 5f; + private float PALETTE_CIRCLE_TRACKER_RADIUS = 5f; /** * The dp which the tracker of the hue or alpha panel * will extend outside of its bounds. */ - private float RECTANGLE_TRACKER_OFFSET = 2f; + private float RECTANGLE_TRACKER_OFFSET = 2f; - private float mDensity = 1f; + private float mDensity = 1f; - private OnColorChangedListener mListener; + private OnColorChangedListener mListener; - private Paint mSatValPaint; - private Paint mSatValTrackerPaint; + private Paint mSatValPaint; + private Paint mSatValTrackerPaint; - private Paint mHuePaint; - private Paint mHueTrackerPaint; + private Paint mHuePaint; + private Paint mHueTrackerPaint; - private Paint mAlphaPaint; - private Paint mAlphaTextPaint; + private Paint mAlphaPaint; + private Paint mAlphaTextPaint; - private Paint mBorderPaint; + private Paint mBorderPaint; - private Shader mValShader; - private Shader mSatShader; - private Shader mHueShader; - private Shader mAlphaShader; + private Shader mValShader; + private Shader mSatShader; + private Shader mHueShader; + private Shader mAlphaShader; - private int mAlpha = 0xff; - private float mHue = 360f; - private float mSat = 0f; - private float mVal = 0f; + private int mAlpha = 0xff; + private float mHue = 360f; + private float mSat = 0f; + private float mVal = 0f; - private String mAlphaSliderText = ""; - private int mSliderTrackerColor = 0xff1c1c1c; - private int mBorderColor = 0xff6E6E6E; - private boolean mShowAlphaPanel = false; + private String mAlphaSliderText = ""; + private int mSliderTrackerColor = 0xff1c1c1c; + private int mBorderColor = 0xff6E6E6E; + private boolean mShowAlphaPanel = false; /* * To remember which panel that has the "focus" when * processing hardware button data. */ - private int mLastTouchedPanel = PANEL_SAT_VAL; + private int mLastTouchedPanel = PANEL_SAT_VAL; /** * Offset from the edge we must have or else * the finger tracker will get clipped when * it is drawn outside of the view. */ - private float mDrawingOffset; + private float mDrawingOffset; /* * Distance form the edges of the view * of where we are allowed to draw. */ - private RectF mDrawingRect; + private RectF mDrawingRect; - private RectF mSatValRect; - private RectF mHueRect; - private RectF mAlphaRect; + private RectF mSatValRect; + private RectF mHueRect; + private RectF mAlphaRect; - private AlphaPatternDrawable mAlphaPattern; + private AlphaPatternDrawable mAlphaPattern; - private Point mStartTouchPoint = null; + private Point mStartTouchPoint = null; public interface OnColorChangedListener { public void onColorChanged(int color); } - public ColorPickerView(Context context){ + public ColorPickerView(Context context) { this(context, null); } @@ -151,7 +151,7 @@ public class ColorPickerView extends View { init(); } - private void init(){ + private void init() { mDensity = getContext().getResources().getDisplayMetrics().density; PALETTE_CIRCLE_TRACKER_RADIUS *= mDensity; RECTANGLE_TRACKER_OFFSET *= mDensity; @@ -168,7 +168,7 @@ public class ColorPickerView extends View { setFocusableInTouchMode(true); } - private void initPaintTools(){ + private void initPaintTools() { mSatValPaint = new Paint(); mSatValTrackerPaint = new Paint(); @@ -197,19 +197,19 @@ public class ColorPickerView extends View { } - private float calculateRequiredOffset(){ + private float calculateRequiredOffset() { float offset = Math.max(PALETTE_CIRCLE_TRACKER_RADIUS, RECTANGLE_TRACKER_OFFSET); offset = Math.max(offset, BORDER_WIDTH_PX * mDensity); return offset * 1.5f; } - private int[] buildHueColorArray(){ + private int[] buildHueColorArray() { int[] hue = new int[361]; int count = 0; - for(int i = hue.length -1; i >= 0; i--, count++){ + for (int i = hue.length - 1; i >= 0; i--, count++) { hue[count] = Color.HSVToColor(new float[]{i, 1f, 1f}); } @@ -220,7 +220,9 @@ public class ColorPickerView extends View { @Override protected void onDraw(Canvas canvas) { - if(mDrawingRect.width() <= 0 || mDrawingRect.height() <= 0) return; + if (mDrawingRect.width() <= 0 || mDrawingRect.height() <= 0) { + return; + } drawSatValPanel(canvas); drawHuePanel(canvas); @@ -228,24 +230,24 @@ public class ColorPickerView extends View { } - private void drawSatValPanel(Canvas canvas){ + private void drawSatValPanel(Canvas canvas) { - final RectF rect = mSatValRect; + final RectF rect = mSatValRect; - if(BORDER_WIDTH_PX > 0){ + if (BORDER_WIDTH_PX > 0) { mBorderPaint.setColor(mBorderColor); - canvas.drawRect(mDrawingRect.left, mDrawingRect.top, rect.right + BORDER_WIDTH_PX, rect.bottom + BORDER_WIDTH_PX, mBorderPaint); + canvas.drawRect(mDrawingRect.left, mDrawingRect.top, rect.right + BORDER_WIDTH_PX, + rect.bottom + BORDER_WIDTH_PX, mBorderPaint); } if (mValShader == null) { - mValShader = new LinearGradient(rect.left, rect.top, rect.left, rect.bottom, - 0xffffffff, 0xff000000, TileMode.CLAMP); + mValShader = new LinearGradient(rect.left, rect.top, rect.left, rect.bottom, 0xffffffff, 0xff000000, + TileMode.CLAMP); } - int rgb = Color.HSVToColor(new float[]{mHue,1f,1f}); + int rgb = Color.HSVToColor(new float[]{mHue, 1f, 1f}); - mSatShader = new LinearGradient(rect.left, rect.top, rect.right, rect.top, - 0xffffffff, rgb, TileMode.CLAMP); + mSatShader = new LinearGradient(rect.left, rect.top, rect.right, rect.top, 0xffffffff, rgb, TileMode.CLAMP); ComposeShader mShader = new ComposeShader(mValShader, mSatShader, PorterDuff.Mode.MULTIPLY); mSatValPaint.setShader(mShader); @@ -261,21 +263,19 @@ public class ColorPickerView extends View { } - private void drawHuePanel(Canvas canvas){ + private void drawHuePanel(Canvas canvas) { final RectF rect = mHueRect; - if(BORDER_WIDTH_PX > 0){ + if (BORDER_WIDTH_PX > 0) { mBorderPaint.setColor(mBorderColor); - canvas.drawRect(rect.left - BORDER_WIDTH_PX, - rect.top - BORDER_WIDTH_PX, - rect.right + BORDER_WIDTH_PX, - rect.bottom + BORDER_WIDTH_PX, - mBorderPaint); + canvas.drawRect(rect.left - BORDER_WIDTH_PX, rect.top - BORDER_WIDTH_PX, rect.right + BORDER_WIDTH_PX, + rect.bottom + BORDER_WIDTH_PX, mBorderPaint); } if (mHueShader == null) { - mHueShader = new LinearGradient(rect.left, rect.top, rect.left, rect.bottom, buildHueColorArray(), null, TileMode.CLAMP); + mHueShader = new LinearGradient(rect.left, rect.top, rect.left, rect.bottom, buildHueColorArray(), null, + TileMode.CLAMP); mHuePaint.setShader(mHueShader); } @@ -296,37 +296,35 @@ public class ColorPickerView extends View { } - private void drawAlphaPanel(Canvas canvas){ + private void drawAlphaPanel(Canvas canvas) { - if(!mShowAlphaPanel || mAlphaRect == null || mAlphaPattern == null) return; + if (!mShowAlphaPanel || mAlphaRect == null || mAlphaPattern == null) { + return; + } final RectF rect = mAlphaRect; - if(BORDER_WIDTH_PX > 0){ + if (BORDER_WIDTH_PX > 0) { mBorderPaint.setColor(mBorderColor); - canvas.drawRect(rect.left - BORDER_WIDTH_PX, - rect.top - BORDER_WIDTH_PX, - rect.right + BORDER_WIDTH_PX, - rect.bottom + BORDER_WIDTH_PX, - mBorderPaint); + canvas.drawRect(rect.left - BORDER_WIDTH_PX, rect.top - BORDER_WIDTH_PX, rect.right + BORDER_WIDTH_PX, + rect.bottom + BORDER_WIDTH_PX, mBorderPaint); } mAlphaPattern.draw(canvas); - float[] hsv = new float[]{mHue,mSat,mVal}; + float[] hsv = new float[]{mHue, mSat, mVal}; int color = Color.HSVToColor(hsv); int acolor = Color.HSVToColor(0, hsv); - mAlphaShader = new LinearGradient(rect.left, rect.top, rect.right, rect.top, - color, acolor, TileMode.CLAMP); + mAlphaShader = new LinearGradient(rect.left, rect.top, rect.right, rect.top, color, acolor, TileMode.CLAMP); mAlphaPaint.setShader(mAlphaShader); canvas.drawRect(rect, mAlphaPaint); - if(mAlphaSliderText != null && mAlphaSliderText!= ""){ + if (mAlphaSliderText != null && mAlphaSliderText != "") { canvas.drawText(mAlphaSliderText, rect.centerX(), rect.centerY() + 4 * mDensity, mAlphaTextPaint); } @@ -345,7 +343,7 @@ public class ColorPickerView extends View { } - private Point hueToPoint(float hue){ + private Point hueToPoint(float hue) { final RectF rect = mHueRect; final float height = rect.height(); @@ -358,7 +356,7 @@ public class ColorPickerView extends View { return p; } - private Point satValToPoint(float sat, float val){ + private Point satValToPoint(float sat, float val) { final RectF rect = mSatValRect; final float height = rect.height(); @@ -372,7 +370,7 @@ public class ColorPickerView extends View { return p; } - private Point alphaToPoint(int alpha){ + private Point alphaToPoint(int alpha) { final RectF rect = mAlphaRect; final float width = rect.width(); @@ -386,7 +384,7 @@ public class ColorPickerView extends View { } - private float[] pointToSatVal(float x, float y){ + private float[] pointToSatVal(float x, float y) { final RectF rect = mSatValRect; float[] result = new float[2]; @@ -394,23 +392,19 @@ public class ColorPickerView extends View { float width = rect.width(); float height = rect.height(); - if (x < rect.left){ + if (x < rect.left) { x = 0f; - } - else if(x > rect.right){ + } else if (x > rect.right) { x = width; - } - else{ + } else { x = x - rect.left; } - if (y < rect.top){ + if (y < rect.top) { y = 0f; - } - else if(y > rect.bottom){ + } else if (y > rect.bottom) { y = height; - } - else{ + } else { y = y - rect.top; } @@ -421,38 +415,34 @@ public class ColorPickerView extends View { return result; } - private float pointToHue(float y){ + private float pointToHue(float y) { final RectF rect = mHueRect; float height = rect.height(); - if (y < rect.top){ + if (y < rect.top) { y = 0f; - } - else if(y > rect.bottom){ + } else if (y > rect.bottom) { y = height; - } - else{ + } else { y = y - rect.top; } return 360f - (y * 360f / height); } - private int pointToAlpha(int x){ + private int pointToAlpha(int x) { final RectF rect = mAlphaRect; final int width = (int) rect.width(); - if(x < rect.left){ + if (x < rect.left) { x = 0; - } - else if(x > rect.right){ + } else if (x > rect.right) { x = width; - } - else{ - x = x - (int)rect.left; + } else { + x = x - (int) rect.left; } return 0xff - (x * 0xff / width); @@ -469,87 +459,82 @@ public class ColorPickerView extends View { boolean update = false; - if(event.getAction() == MotionEvent.ACTION_MOVE){ + if (event.getAction() == MotionEvent.ACTION_MOVE) { - switch(mLastTouchedPanel){ + switch (mLastTouchedPanel) { - case PANEL_SAT_VAL: + case PANEL_SAT_VAL: - float sat, val; + float sat, val; - sat = mSat + x/50f; - val = mVal - y/50f; + sat = mSat + x / 50f; + val = mVal - y / 50f; - if(sat < 0f){ - sat = 0f; - } - else if(sat > 1f){ - sat = 1f; - } + if (sat < 0f) { + sat = 0f; + } else if (sat > 1f) { + sat = 1f; + } - if(val < 0f){ - val = 0f; - } - else if(val > 1f){ - val = 1f; - } + if (val < 0f) { + val = 0f; + } else if (val > 1f) { + val = 1f; + } - mSat = sat; - mVal = val; + mSat = sat; + mVal = val; - update = true; + update = true; - break; + break; - case PANEL_HUE: + case PANEL_HUE: - float hue = mHue - y * 10f; + float hue = mHue - y * 10f; - if(hue < 0f){ - hue = 0f; - } - else if(hue > 360f){ - hue = 360f; - } + if (hue < 0f) { + hue = 0f; + } else if (hue > 360f) { + hue = 360f; + } - mHue = hue; + mHue = hue; - update = true; + update = true; - break; + break; - case PANEL_ALPHA: + case PANEL_ALPHA: - if(!mShowAlphaPanel || mAlphaRect == null){ - update = false; - } - else{ + if (!mShowAlphaPanel || mAlphaRect == null) { + update = false; + } else { - int alpha = (int) (mAlpha - x*10); + int alpha = (int) (mAlpha - x * 10); - if(alpha < 0){ - alpha = 0; - } - else if(alpha > 0xff){ - alpha = 0xff; - } + if (alpha < 0) { + alpha = 0; + } else if (alpha > 0xff) { + alpha = 0xff; + } - mAlpha = alpha; + mAlpha = alpha; - update = true; - } + update = true; + } - break; + break; } } - if(update){ + if (update) { - if(mListener != null){ + if (mListener != null) { mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal})); } @@ -566,35 +551,35 @@ public class ColorPickerView extends View { boolean update = false; - switch(event.getAction()){ + switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_DOWN: - mStartTouchPoint = new Point((int)event.getX(), (int)event.getY()); + mStartTouchPoint = new Point((int) event.getX(), (int) event.getY()); - update = moveTrackersIfNeeded(event); + update = moveTrackersIfNeeded(event); - break; + break; - case MotionEvent.ACTION_MOVE: + case MotionEvent.ACTION_MOVE: - update = moveTrackersIfNeeded(event); + update = moveTrackersIfNeeded(event); - break; + break; - case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_UP: - mStartTouchPoint = null; + mStartTouchPoint = null; - update = moveTrackersIfNeeded(event); + update = moveTrackersIfNeeded(event); - break; + break; } - if(update){ + if (update) { - if(mListener != null){ + if (mListener != null) { mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal})); } @@ -606,9 +591,11 @@ public class ColorPickerView extends View { return super.onTouchEvent(event); } - private boolean moveTrackersIfNeeded(MotionEvent event){ + private boolean moveTrackersIfNeeded(MotionEvent event) { - if(mStartTouchPoint == null) return false; + if (mStartTouchPoint == null) { + return false; + } boolean update = false; @@ -616,14 +603,13 @@ public class ColorPickerView extends View { int startY = mStartTouchPoint.y; - if(mHueRect.contains(startX, startY)){ + if (mHueRect.contains(startX, startY)) { mLastTouchedPanel = PANEL_HUE; mHue = pointToHue(event.getY()); update = true; - } - else if(mSatValRect.contains(startX, startY)){ + } else if (mSatValRect.contains(startX, startY)) { mLastTouchedPanel = PANEL_SAT_VAL; @@ -633,12 +619,11 @@ public class ColorPickerView extends View { mVal = result[1]; update = true; - } - else if(mAlphaRect != null && mAlphaRect.contains(startX, startY)){ + } else if (mAlphaRect != null && mAlphaRect.contains(startX, startY)) { mLastTouchedPanel = PANEL_ALPHA; - mAlpha = pointToAlpha((int)event.getX()); + mAlpha = pointToAlpha((int) event.getX()); update = true; } @@ -652,47 +637,44 @@ public class ColorPickerView extends View { int width = 0; int height = 0; - + int widthMode = MeasureSpec.getMode(widthMeasureSpec); int heightMode = MeasureSpec.getMode(heightMeasureSpec); - + int widthAllowed = MeasureSpec.getSize(widthMeasureSpec); int heightAllowed = MeasureSpec.getSize(heightMeasureSpec); - + widthAllowed = chooseWidth(widthMode, widthAllowed); heightAllowed = chooseHeight(heightMode, heightAllowed); - - if(!mShowAlphaPanel){ - + + if (!mShowAlphaPanel) { + height = (int) (widthAllowed - PANEL_SPACING - HUE_PANEL_WIDTH); //If calculated height (based on the width) is more than the allowed height. - if(height > heightAllowed || getTag().equals("landscape")) { + if (height > heightAllowed || getTag().equals("landscape")) { height = heightAllowed; width = (int) (height + PANEL_SPACING + HUE_PANEL_WIDTH); - } - else{ + } else { width = widthAllowed; } - } - else{ + } else { width = (int) (heightAllowed - ALPHA_PANEL_HEIGHT + HUE_PANEL_WIDTH); - if(width > widthAllowed){ + if (width > widthAllowed) { width = widthAllowed; height = (int) (widthAllowed - HUE_PANEL_WIDTH + ALPHA_PANEL_HEIGHT); - } - else{ + } else { height = heightAllowed; } } - + setMeasuredDimension(width, height); } - private int chooseWidth(int mode, int size){ + private int chooseWidth(int mode, int size) { if (mode == MeasureSpec.AT_MOST || mode == MeasureSpec.EXACTLY) { return size; } else { // (mode == MeasureSpec.UNSPECIFIED) @@ -700,7 +682,7 @@ public class ColorPickerView extends View { } } - private int chooseHeight(int mode, int size){ + private int chooseHeight(int mode, int size) { if (mode == MeasureSpec.AT_MOST || mode == MeasureSpec.EXACTLY) { return size; } else { // (mode == MeasureSpec.UNSPECIFIED) @@ -708,11 +690,11 @@ public class ColorPickerView extends View { } } - private int getPrefferedWidth(){ + private int getPrefferedWidth() { int width = getPrefferedHeight(); - if(mShowAlphaPanel){ + if (mShowAlphaPanel) { width -= (PANEL_SPACING + ALPHA_PANEL_HEIGHT); } @@ -721,11 +703,11 @@ public class ColorPickerView extends View { } - private int getPrefferedHeight(){ + private int getPrefferedHeight() { - int height = (int)(200 * mDensity); + int height = (int) (200 * mDensity); - if(mShowAlphaPanel){ + if (mShowAlphaPanel) { height += PANEL_SPACING + ALPHA_PANEL_HEIGHT; } @@ -733,14 +715,13 @@ public class ColorPickerView extends View { } - @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { super.onSizeChanged(w, h, oldw, oldh); mDrawingRect = new RectF(); mDrawingRect.left = mDrawingOffset + getPaddingLeft(); - mDrawingRect.right = w - mDrawingOffset - getPaddingRight(); + mDrawingRect.right = w - mDrawingOffset - getPaddingRight(); mDrawingRect.top = mDrawingOffset + getPaddingTop(); mDrawingRect.bottom = h - mDrawingOffset - getPaddingBottom(); @@ -749,12 +730,12 @@ public class ColorPickerView extends View { setUpAlphaRect(); } - private void setUpSatValRect(){ + private void setUpSatValRect() { - final RectF dRect = mDrawingRect; + final RectF dRect = mDrawingRect; float panelSide = dRect.height() - BORDER_WIDTH_PX * 2; - if(mShowAlphaPanel){ + if (mShowAlphaPanel) { panelSide -= PANEL_SPACING + ALPHA_PANEL_HEIGHT; } @@ -763,11 +744,11 @@ public class ColorPickerView extends View { float bottom = top + panelSide; float right = left + panelSide; - mSatValRect = new RectF(left,top, right, bottom); + mSatValRect = new RectF(left, top, right, bottom); } - private void setUpHueRect(){ - final RectF dRect = mDrawingRect; + private void setUpHueRect() { + final RectF dRect = mDrawingRect; float left = dRect.right - HUE_PANEL_WIDTH + BORDER_WIDTH_PX; float top = dRect.top + BORDER_WIDTH_PX; @@ -779,9 +760,11 @@ public class ColorPickerView extends View { private void setUpAlphaRect() { - if(!mShowAlphaPanel) return; + if (!mShowAlphaPanel) { + return; + } - final RectF dRect = mDrawingRect; + final RectF dRect = mDrawingRect; float left = dRect.left + BORDER_WIDTH_PX; float top = dRect.bottom - ALPHA_PANEL_HEIGHT + BORDER_WIDTH_PX; @@ -791,12 +774,8 @@ public class ColorPickerView extends View { mAlphaRect = new RectF(left, top, right, bottom); mAlphaPattern = new AlphaPatternDrawable((int) (5 * mDensity)); - mAlphaPattern.setBounds( - Math.round(mAlphaRect.left), - Math.round(mAlphaRect.top), - Math.round(mAlphaRect.right), - Math.round(mAlphaRect.bottom) - ); + mAlphaPattern.setBounds(Math.round(mAlphaRect.left), Math.round(mAlphaRect.top), Math.round(mAlphaRect.right), + Math.round(mAlphaRect.bottom)); } @@ -806,7 +785,7 @@ public class ColorPickerView extends View { * selected by the user has changed. * @param listener */ - public void setOnColorChangedListener(OnColorChangedListener listener){ + public void setOnColorChangedListener(OnColorChangedListener listener) { mListener = listener; } @@ -814,7 +793,7 @@ public class ColorPickerView extends View { * Set the color of the border surrounding all panels. * @param color */ - public void setBorderColor(int color){ + public void setBorderColor(int color) { mBorderColor = color; invalidate(); } @@ -822,7 +801,7 @@ public class ColorPickerView extends View { /** * Get the color of the border surrounding all panels. */ - public int getBorderColor(){ + public int getBorderColor() { return mBorderColor; } @@ -830,15 +809,15 @@ public class ColorPickerView extends View { * Get the current color this view is showing. * @return the current color. */ - public int getColor(){ - return Color.HSVToColor(mAlpha, new float[]{mHue,mSat,mVal}); + public int getColor() { + return Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal}); } /** * Set the color the view should show. * @param color The color that should be selected. */ - public void setColor(int color){ + public void setColor(int color) { setColor(color, false); } @@ -848,7 +827,7 @@ public class ColorPickerView extends View { * @param callback If you want to get a callback to * your OnColorChangedListener. */ - public void setColor(int color, boolean callback){ + public void setColor(int color, boolean callback) { int alpha = Color.alpha(color); int red = Color.red(color); @@ -864,7 +843,7 @@ public class ColorPickerView extends View { mSat = hsv[1]; mVal = hsv[2]; - if(callback && mListener != null){ + if (callback && mListener != null) { mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal})); } @@ -879,7 +858,7 @@ public class ColorPickerView extends View { * the currently selected color and want to align it perfectly. * @return The offset in pixels. */ - public float getDrawingOffset(){ + public float getDrawingOffset() { return mDrawingOffset; } @@ -888,9 +867,9 @@ public class ColorPickerView extends View { * If it is set to false no alpha will be set. * @param visible */ - public void setAlphaSliderVisible(boolean visible){ + public void setAlphaSliderVisible(boolean visible) { - if(mShowAlphaPanel != visible){ + if (mShowAlphaPanel != visible) { mShowAlphaPanel = visible; /* @@ -901,14 +880,15 @@ public class ColorPickerView extends View { mValShader = null; mSatShader = null; mHueShader = null; - mAlphaShader = null;; + mAlphaShader = null; + ; requestLayout(); } } - public void setSliderTrackerColor(int color){ + public void setSliderTrackerColor(int color) { mSliderTrackerColor = color; mHueTrackerPaint.setColor(mSliderTrackerColor); @@ -916,7 +896,7 @@ public class ColorPickerView extends View { invalidate(); } - public int getSliderTrackerColor(){ + public int getSliderTrackerColor() { return mSliderTrackerColor; } @@ -925,7 +905,7 @@ public class ColorPickerView extends View { * alpha slider. Set to null to disable text. * @param res string resource id. */ - public void setAlphaSliderText(int res){ + public void setAlphaSliderText(int res) { String text = getContext().getString(res); setAlphaSliderText(text); } @@ -935,7 +915,7 @@ public class ColorPickerView extends View { * alpha slider. Set to null to disable text. * @param text Text that should be shown. */ - public void setAlphaSliderText(String text){ + public void setAlphaSliderText(String text) { mAlphaSliderText = text; invalidate(); } @@ -946,7 +926,7 @@ public class ColorPickerView extends View { * slider. * @return */ - public String getAlphaSliderText(){ + public String getAlphaSliderText() { return mAlphaSliderText; } } \ No newline at end of file diff --git a/lib/src/org/apache/openjpa/lib/util/Base16Encoder.java b/app/src/main/java/org/apache/openjpa/lib/util/Base16Encoder.java similarity index 100% rename from lib/src/org/apache/openjpa/lib/util/Base16Encoder.java rename to app/src/main/java/org/apache/openjpa/lib/util/Base16Encoder.java diff --git a/lib/src/org/base64/android/Base64.java b/app/src/main/java/org/base64/android/Base64.java similarity index 100% rename from lib/src/org/base64/android/Base64.java rename to app/src/main/java/org/base64/android/Base64.java diff --git a/core/src/org/transdroid/core/app/search/GoogleWebSearchBarcodeResolver.java b/app/src/main/java/org/transdroid/core/app/search/GoogleWebSearchBarcodeResolver.java similarity index 100% rename from core/src/org/transdroid/core/app/search/GoogleWebSearchBarcodeResolver.java rename to app/src/main/java/org/transdroid/core/app/search/GoogleWebSearchBarcodeResolver.java diff --git a/core/src/org/transdroid/core/app/search/SearchHelper.java b/app/src/main/java/org/transdroid/core/app/search/SearchHelper.java similarity index 100% rename from core/src/org/transdroid/core/app/search/SearchHelper.java rename to app/src/main/java/org/transdroid/core/app/search/SearchHelper.java diff --git a/core/src/org/transdroid/core/app/search/SearchResult.java b/app/src/main/java/org/transdroid/core/app/search/SearchResult.java similarity index 100% rename from core/src/org/transdroid/core/app/search/SearchResult.java rename to app/src/main/java/org/transdroid/core/app/search/SearchResult.java diff --git a/core/src/org/transdroid/core/app/search/SearchSite.java b/app/src/main/java/org/transdroid/core/app/search/SearchSite.java similarity index 100% rename from core/src/org/transdroid/core/app/search/SearchSite.java rename to app/src/main/java/org/transdroid/core/app/search/SearchSite.java diff --git a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java b/app/src/main/java/org/transdroid/core/app/settings/ApplicationSettings.java similarity index 100% rename from core/src/org/transdroid/core/app/settings/ApplicationSettings.java rename to app/src/main/java/org/transdroid/core/app/settings/ApplicationSettings.java diff --git a/core/src/org/transdroid/core/app/settings/NotificationSettings.java b/app/src/main/java/org/transdroid/core/app/settings/NotificationSettings.java similarity index 99% rename from core/src/org/transdroid/core/app/settings/NotificationSettings.java rename to app/src/main/java/org/transdroid/core/app/settings/NotificationSettings.java index 2f2cfbbe..28d5d0cf 100644 --- a/core/src/org/transdroid/core/app/settings/NotificationSettings.java +++ b/app/src/main/java/org/transdroid/core/app/settings/NotificationSettings.java @@ -19,7 +19,7 @@ package org.transdroid.core.app.settings; import org.androidannotations.annotations.EBean; import org.androidannotations.annotations.EBean.Scope; import org.androidannotations.annotations.RootContext; -import org.transdroid.core.R; +import org.transdroid.R; import android.content.Context; import android.content.SharedPreferences; diff --git a/core/src/org/transdroid/core/app/settings/RssfeedSetting.java b/app/src/main/java/org/transdroid/core/app/settings/RssfeedSetting.java similarity index 100% rename from core/src/org/transdroid/core/app/settings/RssfeedSetting.java rename to app/src/main/java/org/transdroid/core/app/settings/RssfeedSetting.java diff --git a/core/src/org/transdroid/core/app/settings/ServerSetting.java b/app/src/main/java/org/transdroid/core/app/settings/ServerSetting.java similarity index 100% rename from core/src/org/transdroid/core/app/settings/ServerSetting.java rename to app/src/main/java/org/transdroid/core/app/settings/ServerSetting.java diff --git a/core/src/org/transdroid/core/app/settings/SettingsPersistence.java b/app/src/main/java/org/transdroid/core/app/settings/SettingsPersistence.java similarity index 100% rename from core/src/org/transdroid/core/app/settings/SettingsPersistence.java rename to app/src/main/java/org/transdroid/core/app/settings/SettingsPersistence.java diff --git a/core/src/org/transdroid/core/app/settings/SystemSettings.java b/app/src/main/java/org/transdroid/core/app/settings/SystemSettings.java similarity index 100% rename from core/src/org/transdroid/core/app/settings/SystemSettings.java rename to app/src/main/java/org/transdroid/core/app/settings/SystemSettings.java diff --git a/core/src/org/transdroid/core/app/settings/WebsearchSetting.java b/app/src/main/java/org/transdroid/core/app/settings/WebsearchSetting.java similarity index 100% rename from core/src/org/transdroid/core/app/settings/WebsearchSetting.java rename to app/src/main/java/org/transdroid/core/app/settings/WebsearchSetting.java diff --git a/core/src/org/transdroid/core/gui/DetailsActivity.java b/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java similarity index 99% rename from core/src/org/transdroid/core/gui/DetailsActivity.java rename to app/src/main/java/org/transdroid/core/gui/DetailsActivity.java index 65021523..6d2f559f 100644 --- a/core/src/org/transdroid/core/gui/DetailsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/DetailsActivity.java @@ -29,7 +29,7 @@ import org.androidannotations.annotations.InstanceState; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; import org.androidannotations.annotations.UiThread; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.*; import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.lists.NoProgressHeaderTransformer; diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java similarity index 99% rename from core/src/org/transdroid/core/gui/DetailsFragment.java rename to app/src/main/java/org/transdroid/core/gui/DetailsFragment.java index b17d0d57..3da8d9dc 100644 --- a/core/src/org/transdroid/core/gui/DetailsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java @@ -28,7 +28,7 @@ import org.androidannotations.annotations.ItemClick; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.gui.lists.DetailsAdapter; diff --git a/core/src/org/transdroid/core/gui/FilterEntryDialog.java b/app/src/main/java/org/transdroid/core/gui/FilterEntryDialog.java similarity index 100% rename from core/src/org/transdroid/core/gui/FilterEntryDialog.java rename to app/src/main/java/org/transdroid/core/gui/FilterEntryDialog.java diff --git a/core/src/org/transdroid/core/gui/ServerPickerDialog.java b/app/src/main/java/org/transdroid/core/gui/ServerPickerDialog.java similarity index 98% rename from core/src/org/transdroid/core/gui/ServerPickerDialog.java rename to app/src/main/java/org/transdroid/core/gui/ServerPickerDialog.java index c1f12920..8525018c 100644 --- a/core/src/org/transdroid/core/gui/ServerPickerDialog.java +++ b/app/src/main/java/org/transdroid/core/gui/ServerPickerDialog.java @@ -2,7 +2,7 @@ package org.transdroid.core.gui; import java.util.List; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ServerSetting; import android.app.AlertDialog; diff --git a/core/src/org/transdroid/core/gui/ServerStatusView.java b/app/src/main/java/org/transdroid/core/gui/ServerStatusView.java similarity index 99% rename from core/src/org/transdroid/core/gui/ServerStatusView.java rename to app/src/main/java/org/transdroid/core/gui/ServerStatusView.java index 63817073..6361ac00 100644 --- a/core/src/org/transdroid/core/gui/ServerStatusView.java +++ b/app/src/main/java/org/transdroid/core/gui/ServerStatusView.java @@ -20,7 +20,7 @@ import java.util.List; import org.androidannotations.annotations.EViewGroup; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.navigation.NavigationHelper; import org.transdroid.core.gui.navigation.SetTransferRatesDialog; import org.transdroid.core.gui.navigation.SetTransferRatesDialog.OnRatesPickedListener; diff --git a/core/src/org/transdroid/core/gui/TorrentTasksExecutor.java b/app/src/main/java/org/transdroid/core/gui/TorrentTasksExecutor.java similarity index 100% rename from core/src/org/transdroid/core/gui/TorrentTasksExecutor.java rename to app/src/main/java/org/transdroid/core/gui/TorrentTasksExecutor.java diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java similarity index 99% rename from core/src/org/transdroid/core/gui/TorrentsActivity.java rename to app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java index 3d6bd178..6b2ebc7a 100644 --- a/core/src/org/transdroid/core/gui/TorrentsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java @@ -43,7 +43,7 @@ import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.cookie.BasicClientCookie; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.search.*; import org.transdroid.core.app.settings.*; import org.transdroid.core.gui.lists.LocalTorrent; diff --git a/core/src/org/transdroid/core/gui/TorrentsFragment.java b/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java similarity index 99% rename from core/src/org/transdroid/core/gui/TorrentsFragment.java rename to app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java index 11fdf3a9..cc63a66c 100644 --- a/core/src/org/transdroid/core/gui/TorrentsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java @@ -28,7 +28,7 @@ import org.androidannotations.annotations.EFragment; import org.androidannotations.annotations.InstanceState; import org.androidannotations.annotations.ItemClick; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.SystemSettings; import org.transdroid.core.gui.lists.TorrentsAdapter; diff --git a/core/src/org/transdroid/core/gui/lists/DetailsAdapter.java b/app/src/main/java/org/transdroid/core/gui/lists/DetailsAdapter.java similarity index 99% rename from core/src/org/transdroid/core/gui/lists/DetailsAdapter.java rename to app/src/main/java/org/transdroid/core/gui/lists/DetailsAdapter.java index f1145813..68093301 100644 --- a/core/src/org/transdroid/core/gui/lists/DetailsAdapter.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/DetailsAdapter.java @@ -19,7 +19,7 @@ package org.transdroid.core.gui.lists; import java.util.ArrayList; import java.util.List; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.navigation.FilterSeparatorView_; import org.transdroid.daemon.Torrent; import org.transdroid.daemon.TorrentFile; diff --git a/core/src/org/transdroid/core/gui/lists/LocalTorrent.java b/app/src/main/java/org/transdroid/core/gui/lists/LocalTorrent.java similarity index 99% rename from core/src/org/transdroid/core/gui/lists/LocalTorrent.java rename to app/src/main/java/org/transdroid/core/gui/lists/LocalTorrent.java index b72f0833..e5357bc6 100644 --- a/core/src/org/transdroid/core/gui/lists/LocalTorrent.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/LocalTorrent.java @@ -18,7 +18,7 @@ package org.transdroid.core.gui.lists; import java.util.Locale; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.daemon.DaemonException; import org.transdroid.daemon.Torrent; import org.transdroid.daemon.TorrentStatus; diff --git a/core/src/org/transdroid/core/gui/lists/MergeAdapter.java b/app/src/main/java/org/transdroid/core/gui/lists/MergeAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/MergeAdapter.java rename to app/src/main/java/org/transdroid/core/gui/lists/MergeAdapter.java diff --git a/core/src/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java b/app/src/main/java/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java similarity index 93% rename from core/src/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java rename to app/src/main/java/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java index 1758aab9..d3632169 100644 --- a/core/src/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/NoProgressHeaderTransformer.java @@ -1,6 +1,6 @@ package org.transdroid.core.gui.lists; -import org.transdroid.core.R; +import org.transdroid.R; import uk.co.senab.actionbarpulltorefresh.library.DefaultHeaderTransformer; import android.app.Activity; diff --git a/core/src/org/transdroid/core/gui/lists/SimpleListItem.java b/app/src/main/java/org/transdroid/core/gui/lists/SimpleListItem.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/SimpleListItem.java rename to app/src/main/java/org/transdroid/core/gui/lists/SimpleListItem.java diff --git a/core/src/org/transdroid/core/gui/lists/SimpleListItemAdapter.java b/app/src/main/java/org/transdroid/core/gui/lists/SimpleListItemAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/SimpleListItemAdapter.java rename to app/src/main/java/org/transdroid/core/gui/lists/SimpleListItemAdapter.java diff --git a/core/src/org/transdroid/core/gui/lists/SimpleListItemSpinnerAdapter.java b/app/src/main/java/org/transdroid/core/gui/lists/SimpleListItemSpinnerAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/SimpleListItemSpinnerAdapter.java rename to app/src/main/java/org/transdroid/core/gui/lists/SimpleListItemSpinnerAdapter.java diff --git a/core/src/org/transdroid/core/gui/lists/SimpleListItemView.java b/app/src/main/java/org/transdroid/core/gui/lists/SimpleListItemView.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/SimpleListItemView.java rename to app/src/main/java/org/transdroid/core/gui/lists/SimpleListItemView.java diff --git a/core/src/org/transdroid/core/gui/lists/SortByListItem.java b/app/src/main/java/org/transdroid/core/gui/lists/SortByListItem.java similarity index 98% rename from core/src/org/transdroid/core/gui/lists/SortByListItem.java rename to app/src/main/java/org/transdroid/core/gui/lists/SortByListItem.java index 90e6110d..9ac2525b 100644 --- a/core/src/org/transdroid/core/gui/lists/SortByListItem.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/SortByListItem.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.lists; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.daemon.TorrentsSortBy; import android.content.Context; diff --git a/core/src/org/transdroid/core/gui/lists/TorrentDetailsView.java b/app/src/main/java/org/transdroid/core/gui/lists/TorrentDetailsView.java similarity index 99% rename from core/src/org/transdroid/core/gui/lists/TorrentDetailsView.java rename to app/src/main/java/org/transdroid/core/gui/lists/TorrentDetailsView.java index a8e0a55c..4a6de94a 100644 --- a/core/src/org/transdroid/core/gui/lists/TorrentDetailsView.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/TorrentDetailsView.java @@ -18,7 +18,7 @@ package org.transdroid.core.gui.lists; import org.androidannotations.annotations.EViewGroup; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.daemon.Daemon; import org.transdroid.daemon.Torrent; import org.transdroid.daemon.util.FileSizeConverter; diff --git a/core/src/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java b/app/src/main/java/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java similarity index 98% rename from core/src/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java rename to app/src/main/java/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java index c53ba957..7e0252e4 100644 --- a/core/src/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.lists; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.daemon.Priority; import android.content.Context; diff --git a/core/src/org/transdroid/core/gui/lists/TorrentFileView.java b/app/src/main/java/org/transdroid/core/gui/lists/TorrentFileView.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/TorrentFileView.java rename to app/src/main/java/org/transdroid/core/gui/lists/TorrentFileView.java diff --git a/core/src/org/transdroid/core/gui/lists/TorrentProgressBar.java b/app/src/main/java/org/transdroid/core/gui/lists/TorrentProgressBar.java similarity index 99% rename from core/src/org/transdroid/core/gui/lists/TorrentProgressBar.java rename to app/src/main/java/org/transdroid/core/gui/lists/TorrentProgressBar.java index 4347f679..d5da5884 100644 --- a/core/src/org/transdroid/core/gui/lists/TorrentProgressBar.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/TorrentProgressBar.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.lists; -import org.transdroid.core.R; +import org.transdroid.R; import android.content.Context; import android.content.res.TypedArray; diff --git a/core/src/org/transdroid/core/gui/lists/TorrentStatusLayout.java b/app/src/main/java/org/transdroid/core/gui/lists/TorrentStatusLayout.java similarity index 99% rename from core/src/org/transdroid/core/gui/lists/TorrentStatusLayout.java rename to app/src/main/java/org/transdroid/core/gui/lists/TorrentStatusLayout.java index ea2cfedd..c3931ea9 100644 --- a/core/src/org/transdroid/core/gui/lists/TorrentStatusLayout.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/TorrentStatusLayout.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.lists; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.daemon.TorrentStatus; import android.content.Context; diff --git a/core/src/org/transdroid/core/gui/lists/TorrentView.java b/app/src/main/java/org/transdroid/core/gui/lists/TorrentView.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/TorrentView.java rename to app/src/main/java/org/transdroid/core/gui/lists/TorrentView.java diff --git a/core/src/org/transdroid/core/gui/lists/TorrentsAdapter.java b/app/src/main/java/org/transdroid/core/gui/lists/TorrentsAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/TorrentsAdapter.java rename to app/src/main/java/org/transdroid/core/gui/lists/TorrentsAdapter.java diff --git a/core/src/org/transdroid/core/gui/lists/ViewHolderAdapter.java b/app/src/main/java/org/transdroid/core/gui/lists/ViewHolderAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/lists/ViewHolderAdapter.java rename to app/src/main/java/org/transdroid/core/gui/lists/ViewHolderAdapter.java diff --git a/core/src/org/transdroid/core/gui/log/DatabaseHelper.java b/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java similarity index 100% rename from core/src/org/transdroid/core/gui/log/DatabaseHelper.java rename to app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java diff --git a/core/src/org/transdroid/core/gui/log/ErrorLogEntry.java b/app/src/main/java/org/transdroid/core/gui/log/ErrorLogEntry.java similarity index 100% rename from core/src/org/transdroid/core/gui/log/ErrorLogEntry.java rename to app/src/main/java/org/transdroid/core/gui/log/ErrorLogEntry.java diff --git a/core/src/org/transdroid/core/gui/log/ErrorLogSender.java b/app/src/main/java/org/transdroid/core/gui/log/ErrorLogSender.java similarity index 99% rename from core/src/org/transdroid/core/gui/log/ErrorLogSender.java rename to app/src/main/java/org/transdroid/core/gui/log/ErrorLogSender.java index 21274a85..2102e66d 100644 --- a/core/src/org/transdroid/core/gui/log/ErrorLogSender.java +++ b/app/src/main/java/org/transdroid/core/gui/log/ErrorLogSender.java @@ -22,7 +22,7 @@ import java.util.List; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EBean; import org.androidannotations.annotations.OrmLiteDao; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.gui.navigation.NavigationHelper; diff --git a/core/src/org/transdroid/core/gui/log/Log.java b/app/src/main/java/org/transdroid/core/gui/log/Log.java similarity index 100% rename from core/src/org/transdroid/core/gui/log/Log.java rename to app/src/main/java/org/transdroid/core/gui/log/Log.java diff --git a/core/src/org/transdroid/core/gui/navigation/DialogHelper.java b/app/src/main/java/org/transdroid/core/gui/navigation/DialogHelper.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/DialogHelper.java rename to app/src/main/java/org/transdroid/core/gui/navigation/DialogHelper.java diff --git a/core/src/org/transdroid/core/gui/navigation/FilterListAdapter.java b/app/src/main/java/org/transdroid/core/gui/navigation/FilterListAdapter.java similarity index 99% rename from core/src/org/transdroid/core/gui/navigation/FilterListAdapter.java rename to app/src/main/java/org/transdroid/core/gui/navigation/FilterListAdapter.java index cb0b10b9..a021a1c6 100644 --- a/core/src/org/transdroid/core/gui/navigation/FilterListAdapter.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/FilterListAdapter.java @@ -20,7 +20,7 @@ import java.util.List; import org.androidannotations.annotations.EBean; import org.androidannotations.annotations.RootContext; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.gui.lists.MergeAdapter; import org.transdroid.core.gui.lists.ViewHolderAdapter; diff --git a/core/src/org/transdroid/core/gui/navigation/FilterListDropDownAdapter.java b/app/src/main/java/org/transdroid/core/gui/navigation/FilterListDropDownAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/FilterListDropDownAdapter.java rename to app/src/main/java/org/transdroid/core/gui/navigation/FilterListDropDownAdapter.java diff --git a/core/src/org/transdroid/core/gui/navigation/FilterListItemAdapter.java b/app/src/main/java/org/transdroid/core/gui/navigation/FilterListItemAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/FilterListItemAdapter.java rename to app/src/main/java/org/transdroid/core/gui/navigation/FilterListItemAdapter.java diff --git a/core/src/org/transdroid/core/gui/navigation/FilterListItemView.java b/app/src/main/java/org/transdroid/core/gui/navigation/FilterListItemView.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/FilterListItemView.java rename to app/src/main/java/org/transdroid/core/gui/navigation/FilterListItemView.java diff --git a/core/src/org/transdroid/core/gui/navigation/FilterSeparatorView.java b/app/src/main/java/org/transdroid/core/gui/navigation/FilterSeparatorView.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/FilterSeparatorView.java rename to app/src/main/java/org/transdroid/core/gui/navigation/FilterSeparatorView.java diff --git a/core/src/org/transdroid/core/gui/navigation/Label.java b/app/src/main/java/org/transdroid/core/gui/navigation/Label.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/Label.java rename to app/src/main/java/org/transdroid/core/gui/navigation/Label.java diff --git a/core/src/org/transdroid/core/gui/navigation/NavigationFilter.java b/app/src/main/java/org/transdroid/core/gui/navigation/NavigationFilter.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/NavigationFilter.java rename to app/src/main/java/org/transdroid/core/gui/navigation/NavigationFilter.java diff --git a/core/src/org/transdroid/core/gui/navigation/NavigationHelper.java b/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java similarity index 83% rename from core/src/org/transdroid/core/gui/navigation/NavigationHelper.java rename to app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java index 8b7b8914..1fd7326d 100644 --- a/core/src/org/transdroid/core/gui/navigation/NavigationHelper.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java @@ -16,10 +16,6 @@ */ package org.transdroid.core.gui.navigation; -import org.androidannotations.annotations.EBean; -import org.androidannotations.annotations.RootContext; -import org.transdroid.core.R; - import android.annotation.SuppressLint; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -30,7 +26,7 @@ import android.text.Spannable; import android.text.SpannableString; import android.text.style.TypefaceSpan; -import com.nostra13.universalimageloader.cache.disc.impl.FileCountLimitedDiscCache; +import com.nostra13.universalimageloader.cache.disc.impl.ext.LruDiscCache; import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator; import com.nostra13.universalimageloader.cache.memory.impl.UsingFreqLimitedMemoryCache; import com.nostra13.universalimageloader.core.DisplayImageOptions; @@ -38,6 +34,12 @@ import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration.Builder; import com.nostra13.universalimageloader.core.assist.ImageScaleType; +import org.androidannotations.annotations.EBean; +import org.androidannotations.annotations.RootContext; +import org.transdroid.R; + +import java.io.IOException; + import de.keyboardsurfer.android.widget.crouton.Crouton; import de.keyboardsurfer.android.widget.crouton.Style; @@ -58,14 +60,14 @@ public class NavigationHelper { /** * Use with {@link Crouton#showText(android.app.Activity, int, Style)} (and variants) to display error messages. */ - public static Style CROUTON_ERROR_STYLE = new Style.Builder().setBackgroundColor(R.color.crouton_error) - .setTextSize(13).build(); + public static Style CROUTON_ERROR_STYLE = + new Style.Builder().setBackgroundColor(R.color.crouton_error).setTextSize(13).build(); /** * Use with {@link Crouton#showText(android.app.Activity, int, Style)} (and variants) to display info messages. */ - public static Style CROUTON_INFO_STYLE = new Style.Builder().setBackgroundColor(R.color.crouton_info) - .setTextSize(13).build(); + public static Style CROUTON_INFO_STYLE = + new Style.Builder().setBackgroundColor(R.color.crouton_info).setTextSize(13).build(); /** * Returns (and initialises, if needed) an image cache that uses memory and (1MB) local storage. @@ -73,22 +75,25 @@ public class NavigationHelper { */ public ImageLoader getImageCache() { if (imageCache == null) { - // @formatter:off imageCache = ImageLoader.getInstance(); - Builder imageCacheBuilder = new Builder(context) - .defaultDisplayImageOptions( - new DisplayImageOptions.Builder() - .cacheInMemory() - .cacheOnDisc() - .imageScaleType(ImageScaleType.IN_SAMPLE_INT) - .showImageForEmptyUri(R.drawable.ic_launcher) - .build()) - .memoryCache( - new UsingFreqLimitedMemoryCache(1024 * 1024)) - .discCache( - new FileCountLimitedDiscCache(context.getCacheDir(), new Md5FileNameGenerator(), 25)); - imageCache.init(imageCacheBuilder.build()); + try { + LruDiscCache diskCache = + new LruDiscCache(context.getCacheDir(), null, new Md5FileNameGenerator(), 640000, 25); + // @formatter:off + Builder imageCacheBuilder = new Builder(context) + .defaultDisplayImageOptions( + new DisplayImageOptions.Builder() + .cacheInMemory() + .cacheOnDisc() + .imageScaleType(ImageScaleType.IN_SAMPLE_INT) + .showImageForEmptyUri(R.drawable.ic_launcher).build()) + .memoryCache(new UsingFreqLimitedMemoryCache(1024 * 1024)) + .discCache(diskCache); + imageCache.init(imageCacheBuilder.build()); // @formatter:on + } catch (IOException e) { + // The cache directory is always available on Android; ignore this exception + } } return imageCache; } @@ -154,7 +159,7 @@ public class NavigationHelper { } /** - * Returns whether any seedbox-related components should be shown in the interface; specifically the option to add + * Returns whether any seedbox-related components should be shown in the interface; specifically the option to add * server settings via easy seedbox-specific screens. * @return True if seedbox settings should be shown, false otherwise */ @@ -165,7 +170,7 @@ public class NavigationHelper { /** * Whether the custom app update checker should be used to check for new app and search module versions. * @return True if it should be checked against transdroid.org if there are app updates (as opposed to using the - * Play Store for updates, for example), false otherwise + * Play Store for updates, for example), false otherwise */ public boolean enableUpdateChecker() { return context.getResources().getBoolean(R.bool.updatecheck_available); @@ -175,11 +180,12 @@ public class NavigationHelper { * Converts a string into a {@link Spannable} that displays the string in the Roboto Condensed font * @param string A plain text {@link String} * @return A {@link Spannable} that can be applied to supporting views (such as the action bar title) so that the - * input string will be displayed using the Roboto Condensed font (if the OS has this) + * input string will be displayed using the Roboto Condensed font (if the OS has this) */ public static SpannableString buildCondensedFontString(String string) { - if (string == null) + if (string == null) { return null; + } SpannableString s = new SpannableString(string); s.setSpan(new TypefaceSpan("sans-serif-condensed"), 0, s.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); return s; @@ -200,19 +206,22 @@ public class NavigationHelper { if (rawTorrentUri.getScheme().equals("magnet")) { // Magnet links might have a dn (display name) parameter String dn = getQueryParameter(rawTorrentUri, "dn"); - if (dn != null && !dn.equals("")) + if (dn != null && !dn.equals("")) { return dn; + } // If not, try to return the hash that is specified as xt (exact topci) String xt = getQueryParameter(rawTorrentUri, "xt"); - if (xt != null && !xt.equals("")) + if (xt != null && !xt.equals("")) { return xt; + } } if (rawTorrentUri.isHierarchical()) { String path = rawTorrentUri.getPath(); if (path != null) { - if (path.contains("/")) + if (path.contains("/")) { path = path.substring(path.lastIndexOf("/")); + } return path; } } diff --git a/core/src/org/transdroid/core/gui/navigation/NavigationSelectionView.java b/app/src/main/java/org/transdroid/core/gui/navigation/NavigationSelectionView.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/NavigationSelectionView.java rename to app/src/main/java/org/transdroid/core/gui/navigation/NavigationSelectionView.java diff --git a/core/src/org/transdroid/core/gui/navigation/RefreshableActivity.java b/app/src/main/java/org/transdroid/core/gui/navigation/RefreshableActivity.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/RefreshableActivity.java rename to app/src/main/java/org/transdroid/core/gui/navigation/RefreshableActivity.java diff --git a/core/src/org/transdroid/core/gui/navigation/SelectionManagerMode.java b/app/src/main/java/org/transdroid/core/gui/navigation/SelectionManagerMode.java similarity index 100% rename from core/src/org/transdroid/core/gui/navigation/SelectionManagerMode.java rename to app/src/main/java/org/transdroid/core/gui/navigation/SelectionManagerMode.java diff --git a/core/src/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java b/app/src/main/java/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java similarity index 99% rename from core/src/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java rename to app/src/main/java/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java index db24ecfc..e66ea1a2 100644 --- a/core/src/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.navigation; -import org.transdroid.core.R; +import org.transdroid.R; import android.content.Context; import android.view.View; diff --git a/core/src/org/transdroid/core/gui/navigation/SetLabelDialog.java b/app/src/main/java/org/transdroid/core/gui/navigation/SetLabelDialog.java similarity index 99% rename from core/src/org/transdroid/core/gui/navigation/SetLabelDialog.java rename to app/src/main/java/org/transdroid/core/gui/navigation/SetLabelDialog.java index 5a9232d2..54f28962 100644 --- a/core/src/org/transdroid/core/gui/navigation/SetLabelDialog.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/SetLabelDialog.java @@ -20,7 +20,7 @@ import java.security.InvalidParameterException; import java.util.Iterator; import java.util.List; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.lists.SimpleListItem; import android.app.AlertDialog; diff --git a/core/src/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java b/app/src/main/java/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java similarity index 99% rename from core/src/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java rename to app/src/main/java/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java index e933f4c3..b4a3dfed 100644 --- a/core/src/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java @@ -18,7 +18,7 @@ package org.transdroid.core.gui.navigation; import java.security.InvalidParameterException; -import org.transdroid.core.R; +import org.transdroid.R; import android.app.AlertDialog; import android.app.Dialog; diff --git a/core/src/org/transdroid/core/gui/navigation/SetTrackersDialog.java b/app/src/main/java/org/transdroid/core/gui/navigation/SetTrackersDialog.java similarity index 99% rename from core/src/org/transdroid/core/gui/navigation/SetTrackersDialog.java rename to app/src/main/java/org/transdroid/core/gui/navigation/SetTrackersDialog.java index ba8cb0fb..78d232dd 100644 --- a/core/src/org/transdroid/core/gui/navigation/SetTrackersDialog.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/SetTrackersDialog.java @@ -20,7 +20,7 @@ import java.security.InvalidParameterException; import java.util.Arrays; import java.util.List; -import org.transdroid.core.R; +import org.transdroid.R; import android.app.AlertDialog; import android.app.Dialog; diff --git a/core/src/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java b/app/src/main/java/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java similarity index 99% rename from core/src/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java rename to app/src/main/java/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java index b029cbbd..95508349 100644 --- a/core/src/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java @@ -18,7 +18,7 @@ package org.transdroid.core.gui.navigation; import java.security.InvalidParameterException; -import org.transdroid.core.R; +import org.transdroid.R; import android.app.Dialog; import android.app.DialogFragment; diff --git a/core/src/org/transdroid/core/gui/navigation/StatusType.java b/app/src/main/java/org/transdroid/core/gui/navigation/StatusType.java similarity index 99% rename from core/src/org/transdroid/core/gui/navigation/StatusType.java rename to app/src/main/java/org/transdroid/core/gui/navigation/StatusType.java index 15403543..f97b8cd9 100644 --- a/core/src/org/transdroid/core/gui/navigation/StatusType.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/StatusType.java @@ -19,7 +19,7 @@ package org.transdroid.core.gui.navigation; import java.util.Arrays; import java.util.List; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.lists.SimpleListItem; import org.transdroid.daemon.Torrent; diff --git a/core/src/org/transdroid/core/gui/rss/RssfeedLoader.java b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedLoader.java similarity index 97% rename from core/src/org/transdroid/core/gui/rss/RssfeedLoader.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssfeedLoader.java index b6007d58..adab8722 100644 --- a/core/src/org/transdroid/core/gui/rss/RssfeedLoader.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedLoader.java @@ -22,8 +22,8 @@ import java.util.Date; import java.util.List; import org.transdroid.core.app.settings.RssfeedSetting; -import org.transdroid.core.rssparser.Channel; -import org.transdroid.core.rssparser.Item; +import org.transdroid.Rssparser.Channel; +import org.transdroid.Rssparser.Item; /** * A container class that holds RSS feed settings and, after they have been retrieved, the contents as {@link Channel}, diff --git a/core/src/org/transdroid/core/gui/rss/RssfeedView.java b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedView.java similarity index 98% rename from core/src/org/transdroid/core/gui/rss/RssfeedView.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssfeedView.java index 23569cc8..70403220 100644 --- a/core/src/org/transdroid/core/gui/rss/RssfeedView.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedView.java @@ -21,7 +21,7 @@ import org.androidannotations.annotations.EViewGroup; import org.androidannotations.annotations.ViewById; import org.transdroid.core.app.settings.RssfeedSetting; import org.transdroid.core.gui.navigation.NavigationHelper; -import org.transdroid.core.rssparser.Channel; +import org.transdroid.Rssparser.Channel; import android.content.Context; import android.view.View; diff --git a/core/src/org/transdroid/core/gui/rss/RssfeedsActivity.java b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java similarity index 98% rename from core/src/org/transdroid/core/gui/rss/RssfeedsActivity.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java index 15dd8112..9415a669 100644 --- a/core/src/org/transdroid/core/gui/rss/RssfeedsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java @@ -27,13 +27,13 @@ import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.FragmentById; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.UiThread; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.*; import org.transdroid.core.gui.*; import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.navigation.NavigationHelper; -import org.transdroid.core.rssparser.Channel; -import org.transdroid.core.rssparser.RssParser; +import org.transdroid.Rssparser.Channel; +import org.transdroid.Rssparser.RssParser; import android.annotation.TargetApi; import android.app.Activity; diff --git a/core/src/org/transdroid/core/gui/rss/RssfeedsAdapter.java b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsAdapter.java similarity index 98% rename from core/src/org/transdroid/core/gui/rss/RssfeedsAdapter.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssfeedsAdapter.java index 85cb8b7a..ff6f6777 100644 --- a/core/src/org/transdroid/core/gui/rss/RssfeedsAdapter.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsAdapter.java @@ -21,7 +21,7 @@ import java.util.List; import org.androidannotations.annotations.EBean; import org.androidannotations.annotations.RootContext; import org.transdroid.core.app.settings.RssfeedSetting; -import org.transdroid.core.rssparser.Channel; +import org.transdroid.Rssparser.Channel; import android.content.Context; import android.view.View; diff --git a/core/src/org/transdroid/core/gui/rss/RssfeedsFragment.java b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsFragment.java similarity index 99% rename from core/src/org/transdroid/core/gui/rss/RssfeedsFragment.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssfeedsFragment.java index 955653f4..3eef3ac3 100644 --- a/core/src/org/transdroid/core/gui/rss/RssfeedsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsFragment.java @@ -25,7 +25,7 @@ import org.androidannotations.annotations.ItemClick; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.settings.MainSettingsActivity_; import android.app.Fragment; diff --git a/core/src/org/transdroid/core/gui/rss/RssitemStatusLayout.java b/app/src/main/java/org/transdroid/core/gui/rss/RssitemStatusLayout.java similarity index 100% rename from core/src/org/transdroid/core/gui/rss/RssitemStatusLayout.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssitemStatusLayout.java diff --git a/core/src/org/transdroid/core/gui/rss/RssitemView.java b/app/src/main/java/org/transdroid/core/gui/rss/RssitemView.java similarity index 97% rename from core/src/org/transdroid/core/gui/rss/RssitemView.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssitemView.java index ba121a0d..b6e8ee92 100644 --- a/core/src/org/transdroid/core/gui/rss/RssitemView.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssitemView.java @@ -18,7 +18,7 @@ package org.transdroid.core.gui.rss; import org.androidannotations.annotations.EViewGroup; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.rssparser.Item; +import org.transdroid.Rssparser.Item; import android.content.Context; import android.text.format.DateUtils; diff --git a/core/src/org/transdroid/core/gui/rss/RssitemsActivity.java b/app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java similarity index 97% rename from core/src/org/transdroid/core/gui/rss/RssitemsActivity.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java index 30125d7e..8de1bbce 100644 --- a/core/src/org/transdroid/core/gui/rss/RssitemsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java @@ -21,11 +21,11 @@ import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.Extra; import org.androidannotations.annotations.FragmentById; import org.androidannotations.annotations.OptionsItem; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.*; import org.transdroid.core.gui.*; import org.transdroid.core.gui.navigation.NavigationHelper; -import org.transdroid.core.rssparser.Channel; +import org.transdroid.Rssparser.Channel; import android.annotation.TargetApi; import android.app.Activity; diff --git a/core/src/org/transdroid/core/gui/rss/RssitemsAdapter.java b/app/src/main/java/org/transdroid/core/gui/rss/RssitemsAdapter.java similarity index 95% rename from core/src/org/transdroid/core/gui/rss/RssitemsAdapter.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssitemsAdapter.java index f70f7006..216d5796 100644 --- a/core/src/org/transdroid/core/gui/rss/RssitemsAdapter.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssitemsAdapter.java @@ -18,8 +18,8 @@ package org.transdroid.core.gui.rss; import org.androidannotations.annotations.EBean; import org.androidannotations.annotations.RootContext; -import org.transdroid.core.rssparser.Channel; -import org.transdroid.core.rssparser.Item; +import org.transdroid.Rssparser.Channel; +import org.transdroid.Rssparser.Item; import android.content.Context; import android.view.View; diff --git a/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java b/app/src/main/java/org/transdroid/core/gui/rss/RssitemsFragment.java similarity index 98% rename from core/src/org/transdroid/core/gui/rss/RssitemsFragment.java rename to app/src/main/java/org/transdroid/core/gui/rss/RssitemsFragment.java index 5688a9fa..be5607ad 100644 --- a/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssitemsFragment.java @@ -25,13 +25,13 @@ import org.androidannotations.annotations.EFragment; import org.androidannotations.annotations.InstanceState; import org.androidannotations.annotations.ItemClick; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.TorrentsActivity_; import org.transdroid.core.gui.navigation.NavigationHelper; import org.transdroid.core.gui.navigation.SelectionManagerMode; import org.transdroid.core.gui.search.SearchActivity_; -import org.transdroid.core.rssparser.Channel; -import org.transdroid.core.rssparser.Item; +import org.transdroid.Rssparser.Channel; +import org.transdroid.Rssparser.Item; import android.app.AlertDialog; import android.app.Dialog; diff --git a/core/src/org/transdroid/core/gui/search/BarcodeHelper.java b/app/src/main/java/org/transdroid/core/gui/search/BarcodeHelper.java similarity index 99% rename from core/src/org/transdroid/core/gui/search/BarcodeHelper.java rename to app/src/main/java/org/transdroid/core/gui/search/BarcodeHelper.java index d5fcce4f..39cbf425 100644 --- a/core/src/org/transdroid/core/gui/search/BarcodeHelper.java +++ b/app/src/main/java/org/transdroid/core/gui/search/BarcodeHelper.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.search; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.search.GoogleWebSearchBarcodeResolver; import android.annotation.SuppressLint; diff --git a/core/src/org/transdroid/core/gui/search/FilePickerHelper.java b/app/src/main/java/org/transdroid/core/gui/search/FilePickerHelper.java similarity index 99% rename from core/src/org/transdroid/core/gui/search/FilePickerHelper.java rename to app/src/main/java/org/transdroid/core/gui/search/FilePickerHelper.java index 54660c2c..f6b91ced 100644 --- a/core/src/org/transdroid/core/gui/search/FilePickerHelper.java +++ b/app/src/main/java/org/transdroid/core/gui/search/FilePickerHelper.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.search; -import org.transdroid.core.R; +import org.transdroid.R; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/core/src/org/transdroid/core/gui/search/SearchActivity.java b/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java similarity index 99% rename from core/src/org/transdroid/core/gui/search/SearchActivity.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java index 1ffb3ea7..b950abc5 100644 --- a/core/src/org/transdroid/core/gui/search/SearchActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java @@ -26,7 +26,7 @@ import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; import org.androidannotations.annotations.SystemService; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.search.SearchHelper; import org.transdroid.core.app.search.SearchSite; import org.transdroid.core.app.settings.ApplicationSettings; diff --git a/core/src/org/transdroid/core/gui/search/SearchHistoryProvider.java b/app/src/main/java/org/transdroid/core/gui/search/SearchHistoryProvider.java similarity index 90% rename from core/src/org/transdroid/core/gui/search/SearchHistoryProvider.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchHistoryProvider.java index 546531fa..930472df 100644 --- a/core/src/org/transdroid/core/gui/search/SearchHistoryProvider.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchHistoryProvider.java @@ -20,13 +20,15 @@ import android.content.Context; import android.content.SearchRecentSuggestionsProvider; import android.provider.SearchRecentSuggestions; +import org.transdroid.BuildConfig; + /** * Provides search suggestions by simply returning previous user entries. * @author Eric Kok */ public class SearchHistoryProvider extends SearchRecentSuggestionsProvider { - public final static String AUTHORITY = "org.transdroid.core.gui.search.SearchHistoryProvider"; + public final static String AUTHORITY = BuildConfig.PACKAGE_NAME + ".search.SearchHistoryProvider"; public final static int MODE = DATABASE_MODE_QUERIES; public SearchHistoryProvider() { diff --git a/core/src/org/transdroid/core/gui/search/SearchResultView.java b/app/src/main/java/org/transdroid/core/gui/search/SearchResultView.java similarity index 98% rename from core/src/org/transdroid/core/gui/search/SearchResultView.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchResultView.java index 6f2a2ad1..cdfd7c6a 100644 --- a/core/src/org/transdroid/core/gui/search/SearchResultView.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchResultView.java @@ -18,7 +18,7 @@ package org.transdroid.core.gui.search; import org.androidannotations.annotations.EViewGroup; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.search.SearchResult; import android.content.Context; diff --git a/core/src/org/transdroid/core/gui/search/SearchResultsAdapter.java b/app/src/main/java/org/transdroid/core/gui/search/SearchResultsAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/search/SearchResultsAdapter.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchResultsAdapter.java diff --git a/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java b/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java similarity index 99% rename from core/src/org/transdroid/core/gui/search/SearchResultsFragment.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java index 0db513fa..a1d27d27 100644 --- a/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java @@ -27,7 +27,7 @@ import org.androidannotations.annotations.InstanceState; import org.androidannotations.annotations.ItemClick; import org.androidannotations.annotations.UiThread; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.search.SearchHelper; import org.transdroid.core.app.search.SearchHelper.SearchSortOrder; import org.transdroid.core.app.search.SearchResult; diff --git a/core/src/org/transdroid/core/gui/search/SearchSetting.java b/app/src/main/java/org/transdroid/core/gui/search/SearchSetting.java similarity index 100% rename from core/src/org/transdroid/core/gui/search/SearchSetting.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchSetting.java diff --git a/core/src/org/transdroid/core/gui/search/SearchSettingSelectionView.java b/app/src/main/java/org/transdroid/core/gui/search/SearchSettingSelectionView.java similarity index 100% rename from core/src/org/transdroid/core/gui/search/SearchSettingSelectionView.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchSettingSelectionView.java diff --git a/core/src/org/transdroid/core/gui/search/SearchSettingsDropDownAdapter.java b/app/src/main/java/org/transdroid/core/gui/search/SearchSettingsDropDownAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/search/SearchSettingsDropDownAdapter.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchSettingsDropDownAdapter.java diff --git a/core/src/org/transdroid/core/gui/search/SearchSiteView.java b/app/src/main/java/org/transdroid/core/gui/search/SearchSiteView.java similarity index 100% rename from core/src/org/transdroid/core/gui/search/SearchSiteView.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchSiteView.java diff --git a/core/src/org/transdroid/core/gui/search/SearchSitesAdapter.java b/app/src/main/java/org/transdroid/core/gui/search/SearchSitesAdapter.java similarity index 100% rename from core/src/org/transdroid/core/gui/search/SearchSitesAdapter.java rename to app/src/main/java/org/transdroid/core/gui/search/SearchSitesAdapter.java diff --git a/core/src/org/transdroid/core/gui/search/SendIntentHelper.java b/app/src/main/java/org/transdroid/core/gui/search/SendIntentHelper.java similarity index 100% rename from core/src/org/transdroid/core/gui/search/SendIntentHelper.java rename to app/src/main/java/org/transdroid/core/gui/search/SendIntentHelper.java diff --git a/core/src/org/transdroid/core/gui/search/UrlEntryDialog.java b/app/src/main/java/org/transdroid/core/gui/search/UrlEntryDialog.java similarity index 100% rename from core/src/org/transdroid/core/gui/search/UrlEntryDialog.java rename to app/src/main/java/org/transdroid/core/gui/search/UrlEntryDialog.java diff --git a/core/src/org/transdroid/core/gui/settings/AboutDialog.java b/app/src/main/java/org/transdroid/core/gui/settings/AboutDialog.java similarity index 98% rename from core/src/org/transdroid/core/gui/settings/AboutDialog.java rename to app/src/main/java/org/transdroid/core/gui/settings/AboutDialog.java index 64638d5f..a48b23a8 100644 --- a/core/src/org/transdroid/core/gui/settings/AboutDialog.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/AboutDialog.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.settings; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.navigation.DialogHelper; import android.app.Activity; diff --git a/core/src/org/transdroid/core/gui/settings/ChangelogDialog.java b/app/src/main/java/org/transdroid/core/gui/settings/ChangelogDialog.java similarity index 98% rename from core/src/org/transdroid/core/gui/settings/ChangelogDialog.java rename to app/src/main/java/org/transdroid/core/gui/settings/ChangelogDialog.java index 8dea0c1d..0f7a375e 100644 --- a/core/src/org/transdroid/core/gui/settings/ChangelogDialog.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/ChangelogDialog.java @@ -16,7 +16,7 @@ */ package org.transdroid.core.gui.settings; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.navigation.DialogHelper; import android.app.Activity; diff --git a/core/src/org/transdroid/core/gui/settings/HelpSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/HelpSettingsActivity.java similarity index 99% rename from core/src/org/transdroid/core/gui/settings/HelpSettingsActivity.java rename to app/src/main/java/org/transdroid/core/gui/settings/HelpSettingsActivity.java index fd3663a9..525cfdab 100644 --- a/core/src/org/transdroid/core/gui/settings/HelpSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/HelpSettingsActivity.java @@ -19,7 +19,7 @@ package org.transdroid.core.gui.settings; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.SettingsPersistence; import org.transdroid.core.gui.log.ErrorLogSender; diff --git a/core/src/org/transdroid/core/gui/settings/KeyBoundPreferencesActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/KeyBoundPreferencesActivity.java similarity index 100% rename from core/src/org/transdroid/core/gui/settings/KeyBoundPreferencesActivity.java rename to app/src/main/java/org/transdroid/core/gui/settings/KeyBoundPreferencesActivity.java diff --git a/core/src/org/transdroid/core/gui/settings/MainSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/MainSettingsActivity.java similarity index 99% rename from core/src/org/transdroid/core/gui/settings/MainSettingsActivity.java rename to app/src/main/java/org/transdroid/core/gui/settings/MainSettingsActivity.java index 765245ba..289a0e54 100644 --- a/core/src/org/transdroid/core/gui/settings/MainSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/MainSettingsActivity.java @@ -22,7 +22,7 @@ import java.util.List; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.search.SearchHelper; import org.transdroid.core.app.search.SearchSite; import org.transdroid.core.app.settings.ApplicationSettings; diff --git a/core/src/org/transdroid/core/gui/settings/NotificationSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/NotificationSettingsActivity.java similarity index 99% rename from core/src/org/transdroid/core/gui/settings/NotificationSettingsActivity.java rename to app/src/main/java/org/transdroid/core/gui/settings/NotificationSettingsActivity.java index c43e8ec6..72e7971d 100644 --- a/core/src/org/transdroid/core/gui/settings/NotificationSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/NotificationSettingsActivity.java @@ -19,7 +19,7 @@ package org.transdroid.core.gui.settings; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.NotificationSettings; import org.transdroid.core.service.BootReceiver; diff --git a/core/src/org/transdroid/core/gui/settings/OverflowPreference.java b/app/src/main/java/org/transdroid/core/gui/settings/OverflowPreference.java similarity index 99% rename from core/src/org/transdroid/core/gui/settings/OverflowPreference.java rename to app/src/main/java/org/transdroid/core/gui/settings/OverflowPreference.java index 44b76333..e8659918 100644 --- a/core/src/org/transdroid/core/gui/settings/OverflowPreference.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/OverflowPreference.java @@ -1,6 +1,6 @@ package org.transdroid.core.gui.settings; -import org.transdroid.core.R; +import org.transdroid.R; import android.content.Context; import android.preference.Preference; diff --git a/core/src/org/transdroid/core/gui/settings/RssfeedPreference.java b/app/src/main/java/org/transdroid/core/gui/settings/RssfeedPreference.java similarity index 100% rename from core/src/org/transdroid/core/gui/settings/RssfeedPreference.java rename to app/src/main/java/org/transdroid/core/gui/settings/RssfeedPreference.java diff --git a/core/src/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java similarity index 98% rename from core/src/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java rename to app/src/main/java/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java index 218b52d9..22444793 100644 --- a/core/src/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/RssfeedSettingsActivity.java @@ -19,7 +19,7 @@ package org.transdroid.core.gui.settings; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.*; import android.annotation.TargetApi; diff --git a/core/src/org/transdroid/core/gui/settings/ServerPreference.java b/app/src/main/java/org/transdroid/core/gui/settings/ServerPreference.java similarity index 100% rename from core/src/org/transdroid/core/gui/settings/ServerPreference.java rename to app/src/main/java/org/transdroid/core/gui/settings/ServerPreference.java diff --git a/core/src/org/transdroid/core/gui/settings/ServerSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java similarity index 99% rename from core/src/org/transdroid/core/gui/settings/ServerSettingsActivity.java rename to app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java index 5864b329..e6a88591 100644 --- a/core/src/org/transdroid/core/gui/settings/ServerSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/ServerSettingsActivity.java @@ -19,7 +19,7 @@ package org.transdroid.core.gui.settings; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.*; import org.transdroid.daemon.Daemon; diff --git a/core/src/org/transdroid/core/gui/settings/SystemSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java similarity index 99% rename from core/src/org/transdroid/core/gui/settings/SystemSettingsActivity.java rename to app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java index 6edfc915..03b2f5d0 100644 --- a/core/src/org/transdroid/core/gui/settings/SystemSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java @@ -23,7 +23,7 @@ import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; import org.json.JSONException; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.SettingsPersistence; import org.transdroid.core.gui.log.ErrorLogSender; diff --git a/core/src/org/transdroid/core/gui/settings/WebsearchPreference.java b/app/src/main/java/org/transdroid/core/gui/settings/WebsearchPreference.java similarity index 100% rename from core/src/org/transdroid/core/gui/settings/WebsearchPreference.java rename to app/src/main/java/org/transdroid/core/gui/settings/WebsearchPreference.java diff --git a/core/src/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java b/app/src/main/java/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java similarity index 98% rename from core/src/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java rename to app/src/main/java/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java index fa5406ba..3dbe1e81 100644 --- a/core/src/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/WebsearchSettingsActivity.java @@ -19,7 +19,7 @@ package org.transdroid.core.gui.settings; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.*; import android.annotation.TargetApi; diff --git a/core/src/org/transdroid/core/rssparser/Channel.java b/app/src/main/java/org/transdroid/core/rssparser/Channel.java similarity index 98% rename from core/src/org/transdroid/core/rssparser/Channel.java rename to app/src/main/java/org/transdroid/core/rssparser/Channel.java index 68d105ed..b55eb9f4 100644 --- a/core/src/org/transdroid/core/rssparser/Channel.java +++ b/app/src/main/java/org/transdroid/core/rssparser/Channel.java @@ -2,7 +2,7 @@ * Taken from the 'Learning Android' project, released as Public Domain software at * http://github.com/digitalspaghetti/learning-android and modified heavily for Transdroid */ -package org.transdroid.core.rssparser; +package org.transdroid.Rssparser; import java.util.ArrayList; import java.util.Date; diff --git a/core/src/org/transdroid/core/rssparser/HttpHelper.java b/app/src/main/java/org/transdroid/core/rssparser/HttpHelper.java similarity index 99% rename from core/src/org/transdroid/core/rssparser/HttpHelper.java rename to app/src/main/java/org/transdroid/core/rssparser/HttpHelper.java index 9baf4f52..ecef9115 100644 --- a/core/src/org/transdroid/core/rssparser/HttpHelper.java +++ b/app/src/main/java/org/transdroid/core/rssparser/HttpHelper.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with Transdroid. If not, see . */ -package org.transdroid.core.rssparser; +package org.transdroid.Rssparser; import java.io.BufferedReader; import java.io.IOException; diff --git a/core/src/org/transdroid/core/rssparser/Item.java b/app/src/main/java/org/transdroid/core/rssparser/Item.java similarity index 98% rename from core/src/org/transdroid/core/rssparser/Item.java rename to app/src/main/java/org/transdroid/core/rssparser/Item.java index 42f80ea9..20fe13b0 100644 --- a/core/src/org/transdroid/core/rssparser/Item.java +++ b/app/src/main/java/org/transdroid/core/rssparser/Item.java @@ -2,7 +2,7 @@ * Taken from the 'Learning Android' project, released as Public Domain software at * http://github.com/digitalspaghetti/learning-android and modified heavily for Transdroid */ -package org.transdroid.core.rssparser; +package org.transdroid.Rssparser; import java.util.Date; diff --git a/core/src/org/transdroid/core/rssparser/RssParser.java b/app/src/main/java/org/transdroid/core/rssparser/RssParser.java similarity index 99% rename from core/src/org/transdroid/core/rssparser/RssParser.java rename to app/src/main/java/org/transdroid/core/rssparser/RssParser.java index c589082c..ef628d02 100644 --- a/core/src/org/transdroid/core/rssparser/RssParser.java +++ b/app/src/main/java/org/transdroid/core/rssparser/RssParser.java @@ -2,7 +2,7 @@ * Taken from the 'Learning Android' project, released as Public Domain software at * http://github.com/digitalspaghetti/learning-android and modified heavily for Transdroid */ -package org.transdroid.core.rssparser; +package org.transdroid.Rssparser; import java.io.IOException; import java.util.Date; diff --git a/core/src/org/transdroid/core/seedbox/SeedboxPreference.java b/app/src/main/java/org/transdroid/core/seedbox/SeedboxPreference.java similarity index 100% rename from core/src/org/transdroid/core/seedbox/SeedboxPreference.java rename to app/src/main/java/org/transdroid/core/seedbox/SeedboxPreference.java diff --git a/core/src/org/transdroid/core/seedbox/SeedboxProvider.java b/app/src/main/java/org/transdroid/core/seedbox/SeedboxProvider.java similarity index 100% rename from core/src/org/transdroid/core/seedbox/SeedboxProvider.java rename to app/src/main/java/org/transdroid/core/seedbox/SeedboxProvider.java diff --git a/core/src/org/transdroid/core/seedbox/SeedboxSettings.java b/app/src/main/java/org/transdroid/core/seedbox/SeedboxSettings.java similarity index 100% rename from core/src/org/transdroid/core/seedbox/SeedboxSettings.java rename to app/src/main/java/org/transdroid/core/seedbox/SeedboxSettings.java diff --git a/core/src/org/transdroid/core/seedbox/SeedboxSettingsImpl.java b/app/src/main/java/org/transdroid/core/seedbox/SeedboxSettingsImpl.java similarity index 100% rename from core/src/org/transdroid/core/seedbox/SeedboxSettingsImpl.java rename to app/src/main/java/org/transdroid/core/seedbox/SeedboxSettingsImpl.java diff --git a/core/src/org/transdroid/core/seedbox/SeedstuffSettings.java b/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettings.java similarity index 100% rename from core/src/org/transdroid/core/seedbox/SeedstuffSettings.java rename to app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettings.java diff --git a/core/src/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java similarity index 98% rename from core/src/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java rename to app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java index e28a916d..17433b8f 100644 --- a/core/src/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java @@ -19,7 +19,7 @@ package org.transdroid.core.seedbox; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.settings.*; import android.annotation.TargetApi; diff --git a/core/src/org/transdroid/core/seedbox/XirvikDediSettings.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettings.java similarity index 100% rename from core/src/org/transdroid/core/seedbox/XirvikDediSettings.java rename to app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettings.java diff --git a/core/src/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java similarity index 98% rename from core/src/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java rename to app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java index e62822d3..429fc0e8 100644 --- a/core/src/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettingsActivity.java @@ -19,7 +19,7 @@ package org.transdroid.core.seedbox; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.settings.*; import android.annotation.TargetApi; diff --git a/core/src/org/transdroid/core/seedbox/XirvikSemiSettings.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettings.java similarity index 100% rename from core/src/org/transdroid/core/seedbox/XirvikSemiSettings.java rename to app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettings.java diff --git a/core/src/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java similarity index 98% rename from core/src/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java rename to app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java index 2ed2d9fd..79cd7ff3 100644 --- a/core/src/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/seedbox/XirvikSemiSettingsActivity.java @@ -19,7 +19,7 @@ package org.transdroid.core.seedbox; import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.settings.*; import android.annotation.TargetApi; diff --git a/core/src/org/transdroid/core/seedbox/XirvikSharedSettings.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettings.java similarity index 100% rename from core/src/org/transdroid/core/seedbox/XirvikSharedSettings.java rename to app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettings.java diff --git a/core/src/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java similarity index 99% rename from core/src/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java rename to app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java index 6b8e04ec..4c3b5be7 100644 --- a/core/src/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java +++ b/app/src/main/java/org/transdroid/core/seedbox/XirvikSharedSettingsActivity.java @@ -24,7 +24,7 @@ import org.androidannotations.annotations.OptionsMenu; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.navigation.NavigationHelper; import org.transdroid.core.gui.settings.KeyBoundPreferencesActivity; diff --git a/core/src/org/transdroid/core/service/AlarmReceiver.java b/app/src/main/java/org/transdroid/core/service/AlarmReceiver.java similarity index 100% rename from core/src/org/transdroid/core/service/AlarmReceiver.java rename to app/src/main/java/org/transdroid/core/service/AlarmReceiver.java diff --git a/core/src/org/transdroid/core/service/AppUpdateService.java b/app/src/main/java/org/transdroid/core/service/AppUpdateService.java similarity index 99% rename from core/src/org/transdroid/core/service/AppUpdateService.java rename to app/src/main/java/org/transdroid/core/service/AppUpdateService.java index e1537734..76a78e04 100644 --- a/core/src/org/transdroid/core/service/AppUpdateService.java +++ b/app/src/main/java/org/transdroid/core/service/AppUpdateService.java @@ -30,7 +30,7 @@ import org.apache.http.client.ClientProtocolException; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.AbstractHttpClient; import org.apache.http.impl.client.DefaultHttpClient; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.NotificationSettings; import org.transdroid.core.app.settings.SystemSettings; import org.transdroid.core.gui.log.Log; diff --git a/core/src/org/transdroid/core/service/BootReceiver.java b/app/src/main/java/org/transdroid/core/service/BootReceiver.java similarity index 100% rename from core/src/org/transdroid/core/service/BootReceiver.java rename to app/src/main/java/org/transdroid/core/service/BootReceiver.java diff --git a/core/src/org/transdroid/core/service/ConnectivityHelper.java b/app/src/main/java/org/transdroid/core/service/ConnectivityHelper.java similarity index 100% rename from core/src/org/transdroid/core/service/ConnectivityHelper.java rename to app/src/main/java/org/transdroid/core/service/ConnectivityHelper.java diff --git a/core/src/org/transdroid/core/service/ControlService.java b/app/src/main/java/org/transdroid/core/service/ControlService.java similarity index 100% rename from core/src/org/transdroid/core/service/ControlService.java rename to app/src/main/java/org/transdroid/core/service/ControlService.java diff --git a/core/src/org/transdroid/core/service/RssCheckerService.java b/app/src/main/java/org/transdroid/core/service/RssCheckerService.java similarity index 97% rename from core/src/org/transdroid/core/service/RssCheckerService.java rename to app/src/main/java/org/transdroid/core/service/RssCheckerService.java index 9c4d0881..ec56b8b2 100644 --- a/core/src/org/transdroid/core/service/RssCheckerService.java +++ b/app/src/main/java/org/transdroid/core/service/RssCheckerService.java @@ -22,14 +22,14 @@ import java.util.Set; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EService; import org.androidannotations.annotations.SystemService; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.NotificationSettings; import org.transdroid.core.app.settings.RssfeedSetting; import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.rss.RssfeedsActivity_; -import org.transdroid.core.rssparser.Item; -import org.transdroid.core.rssparser.RssParser; +import org.transdroid.Rssparser.Item; +import org.transdroid.Rssparser.RssParser; import org.transdroid.daemon.util.Collections2; import android.app.IntentService; diff --git a/core/src/org/transdroid/core/service/ServerCheckerService.java b/app/src/main/java/org/transdroid/core/service/ServerCheckerService.java similarity index 99% rename from core/src/org/transdroid/core/service/ServerCheckerService.java rename to app/src/main/java/org/transdroid/core/service/ServerCheckerService.java index 4d0f5de4..22334832 100644 --- a/core/src/org/transdroid/core/service/ServerCheckerService.java +++ b/app/src/main/java/org/transdroid/core/service/ServerCheckerService.java @@ -25,7 +25,7 @@ import org.androidannotations.annotations.SystemService; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.NotificationSettings; import org.transdroid.core.app.settings.ServerSetting; diff --git a/core/src/org/transdroid/core/widget/ListWidgetConfig.java b/app/src/main/java/org/transdroid/core/widget/ListWidgetConfig.java similarity index 100% rename from core/src/org/transdroid/core/widget/ListWidgetConfig.java rename to app/src/main/java/org/transdroid/core/widget/ListWidgetConfig.java diff --git a/core/src/org/transdroid/core/widget/ListWidgetConfigActivity.java b/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java similarity index 99% rename from core/src/org/transdroid/core/widget/ListWidgetConfigActivity.java rename to app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java index 7688c41a..0083c95e 100644 --- a/core/src/org/transdroid/core/widget/ListWidgetConfigActivity.java +++ b/app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java @@ -27,7 +27,7 @@ import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.ItemSelect; import org.androidannotations.annotations.UiThread; import org.androidannotations.annotations.ViewById; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.app.settings.SystemSettings; diff --git a/core/src/org/transdroid/core/widget/ListWidgetPreviewAdapter.java b/app/src/main/java/org/transdroid/core/widget/ListWidgetPreviewAdapter.java similarity index 99% rename from core/src/org/transdroid/core/widget/ListWidgetPreviewAdapter.java rename to app/src/main/java/org/transdroid/core/widget/ListWidgetPreviewAdapter.java index b42d694d..28f2d646 100644 --- a/core/src/org/transdroid/core/widget/ListWidgetPreviewAdapter.java +++ b/app/src/main/java/org/transdroid/core/widget/ListWidgetPreviewAdapter.java @@ -18,7 +18,7 @@ package org.transdroid.core.widget; import java.util.List; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.daemon.Torrent; diff --git a/core/src/org/transdroid/core/widget/ListWidgetProvider.java b/app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java similarity index 99% rename from core/src/org/transdroid/core/widget/ListWidgetProvider.java rename to app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java index 89fd7d56..2684d677 100644 --- a/core/src/org/transdroid/core/widget/ListWidgetProvider.java +++ b/app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java @@ -18,7 +18,7 @@ package org.transdroid.core.widget; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EReceiver; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.*; import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.gui.*; diff --git a/core/src/org/transdroid/core/widget/ListWidgetViewsService.java b/app/src/main/java/org/transdroid/core/widget/ListWidgetViewsService.java similarity index 99% rename from core/src/org/transdroid/core/widget/ListWidgetViewsService.java rename to app/src/main/java/org/transdroid/core/widget/ListWidgetViewsService.java index 668096c8..19d7bd73 100644 --- a/core/src/org/transdroid/core/widget/ListWidgetViewsService.java +++ b/app/src/main/java/org/transdroid/core/widget/ListWidgetViewsService.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.androidannotations.annotations.EService; -import org.transdroid.core.R; +import org.transdroid.R; import org.transdroid.core.app.settings.*; import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.log.Log; diff --git a/lib/src/org/transdroid/daemon/AlphanumComparator.java b/app/src/main/java/org/transdroid/daemon/AlphanumComparator.java similarity index 100% rename from lib/src/org/transdroid/daemon/AlphanumComparator.java rename to app/src/main/java/org/transdroid/daemon/AlphanumComparator.java diff --git a/lib/src/org/transdroid/daemon/Aria2c/Aria2Adapter.java b/app/src/main/java/org/transdroid/daemon/Aria2c/Aria2Adapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Aria2c/Aria2Adapter.java rename to app/src/main/java/org/transdroid/daemon/Aria2c/Aria2Adapter.java diff --git a/lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java b/app/src/main/java/org/transdroid/daemon/BitComet/BitCometAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/BitComet/BitCometAdapter.java rename to app/src/main/java/org/transdroid/daemon/BitComet/BitCometAdapter.java diff --git a/lib/src/org/transdroid/daemon/Bitflu/BitfluAdapter.java b/app/src/main/java/org/transdroid/daemon/Bitflu/BitfluAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Bitflu/BitfluAdapter.java rename to app/src/main/java/org/transdroid/daemon/Bitflu/BitfluAdapter.java diff --git a/lib/src/org/transdroid/daemon/BuffaloNas/BuffaloNasAdapter.java b/app/src/main/java/org/transdroid/daemon/BuffaloNas/BuffaloNasAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/BuffaloNas/BuffaloNasAdapter.java rename to app/src/main/java/org/transdroid/daemon/BuffaloNas/BuffaloNasAdapter.java diff --git a/lib/src/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java b/app/src/main/java/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java rename to app/src/main/java/org/transdroid/daemon/DLinkRouterBT/DLinkRouterBTAdapter.java diff --git a/lib/src/org/transdroid/daemon/Daemon.java b/app/src/main/java/org/transdroid/daemon/Daemon.java similarity index 100% rename from lib/src/org/transdroid/daemon/Daemon.java rename to app/src/main/java/org/transdroid/daemon/Daemon.java diff --git a/lib/src/org/transdroid/daemon/DaemonException.java b/app/src/main/java/org/transdroid/daemon/DaemonException.java similarity index 100% rename from lib/src/org/transdroid/daemon/DaemonException.java rename to app/src/main/java/org/transdroid/daemon/DaemonException.java diff --git a/lib/src/org/transdroid/daemon/DaemonMethod.java b/app/src/main/java/org/transdroid/daemon/DaemonMethod.java similarity index 100% rename from lib/src/org/transdroid/daemon/DaemonMethod.java rename to app/src/main/java/org/transdroid/daemon/DaemonMethod.java diff --git a/lib/src/org/transdroid/daemon/DaemonSettings.java b/app/src/main/java/org/transdroid/daemon/DaemonSettings.java similarity index 100% rename from lib/src/org/transdroid/daemon/DaemonSettings.java rename to app/src/main/java/org/transdroid/daemon/DaemonSettings.java diff --git a/lib/src/org/transdroid/daemon/Deluge/DelugeAdapter.java b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Deluge/DelugeAdapter.java rename to app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java diff --git a/lib/src/org/transdroid/daemon/DummyAdapter.java b/app/src/main/java/org/transdroid/daemon/DummyAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/DummyAdapter.java rename to app/src/main/java/org/transdroid/daemon/DummyAdapter.java diff --git a/lib/src/org/transdroid/daemon/Finishable.java b/app/src/main/java/org/transdroid/daemon/Finishable.java similarity index 100% rename from lib/src/org/transdroid/daemon/Finishable.java rename to app/src/main/java/org/transdroid/daemon/Finishable.java diff --git a/lib/src/org/transdroid/daemon/IDaemonAdapter.java b/app/src/main/java/org/transdroid/daemon/IDaemonAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/IDaemonAdapter.java rename to app/src/main/java/org/transdroid/daemon/IDaemonAdapter.java diff --git a/lib/src/org/transdroid/daemon/IDaemonCallback.java b/app/src/main/java/org/transdroid/daemon/IDaemonCallback.java similarity index 100% rename from lib/src/org/transdroid/daemon/IDaemonCallback.java rename to app/src/main/java/org/transdroid/daemon/IDaemonCallback.java diff --git a/lib/src/org/transdroid/daemon/Ktorrent/FileListParser.java b/app/src/main/java/org/transdroid/daemon/Ktorrent/FileListParser.java similarity index 100% rename from lib/src/org/transdroid/daemon/Ktorrent/FileListParser.java rename to app/src/main/java/org/transdroid/daemon/Ktorrent/FileListParser.java diff --git a/lib/src/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java rename to app/src/main/java/org/transdroid/daemon/Ktorrent/KtorrentAdapter.java diff --git a/lib/src/org/transdroid/daemon/Ktorrent/LoggedOutException.java b/app/src/main/java/org/transdroid/daemon/Ktorrent/LoggedOutException.java similarity index 100% rename from lib/src/org/transdroid/daemon/Ktorrent/LoggedOutException.java rename to app/src/main/java/org/transdroid/daemon/Ktorrent/LoggedOutException.java diff --git a/lib/src/org/transdroid/daemon/Ktorrent/StatsParser.java b/app/src/main/java/org/transdroid/daemon/Ktorrent/StatsParser.java similarity index 100% rename from lib/src/org/transdroid/daemon/Ktorrent/StatsParser.java rename to app/src/main/java/org/transdroid/daemon/Ktorrent/StatsParser.java diff --git a/lib/src/org/transdroid/daemon/Label.java b/app/src/main/java/org/transdroid/daemon/Label.java similarity index 100% rename from lib/src/org/transdroid/daemon/Label.java rename to app/src/main/java/org/transdroid/daemon/Label.java diff --git a/lib/src/org/transdroid/daemon/OS.java b/app/src/main/java/org/transdroid/daemon/OS.java similarity index 100% rename from lib/src/org/transdroid/daemon/OS.java rename to app/src/main/java/org/transdroid/daemon/OS.java diff --git a/lib/src/org/transdroid/daemon/Priority.java b/app/src/main/java/org/transdroid/daemon/Priority.java similarity index 100% rename from lib/src/org/transdroid/daemon/Priority.java rename to app/src/main/java/org/transdroid/daemon/Priority.java diff --git a/lib/src/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java rename to app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java diff --git a/lib/src/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java rename to app/src/main/java/org/transdroid/daemon/Rtorrent/RtorrentAdapter.java diff --git a/lib/src/org/transdroid/daemon/Synology/SynologyAdapter.java b/app/src/main/java/org/transdroid/daemon/Synology/SynologyAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Synology/SynologyAdapter.java rename to app/src/main/java/org/transdroid/daemon/Synology/SynologyAdapter.java diff --git a/lib/src/org/transdroid/daemon/TaskQueue.java b/app/src/main/java/org/transdroid/daemon/TaskQueue.java similarity index 100% rename from lib/src/org/transdroid/daemon/TaskQueue.java rename to app/src/main/java/org/transdroid/daemon/TaskQueue.java diff --git a/lib/src/org/transdroid/daemon/Tfb4rt/StatsParser.java b/app/src/main/java/org/transdroid/daemon/Tfb4rt/StatsParser.java similarity index 100% rename from lib/src/org/transdroid/daemon/Tfb4rt/StatsParser.java rename to app/src/main/java/org/transdroid/daemon/Tfb4rt/StatsParser.java diff --git a/lib/src/org/transdroid/daemon/Tfb4rt/Tfb4rtAdapter.java b/app/src/main/java/org/transdroid/daemon/Tfb4rt/Tfb4rtAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Tfb4rt/Tfb4rtAdapter.java rename to app/src/main/java/org/transdroid/daemon/Tfb4rt/Tfb4rtAdapter.java diff --git a/lib/src/org/transdroid/daemon/Torrent.java b/app/src/main/java/org/transdroid/daemon/Torrent.java similarity index 100% rename from lib/src/org/transdroid/daemon/Torrent.java rename to app/src/main/java/org/transdroid/daemon/Torrent.java diff --git a/lib/src/org/transdroid/daemon/TorrentDetails.java b/app/src/main/java/org/transdroid/daemon/TorrentDetails.java similarity index 100% rename from lib/src/org/transdroid/daemon/TorrentDetails.java rename to app/src/main/java/org/transdroid/daemon/TorrentDetails.java diff --git a/lib/src/org/transdroid/daemon/TorrentFile.java b/app/src/main/java/org/transdroid/daemon/TorrentFile.java similarity index 100% rename from lib/src/org/transdroid/daemon/TorrentFile.java rename to app/src/main/java/org/transdroid/daemon/TorrentFile.java diff --git a/lib/src/org/transdroid/daemon/TorrentFilesComparator.java b/app/src/main/java/org/transdroid/daemon/TorrentFilesComparator.java similarity index 100% rename from lib/src/org/transdroid/daemon/TorrentFilesComparator.java rename to app/src/main/java/org/transdroid/daemon/TorrentFilesComparator.java diff --git a/lib/src/org/transdroid/daemon/TorrentFilesSortBy.java b/app/src/main/java/org/transdroid/daemon/TorrentFilesSortBy.java similarity index 100% rename from lib/src/org/transdroid/daemon/TorrentFilesSortBy.java rename to app/src/main/java/org/transdroid/daemon/TorrentFilesSortBy.java diff --git a/lib/src/org/transdroid/daemon/TorrentStatus.java b/app/src/main/java/org/transdroid/daemon/TorrentStatus.java similarity index 100% rename from lib/src/org/transdroid/daemon/TorrentStatus.java rename to app/src/main/java/org/transdroid/daemon/TorrentStatus.java diff --git a/lib/src/org/transdroid/daemon/TorrentsComparator.java b/app/src/main/java/org/transdroid/daemon/TorrentsComparator.java similarity index 100% rename from lib/src/org/transdroid/daemon/TorrentsComparator.java rename to app/src/main/java/org/transdroid/daemon/TorrentsComparator.java diff --git a/lib/src/org/transdroid/daemon/TorrentsSortBy.java b/app/src/main/java/org/transdroid/daemon/TorrentsSortBy.java similarity index 100% rename from lib/src/org/transdroid/daemon/TorrentsSortBy.java rename to app/src/main/java/org/transdroid/daemon/TorrentsSortBy.java diff --git a/lib/src/org/transdroid/daemon/Transmission/TransmissionAdapter.java b/app/src/main/java/org/transdroid/daemon/Transmission/TransmissionAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Transmission/TransmissionAdapter.java rename to app/src/main/java/org/transdroid/daemon/Transmission/TransmissionAdapter.java diff --git a/lib/src/org/transdroid/daemon/Utorrent/UtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/Utorrent/UtorrentAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Utorrent/UtorrentAdapter.java rename to app/src/main/java/org/transdroid/daemon/Utorrent/UtorrentAdapter.java diff --git a/lib/src/org/transdroid/daemon/Vuze/VuzeAdapter.java b/app/src/main/java/org/transdroid/daemon/Vuze/VuzeAdapter.java similarity index 100% rename from lib/src/org/transdroid/daemon/Vuze/VuzeAdapter.java rename to app/src/main/java/org/transdroid/daemon/Vuze/VuzeAdapter.java diff --git a/lib/src/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java b/app/src/main/java/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java similarity index 100% rename from lib/src/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java rename to app/src/main/java/org/transdroid/daemon/Vuze/VuzeXmlOverHttpClient.java diff --git a/lib/src/org/transdroid/daemon/task/AddByFileTask.java b/app/src/main/java/org/transdroid/daemon/task/AddByFileTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/AddByFileTask.java rename to app/src/main/java/org/transdroid/daemon/task/AddByFileTask.java diff --git a/lib/src/org/transdroid/daemon/task/AddByMagnetUrlTask.java b/app/src/main/java/org/transdroid/daemon/task/AddByMagnetUrlTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/AddByMagnetUrlTask.java rename to app/src/main/java/org/transdroid/daemon/task/AddByMagnetUrlTask.java diff --git a/lib/src/org/transdroid/daemon/task/AddByUrlTask.java b/app/src/main/java/org/transdroid/daemon/task/AddByUrlTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/AddByUrlTask.java rename to app/src/main/java/org/transdroid/daemon/task/AddByUrlTask.java diff --git a/lib/src/org/transdroid/daemon/task/DaemonTask.java b/app/src/main/java/org/transdroid/daemon/task/DaemonTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/DaemonTask.java rename to app/src/main/java/org/transdroid/daemon/task/DaemonTask.java diff --git a/lib/src/org/transdroid/daemon/task/DaemonTaskFailureResult.java b/app/src/main/java/org/transdroid/daemon/task/DaemonTaskFailureResult.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/DaemonTaskFailureResult.java rename to app/src/main/java/org/transdroid/daemon/task/DaemonTaskFailureResult.java diff --git a/lib/src/org/transdroid/daemon/task/DaemonTaskResult.java b/app/src/main/java/org/transdroid/daemon/task/DaemonTaskResult.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/DaemonTaskResult.java rename to app/src/main/java/org/transdroid/daemon/task/DaemonTaskResult.java diff --git a/lib/src/org/transdroid/daemon/task/DaemonTaskSuccessResult.java b/app/src/main/java/org/transdroid/daemon/task/DaemonTaskSuccessResult.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/DaemonTaskSuccessResult.java rename to app/src/main/java/org/transdroid/daemon/task/DaemonTaskSuccessResult.java diff --git a/lib/src/org/transdroid/daemon/task/ForceRecheckTask.java b/app/src/main/java/org/transdroid/daemon/task/ForceRecheckTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/ForceRecheckTask.java rename to app/src/main/java/org/transdroid/daemon/task/ForceRecheckTask.java diff --git a/lib/src/org/transdroid/daemon/task/GetFileListTask.java b/app/src/main/java/org/transdroid/daemon/task/GetFileListTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/GetFileListTask.java rename to app/src/main/java/org/transdroid/daemon/task/GetFileListTask.java diff --git a/lib/src/org/transdroid/daemon/task/GetFileListTaskSuccessResult.java b/app/src/main/java/org/transdroid/daemon/task/GetFileListTaskSuccessResult.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/GetFileListTaskSuccessResult.java rename to app/src/main/java/org/transdroid/daemon/task/GetFileListTaskSuccessResult.java diff --git a/lib/src/org/transdroid/daemon/task/GetStatsTask.java b/app/src/main/java/org/transdroid/daemon/task/GetStatsTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/GetStatsTask.java rename to app/src/main/java/org/transdroid/daemon/task/GetStatsTask.java diff --git a/lib/src/org/transdroid/daemon/task/GetStatsTaskSuccessResult.java b/app/src/main/java/org/transdroid/daemon/task/GetStatsTaskSuccessResult.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/GetStatsTaskSuccessResult.java rename to app/src/main/java/org/transdroid/daemon/task/GetStatsTaskSuccessResult.java diff --git a/lib/src/org/transdroid/daemon/task/GetTorrentDetailsTask.java b/app/src/main/java/org/transdroid/daemon/task/GetTorrentDetailsTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/GetTorrentDetailsTask.java rename to app/src/main/java/org/transdroid/daemon/task/GetTorrentDetailsTask.java diff --git a/lib/src/org/transdroid/daemon/task/GetTorrentDetailsTaskSuccessResult.java b/app/src/main/java/org/transdroid/daemon/task/GetTorrentDetailsTaskSuccessResult.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/GetTorrentDetailsTaskSuccessResult.java rename to app/src/main/java/org/transdroid/daemon/task/GetTorrentDetailsTaskSuccessResult.java diff --git a/lib/src/org/transdroid/daemon/task/PauseAllTask.java b/app/src/main/java/org/transdroid/daemon/task/PauseAllTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/PauseAllTask.java rename to app/src/main/java/org/transdroid/daemon/task/PauseAllTask.java diff --git a/lib/src/org/transdroid/daemon/task/PauseTask.java b/app/src/main/java/org/transdroid/daemon/task/PauseTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/PauseTask.java rename to app/src/main/java/org/transdroid/daemon/task/PauseTask.java diff --git a/lib/src/org/transdroid/daemon/task/RemoveTask.java b/app/src/main/java/org/transdroid/daemon/task/RemoveTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/RemoveTask.java rename to app/src/main/java/org/transdroid/daemon/task/RemoveTask.java diff --git a/lib/src/org/transdroid/daemon/task/ResumeAllTask.java b/app/src/main/java/org/transdroid/daemon/task/ResumeAllTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/ResumeAllTask.java rename to app/src/main/java/org/transdroid/daemon/task/ResumeAllTask.java diff --git a/lib/src/org/transdroid/daemon/task/ResumeTask.java b/app/src/main/java/org/transdroid/daemon/task/ResumeTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/ResumeTask.java rename to app/src/main/java/org/transdroid/daemon/task/ResumeTask.java diff --git a/lib/src/org/transdroid/daemon/task/RetrieveTask.java b/app/src/main/java/org/transdroid/daemon/task/RetrieveTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/RetrieveTask.java rename to app/src/main/java/org/transdroid/daemon/task/RetrieveTask.java diff --git a/lib/src/org/transdroid/daemon/task/RetrieveTaskSuccessResult.java b/app/src/main/java/org/transdroid/daemon/task/RetrieveTaskSuccessResult.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/RetrieveTaskSuccessResult.java rename to app/src/main/java/org/transdroid/daemon/task/RetrieveTaskSuccessResult.java diff --git a/lib/src/org/transdroid/daemon/task/SetAlternativeModeTask.java b/app/src/main/java/org/transdroid/daemon/task/SetAlternativeModeTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/SetAlternativeModeTask.java rename to app/src/main/java/org/transdroid/daemon/task/SetAlternativeModeTask.java diff --git a/lib/src/org/transdroid/daemon/task/SetDownloadLocationTask.java b/app/src/main/java/org/transdroid/daemon/task/SetDownloadLocationTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/SetDownloadLocationTask.java rename to app/src/main/java/org/transdroid/daemon/task/SetDownloadLocationTask.java diff --git a/lib/src/org/transdroid/daemon/task/SetFilePriorityTask.java b/app/src/main/java/org/transdroid/daemon/task/SetFilePriorityTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/SetFilePriorityTask.java rename to app/src/main/java/org/transdroid/daemon/task/SetFilePriorityTask.java diff --git a/lib/src/org/transdroid/daemon/task/SetLabelTask.java b/app/src/main/java/org/transdroid/daemon/task/SetLabelTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/SetLabelTask.java rename to app/src/main/java/org/transdroid/daemon/task/SetLabelTask.java diff --git a/lib/src/org/transdroid/daemon/task/SetTrackersTask.java b/app/src/main/java/org/transdroid/daemon/task/SetTrackersTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/SetTrackersTask.java rename to app/src/main/java/org/transdroid/daemon/task/SetTrackersTask.java diff --git a/lib/src/org/transdroid/daemon/task/SetTransferRatesTask.java b/app/src/main/java/org/transdroid/daemon/task/SetTransferRatesTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/SetTransferRatesTask.java rename to app/src/main/java/org/transdroid/daemon/task/SetTransferRatesTask.java diff --git a/lib/src/org/transdroid/daemon/task/StartAllTask.java b/app/src/main/java/org/transdroid/daemon/task/StartAllTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/StartAllTask.java rename to app/src/main/java/org/transdroid/daemon/task/StartAllTask.java diff --git a/lib/src/org/transdroid/daemon/task/StartTask.java b/app/src/main/java/org/transdroid/daemon/task/StartTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/StartTask.java rename to app/src/main/java/org/transdroid/daemon/task/StartTask.java diff --git a/lib/src/org/transdroid/daemon/task/StopAllTask.java b/app/src/main/java/org/transdroid/daemon/task/StopAllTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/StopAllTask.java rename to app/src/main/java/org/transdroid/daemon/task/StopAllTask.java diff --git a/lib/src/org/transdroid/daemon/task/StopTask.java b/app/src/main/java/org/transdroid/daemon/task/StopTask.java similarity index 100% rename from lib/src/org/transdroid/daemon/task/StopTask.java rename to app/src/main/java/org/transdroid/daemon/task/StopTask.java diff --git a/lib/src/org/transdroid/daemon/util/Collections2.java b/app/src/main/java/org/transdroid/daemon/util/Collections2.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/Collections2.java rename to app/src/main/java/org/transdroid/daemon/util/Collections2.java diff --git a/lib/src/org/transdroid/daemon/util/DLog.java b/app/src/main/java/org/transdroid/daemon/util/DLog.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/DLog.java rename to app/src/main/java/org/transdroid/daemon/util/DLog.java diff --git a/lib/src/org/transdroid/daemon/util/FakeSocketFactory.java b/app/src/main/java/org/transdroid/daemon/util/FakeSocketFactory.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/FakeSocketFactory.java rename to app/src/main/java/org/transdroid/daemon/util/FakeSocketFactory.java diff --git a/lib/src/org/transdroid/daemon/util/FakeTrustManager.java b/app/src/main/java/org/transdroid/daemon/util/FakeTrustManager.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/FakeTrustManager.java rename to app/src/main/java/org/transdroid/daemon/util/FakeTrustManager.java diff --git a/lib/src/org/transdroid/daemon/util/FileSizeConverter.java b/app/src/main/java/org/transdroid/daemon/util/FileSizeConverter.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/FileSizeConverter.java rename to app/src/main/java/org/transdroid/daemon/util/FileSizeConverter.java diff --git a/lib/src/org/transdroid/daemon/util/HttpHelper.java b/app/src/main/java/org/transdroid/daemon/util/HttpHelper.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/HttpHelper.java rename to app/src/main/java/org/transdroid/daemon/util/HttpHelper.java diff --git a/lib/src/org/transdroid/daemon/util/ITLogger.java b/app/src/main/java/org/transdroid/daemon/util/ITLogger.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/ITLogger.java rename to app/src/main/java/org/transdroid/daemon/util/ITLogger.java diff --git a/lib/src/org/transdroid/daemon/util/Pair.java b/app/src/main/java/org/transdroid/daemon/util/Pair.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/Pair.java rename to app/src/main/java/org/transdroid/daemon/util/Pair.java diff --git a/lib/src/org/transdroid/daemon/util/TimespanConverter.java b/app/src/main/java/org/transdroid/daemon/util/TimespanConverter.java similarity index 100% rename from lib/src/org/transdroid/daemon/util/TimespanConverter.java rename to app/src/main/java/org/transdroid/daemon/util/TimespanConverter.java diff --git a/core/res/drawable-hdpi/ab_bottom_solid_transdroid.9.png b/app/src/main/res/drawable-hdpi/ab_bottom_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/ab_bottom_solid_transdroid.9.png rename to app/src/main/res/drawable-hdpi/ab_bottom_solid_transdroid.9.png diff --git a/core/res/drawable-hdpi/ab_bottom_solid_transdroid2.9.png b/app/src/main/res/drawable-hdpi/ab_bottom_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/ab_bottom_solid_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/ab_bottom_solid_transdroid2.9.png diff --git a/core/res/drawable-hdpi/ab_solid_transdroid.9.png b/app/src/main/res/drawable-hdpi/ab_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/ab_solid_transdroid.9.png rename to app/src/main/res/drawable-hdpi/ab_solid_transdroid.9.png diff --git a/core/res/drawable-hdpi/ab_solid_transdroid2.9.png b/app/src/main/res/drawable-hdpi/ab_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/ab_solid_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/ab_solid_transdroid2.9.png diff --git a/core/res/drawable-hdpi/ab_stacked_solid_transdroid.9.png b/app/src/main/res/drawable-hdpi/ab_stacked_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/ab_stacked_solid_transdroid.9.png rename to app/src/main/res/drawable-hdpi/ab_stacked_solid_transdroid.9.png diff --git a/core/res/drawable-hdpi/ab_stacked_solid_transdroid2.9.png b/app/src/main/res/drawable-hdpi/ab_stacked_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/ab_stacked_solid_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/ab_stacked_solid_transdroid2.9.png diff --git a/core/res/drawable-hdpi/ab_texture_tile_transdroid2.png b/app/src/main/res/drawable-hdpi/ab_texture_tile_transdroid2.png similarity index 100% rename from core/res/drawable-hdpi/ab_texture_tile_transdroid2.png rename to app/src/main/res/drawable-hdpi/ab_texture_tile_transdroid2.png diff --git a/core/res/drawable-hdpi/ab_transparent_transdroid.9.png b/app/src/main/res/drawable-hdpi/ab_transparent_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/ab_transparent_transdroid.9.png rename to app/src/main/res/drawable-hdpi/ab_transparent_transdroid.9.png diff --git a/core/res/drawable-hdpi/ab_transparent_transdroid2.9.png b/app/src/main/res/drawable-hdpi/ab_transparent_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/ab_transparent_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/ab_transparent_transdroid2.9.png diff --git a/core/res/drawable-hdpi/abc_list_focused_holo.9.png b/app/src/main/res/drawable-hdpi/abc_list_focused_holo.9.png similarity index 100% rename from core/res/drawable-hdpi/abc_list_focused_holo.9.png rename to app/src/main/res/drawable-hdpi/abc_list_focused_holo.9.png diff --git a/core/res/drawable-hdpi/abc_list_longpressed_holo.9.png b/app/src/main/res/drawable-hdpi/abc_list_longpressed_holo.9.png similarity index 100% rename from core/res/drawable-hdpi/abc_list_longpressed_holo.9.png rename to app/src/main/res/drawable-hdpi/abc_list_longpressed_holo.9.png diff --git a/core/res/drawable-hdpi/abc_list_pressed_holo_dark.9.png b/app/src/main/res/drawable-hdpi/abc_list_pressed_holo_dark.9.png similarity index 100% rename from core/res/drawable-hdpi/abc_list_pressed_holo_dark.9.png rename to app/src/main/res/drawable-hdpi/abc_list_pressed_holo_dark.9.png diff --git a/core/res/drawable-hdpi/abc_list_pressed_holo_light.9.png b/app/src/main/res/drawable-hdpi/abc_list_pressed_holo_light.9.png similarity index 100% rename from core/res/drawable-hdpi/abc_list_pressed_holo_light.9.png rename to app/src/main/res/drawable-hdpi/abc_list_pressed_holo_light.9.png diff --git a/core/res/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png b/app/src/main/res/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png similarity index 100% rename from core/res/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png rename to app/src/main/res/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png diff --git a/core/res/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png b/app/src/main/res/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png similarity index 100% rename from core/res/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png rename to app/src/main/res/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png diff --git a/core/res/drawable-hdpi/btn_cab_done_default_transdroid2.9.png b/app/src/main/res/drawable-hdpi/btn_cab_done_default_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/btn_cab_done_default_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/btn_cab_done_default_transdroid2.9.png diff --git a/core/res/drawable-hdpi/btn_cab_done_focused_transdroid2.9.png b/app/src/main/res/drawable-hdpi/btn_cab_done_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/btn_cab_done_focused_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/btn_cab_done_focused_transdroid2.9.png diff --git a/core/res/drawable-hdpi/btn_cab_done_pressed_transdroid2.9.png b/app/src/main/res/drawable-hdpi/btn_cab_done_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/btn_cab_done_pressed_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/btn_cab_done_pressed_transdroid2.9.png diff --git a/core/res/drawable-hdpi/cab_background_bottom_transdroid2.9.png b/app/src/main/res/drawable-hdpi/cab_background_bottom_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/cab_background_bottom_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/cab_background_bottom_transdroid2.9.png diff --git a/core/res/drawable-hdpi/cab_background_top_transdroid2.9.png b/app/src/main/res/drawable-hdpi/cab_background_top_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/cab_background_top_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/cab_background_top_transdroid2.9.png diff --git a/core/res/drawable-hdpi/ic_action_discard_dark.png b/app/src/main/res/drawable-hdpi/ic_action_discard_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_discard_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_discard_dark.png diff --git a/core/res/drawable-hdpi/ic_action_discard_light.png b/app/src/main/res/drawable-hdpi/ic_action_discard_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_discard_light.png rename to app/src/main/res/drawable-hdpi/ic_action_discard_light.png diff --git a/core/res/drawable-hdpi/ic_action_done_dark.png b/app/src/main/res/drawable-hdpi/ic_action_done_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_done_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_done_dark.png diff --git a/core/res/drawable-hdpi/ic_action_done_light.png b/app/src/main/res/drawable-hdpi/ic_action_done_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_done_light.png rename to app/src/main/res/drawable-hdpi/ic_action_done_light.png diff --git a/core/res/drawable-hdpi/ic_action_filter_dark.png b/app/src/main/res/drawable-hdpi/ic_action_filter_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_filter_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_filter_dark.png diff --git a/core/res/drawable-hdpi/ic_action_filter_light.png b/app/src/main/res/drawable-hdpi/ic_action_filter_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_filter_light.png rename to app/src/main/res/drawable-hdpi/ic_action_filter_light.png diff --git a/core/res/drawable-hdpi/ic_action_forcerecheck_dark.png b/app/src/main/res/drawable-hdpi/ic_action_forcerecheck_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_forcerecheck_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_forcerecheck_dark.png diff --git a/core/res/drawable-hdpi/ic_action_forcerecheck_light.png b/app/src/main/res/drawable-hdpi/ic_action_forcerecheck_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_forcerecheck_light.png rename to app/src/main/res/drawable-hdpi/ic_action_forcerecheck_light.png diff --git a/core/res/drawable-hdpi/ic_action_info_dark.png b/app/src/main/res/drawable-hdpi/ic_action_info_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_info_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_info_dark.png diff --git a/core/res/drawable-hdpi/ic_action_info_light.png b/app/src/main/res/drawable-hdpi/ic_action_info_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_info_light.png rename to app/src/main/res/drawable-hdpi/ic_action_info_light.png diff --git a/core/res/drawable-hdpi/ic_action_labels_dark.png b/app/src/main/res/drawable-hdpi/ic_action_labels_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_labels_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_labels_dark.png diff --git a/core/res/drawable-hdpi/ic_action_labels_light.png b/app/src/main/res/drawable-hdpi/ic_action_labels_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_labels_light.png rename to app/src/main/res/drawable-hdpi/ic_action_labels_light.png diff --git a/core/res/drawable-hdpi/ic_action_new_dark.png b/app/src/main/res/drawable-hdpi/ic_action_new_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_new_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_new_dark.png diff --git a/core/res/drawable-hdpi/ic_action_new_light.png b/app/src/main/res/drawable-hdpi/ic_action_new_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_new_light.png rename to app/src/main/res/drawable-hdpi/ic_action_new_light.png diff --git a/core/res/drawable-hdpi/ic_action_overflow.png b/app/src/main/res/drawable-hdpi/ic_action_overflow.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_overflow.png rename to app/src/main/res/drawable-hdpi/ic_action_overflow.png diff --git a/core/res/drawable-hdpi/ic_action_pause_dark.png b/app/src/main/res/drawable-hdpi/ic_action_pause_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_pause_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_pause_dark.png diff --git a/core/res/drawable-hdpi/ic_action_pause_light.png b/app/src/main/res/drawable-hdpi/ic_action_pause_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_pause_light.png rename to app/src/main/res/drawable-hdpi/ic_action_pause_light.png diff --git a/core/res/drawable-hdpi/ic_action_priority_high_dark.png b/app/src/main/res/drawable-hdpi/ic_action_priority_high_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_priority_high_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_priority_high_dark.png diff --git a/core/res/drawable-hdpi/ic_action_priority_high_light.png b/app/src/main/res/drawable-hdpi/ic_action_priority_high_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_priority_high_light.png rename to app/src/main/res/drawable-hdpi/ic_action_priority_high_light.png diff --git a/core/res/drawable-hdpi/ic_action_priority_low_dark.png b/app/src/main/res/drawable-hdpi/ic_action_priority_low_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_priority_low_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_priority_low_dark.png diff --git a/core/res/drawable-hdpi/ic_action_priority_low_light.png b/app/src/main/res/drawable-hdpi/ic_action_priority_low_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_priority_low_light.png rename to app/src/main/res/drawable-hdpi/ic_action_priority_low_light.png diff --git a/core/res/drawable-hdpi/ic_action_priority_normal_dark.png b/app/src/main/res/drawable-hdpi/ic_action_priority_normal_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_priority_normal_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_priority_normal_dark.png diff --git a/core/res/drawable-hdpi/ic_action_priority_normal_light.png b/app/src/main/res/drawable-hdpi/ic_action_priority_normal_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_priority_normal_light.png rename to app/src/main/res/drawable-hdpi/ic_action_priority_normal_light.png diff --git a/core/res/drawable-hdpi/ic_action_priority_off_dark.png b/app/src/main/res/drawable-hdpi/ic_action_priority_off_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_priority_off_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_priority_off_dark.png diff --git a/core/res/drawable-hdpi/ic_action_priority_off_light.png b/app/src/main/res/drawable-hdpi/ic_action_priority_off_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_priority_off_light.png rename to app/src/main/res/drawable-hdpi/ic_action_priority_off_light.png diff --git a/core/res/drawable-hdpi/ic_action_refresh_dark.png b/app/src/main/res/drawable-hdpi/ic_action_refresh_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_refresh_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_refresh_dark.png diff --git a/core/res/drawable-hdpi/ic_action_refresh_light.png b/app/src/main/res/drawable-hdpi/ic_action_refresh_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_refresh_light.png rename to app/src/main/res/drawable-hdpi/ic_action_refresh_light.png diff --git a/core/res/drawable-hdpi/ic_action_remove_dark.png b/app/src/main/res/drawable-hdpi/ic_action_remove_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_remove_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_remove_dark.png diff --git a/core/res/drawable-hdpi/ic_action_remove_light.png b/app/src/main/res/drawable-hdpi/ic_action_remove_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_remove_light.png rename to app/src/main/res/drawable-hdpi/ic_action_remove_light.png diff --git a/core/res/drawable-hdpi/ic_action_resume_dark.png b/app/src/main/res/drawable-hdpi/ic_action_resume_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_resume_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_resume_dark.png diff --git a/core/res/drawable-hdpi/ic_action_resume_light.png b/app/src/main/res/drawable-hdpi/ic_action_resume_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_resume_light.png rename to app/src/main/res/drawable-hdpi/ic_action_resume_light.png diff --git a/core/res/drawable-hdpi/ic_action_rss_dark.png b/app/src/main/res/drawable-hdpi/ic_action_rss_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_rss_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_rss_dark.png diff --git a/core/res/drawable-hdpi/ic_action_rss_light.png b/app/src/main/res/drawable-hdpi/ic_action_rss_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_rss_light.png rename to app/src/main/res/drawable-hdpi/ic_action_rss_light.png diff --git a/core/res/drawable-hdpi/ic_action_save_dark.png b/app/src/main/res/drawable-hdpi/ic_action_save_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_save_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_save_dark.png diff --git a/core/res/drawable-hdpi/ic_action_save_light.png b/app/src/main/res/drawable-hdpi/ic_action_save_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_save_light.png rename to app/src/main/res/drawable-hdpi/ic_action_save_light.png diff --git a/core/res/drawable-hdpi/ic_action_search_dark.png b/app/src/main/res/drawable-hdpi/ic_action_search_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_search_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_search_dark.png diff --git a/core/res/drawable-hdpi/ic_action_search_light.png b/app/src/main/res/drawable-hdpi/ic_action_search_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_search_light.png rename to app/src/main/res/drawable-hdpi/ic_action_search_light.png diff --git a/core/res/drawable-hdpi/ic_action_sort_by_size_dark.png b/app/src/main/res/drawable-hdpi/ic_action_sort_by_size_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_sort_by_size_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_sort_by_size_dark.png diff --git a/core/res/drawable-hdpi/ic_action_sort_by_size_light.png b/app/src/main/res/drawable-hdpi/ic_action_sort_by_size_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_sort_by_size_light.png rename to app/src/main/res/drawable-hdpi/ic_action_sort_by_size_light.png diff --git a/core/res/drawable-hdpi/ic_action_start_dark.png b/app/src/main/res/drawable-hdpi/ic_action_start_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_start_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_start_dark.png diff --git a/core/res/drawable-hdpi/ic_action_start_light.png b/app/src/main/res/drawable-hdpi/ic_action_start_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_start_light.png rename to app/src/main/res/drawable-hdpi/ic_action_start_light.png diff --git a/core/res/drawable-hdpi/ic_action_stop_dark.png b/app/src/main/res/drawable-hdpi/ic_action_stop_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_stop_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_stop_dark.png diff --git a/core/res/drawable-hdpi/ic_action_stop_light.png b/app/src/main/res/drawable-hdpi/ic_action_stop_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_stop_light.png rename to app/src/main/res/drawable-hdpi/ic_action_stop_light.png diff --git a/core/res/drawable-hdpi/ic_action_trackers_dark.png b/app/src/main/res/drawable-hdpi/ic_action_trackers_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_trackers_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_trackers_dark.png diff --git a/core/res/drawable-hdpi/ic_action_trackers_light.png b/app/src/main/res/drawable-hdpi/ic_action_trackers_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_trackers_light.png rename to app/src/main/res/drawable-hdpi/ic_action_trackers_light.png diff --git a/core/res/drawable-hdpi/ic_action_turtle_disabled_light.png b/app/src/main/res/drawable-hdpi/ic_action_turtle_disabled_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_turtle_disabled_light.png rename to app/src/main/res/drawable-hdpi/ic_action_turtle_disabled_light.png diff --git a/core/res/drawable-hdpi/ic_action_turtle_enabled.png b/app/src/main/res/drawable-hdpi/ic_action_turtle_enabled.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_turtle_enabled.png rename to app/src/main/res/drawable-hdpi/ic_action_turtle_enabled.png diff --git a/core/res/drawable-hdpi/ic_action_website_dark.png b/app/src/main/res/drawable-hdpi/ic_action_website_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_website_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_website_dark.png diff --git a/core/res/drawable-hdpi/ic_action_website_light.png b/app/src/main/res/drawable-hdpi/ic_action_website_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_action_website_light.png rename to app/src/main/res/drawable-hdpi/ic_action_website_light.png diff --git a/core/res/drawable-hdpi/ic_activity_torrents.png b/app/src/main/res/drawable-hdpi/ic_activity_torrents.png similarity index 100% rename from core/res/drawable-hdpi/ic_activity_torrents.png rename to app/src/main/res/drawable-hdpi/ic_activity_torrents.png diff --git a/core/res/drawable-hdpi/ic_empty_details_dark.png b/app/src/main/res/drawable-hdpi/ic_empty_details_dark.png similarity index 100% rename from core/res/drawable-hdpi/ic_empty_details_dark.png rename to app/src/main/res/drawable-hdpi/ic_empty_details_dark.png diff --git a/core/res/drawable-hdpi/ic_empty_details_light.png b/app/src/main/res/drawable-hdpi/ic_empty_details_light.png similarity index 100% rename from core/res/drawable-hdpi/ic_empty_details_light.png rename to app/src/main/res/drawable-hdpi/ic_empty_details_light.png diff --git a/core/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from core/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/core/res/drawable-hdpi/ic_stat_notification.png b/app/src/main/res/drawable-hdpi/ic_stat_notification.png similarity index 100% rename from core/res/drawable-hdpi/ic_stat_notification.png rename to app/src/main/res/drawable-hdpi/ic_stat_notification.png diff --git a/core/res/drawable-hdpi/list_focused_transdroid.9.png b/app/src/main/res/drawable-hdpi/list_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/list_focused_transdroid.9.png rename to app/src/main/res/drawable-hdpi/list_focused_transdroid.9.png diff --git a/core/res/drawable-hdpi/list_focused_transdroid2.9.png b/app/src/main/res/drawable-hdpi/list_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/list_focused_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/list_focused_transdroid2.9.png diff --git a/core/res/drawable-hdpi/menu_dropdown_panel_transdroid.9.png b/app/src/main/res/drawable-hdpi/menu_dropdown_panel_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/menu_dropdown_panel_transdroid.9.png rename to app/src/main/res/drawable-hdpi/menu_dropdown_panel_transdroid.9.png diff --git a/core/res/drawable-hdpi/menu_dropdown_panel_transdroid2.9.png b/app/src/main/res/drawable-hdpi/menu_dropdown_panel_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/menu_dropdown_panel_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/menu_dropdown_panel_transdroid2.9.png diff --git a/core/res/drawable-hdpi/menu_hardkey_panel_transdroid.9.png b/app/src/main/res/drawable-hdpi/menu_hardkey_panel_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/menu_hardkey_panel_transdroid.9.png rename to app/src/main/res/drawable-hdpi/menu_hardkey_panel_transdroid.9.png diff --git a/core/res/drawable-hdpi/progress_bg_transdroid.9.png b/app/src/main/res/drawable-hdpi/progress_bg_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/progress_bg_transdroid.9.png rename to app/src/main/res/drawable-hdpi/progress_bg_transdroid.9.png diff --git a/core/res/drawable-hdpi/progress_bg_transdroid2.9.png b/app/src/main/res/drawable-hdpi/progress_bg_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/progress_bg_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/progress_bg_transdroid2.9.png diff --git a/core/res/drawable-hdpi/progress_primary_transdroid.9.png b/app/src/main/res/drawable-hdpi/progress_primary_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/progress_primary_transdroid.9.png rename to app/src/main/res/drawable-hdpi/progress_primary_transdroid.9.png diff --git a/core/res/drawable-hdpi/progress_primary_transdroid2.9.png b/app/src/main/res/drawable-hdpi/progress_primary_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/progress_primary_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/progress_primary_transdroid2.9.png diff --git a/core/res/drawable-hdpi/progress_secondary_transdroid.9.png b/app/src/main/res/drawable-hdpi/progress_secondary_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/progress_secondary_transdroid.9.png rename to app/src/main/res/drawable-hdpi/progress_secondary_transdroid.9.png diff --git a/core/res/drawable-hdpi/progress_secondary_transdroid2.9.png b/app/src/main/res/drawable-hdpi/progress_secondary_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/progress_secondary_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/progress_secondary_transdroid2.9.png diff --git a/core/res/drawable-hdpi/spinner_ab_default_transdroid.9.png b/app/src/main/res/drawable-hdpi/spinner_ab_default_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/spinner_ab_default_transdroid.9.png rename to app/src/main/res/drawable-hdpi/spinner_ab_default_transdroid.9.png diff --git a/core/res/drawable-hdpi/spinner_ab_default_transdroid2.9.png b/app/src/main/res/drawable-hdpi/spinner_ab_default_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/spinner_ab_default_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/spinner_ab_default_transdroid2.9.png diff --git a/core/res/drawable-hdpi/spinner_ab_disabled_transdroid.9.png b/app/src/main/res/drawable-hdpi/spinner_ab_disabled_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/spinner_ab_disabled_transdroid.9.png rename to app/src/main/res/drawable-hdpi/spinner_ab_disabled_transdroid.9.png diff --git a/core/res/drawable-hdpi/spinner_ab_disabled_transdroid2.9.png b/app/src/main/res/drawable-hdpi/spinner_ab_disabled_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/spinner_ab_disabled_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/spinner_ab_disabled_transdroid2.9.png diff --git a/core/res/drawable-hdpi/spinner_ab_focused_transdroid.9.png b/app/src/main/res/drawable-hdpi/spinner_ab_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/spinner_ab_focused_transdroid.9.png rename to app/src/main/res/drawable-hdpi/spinner_ab_focused_transdroid.9.png diff --git a/core/res/drawable-hdpi/spinner_ab_focused_transdroid2.9.png b/app/src/main/res/drawable-hdpi/spinner_ab_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/spinner_ab_focused_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/spinner_ab_focused_transdroid2.9.png diff --git a/core/res/drawable-hdpi/spinner_ab_pressed_transdroid.9.png b/app/src/main/res/drawable-hdpi/spinner_ab_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/spinner_ab_pressed_transdroid.9.png rename to app/src/main/res/drawable-hdpi/spinner_ab_pressed_transdroid.9.png diff --git a/core/res/drawable-hdpi/spinner_ab_pressed_transdroid2.9.png b/app/src/main/res/drawable-hdpi/spinner_ab_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/spinner_ab_pressed_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/spinner_ab_pressed_transdroid2.9.png diff --git a/core/res/drawable-hdpi/tab_selected_focused_transdroid.9.png b/app/src/main/res/drawable-hdpi/tab_selected_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_selected_focused_transdroid.9.png rename to app/src/main/res/drawable-hdpi/tab_selected_focused_transdroid.9.png diff --git a/core/res/drawable-hdpi/tab_selected_focused_transdroid2.9.png b/app/src/main/res/drawable-hdpi/tab_selected_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_selected_focused_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/tab_selected_focused_transdroid2.9.png diff --git a/core/res/drawable-hdpi/tab_selected_pressed_transdroid.9.png b/app/src/main/res/drawable-hdpi/tab_selected_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_selected_pressed_transdroid.9.png rename to app/src/main/res/drawable-hdpi/tab_selected_pressed_transdroid.9.png diff --git a/core/res/drawable-hdpi/tab_selected_pressed_transdroid2.9.png b/app/src/main/res/drawable-hdpi/tab_selected_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_selected_pressed_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/tab_selected_pressed_transdroid2.9.png diff --git a/core/res/drawable-hdpi/tab_selected_transdroid.9.png b/app/src/main/res/drawable-hdpi/tab_selected_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_selected_transdroid.9.png rename to app/src/main/res/drawable-hdpi/tab_selected_transdroid.9.png diff --git a/core/res/drawable-hdpi/tab_selected_transdroid2.9.png b/app/src/main/res/drawable-hdpi/tab_selected_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_selected_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/tab_selected_transdroid2.9.png diff --git a/core/res/drawable-hdpi/tab_unselected_focused_transdroid.9.png b/app/src/main/res/drawable-hdpi/tab_unselected_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_unselected_focused_transdroid.9.png rename to app/src/main/res/drawable-hdpi/tab_unselected_focused_transdroid.9.png diff --git a/core/res/drawable-hdpi/tab_unselected_focused_transdroid2.9.png b/app/src/main/res/drawable-hdpi/tab_unselected_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_unselected_focused_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/tab_unselected_focused_transdroid2.9.png diff --git a/core/res/drawable-hdpi/tab_unselected_pressed_transdroid.9.png b/app/src/main/res/drawable-hdpi/tab_unselected_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_unselected_pressed_transdroid.9.png rename to app/src/main/res/drawable-hdpi/tab_unselected_pressed_transdroid.9.png diff --git a/core/res/drawable-hdpi/tab_unselected_pressed_transdroid2.9.png b/app/src/main/res/drawable-hdpi/tab_unselected_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_unselected_pressed_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/tab_unselected_pressed_transdroid2.9.png diff --git a/core/res/drawable-hdpi/tab_unselected_transdroid2.9.png b/app/src/main/res/drawable-hdpi/tab_unselected_transdroid2.9.png similarity index 100% rename from core/res/drawable-hdpi/tab_unselected_transdroid2.9.png rename to app/src/main/res/drawable-hdpi/tab_unselected_transdroid2.9.png diff --git a/core/res/drawable-hdpi/widget_preview.png b/app/src/main/res/drawable-hdpi/widget_preview.png similarity index 100% rename from core/res/drawable-hdpi/widget_preview.png rename to app/src/main/res/drawable-hdpi/widget_preview.png diff --git a/core/res/drawable-mdpi/ab_bottom_solid_transdroid.9.png b/app/src/main/res/drawable-mdpi/ab_bottom_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/ab_bottom_solid_transdroid.9.png rename to app/src/main/res/drawable-mdpi/ab_bottom_solid_transdroid.9.png diff --git a/core/res/drawable-mdpi/ab_bottom_solid_transdroid2.9.png b/app/src/main/res/drawable-mdpi/ab_bottom_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/ab_bottom_solid_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/ab_bottom_solid_transdroid2.9.png diff --git a/core/res/drawable-mdpi/ab_solid_transdroid.9.png b/app/src/main/res/drawable-mdpi/ab_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/ab_solid_transdroid.9.png rename to app/src/main/res/drawable-mdpi/ab_solid_transdroid.9.png diff --git a/core/res/drawable-mdpi/ab_solid_transdroid2.9.png b/app/src/main/res/drawable-mdpi/ab_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/ab_solid_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/ab_solid_transdroid2.9.png diff --git a/core/res/drawable-mdpi/ab_stacked_solid_transdroid.9.png b/app/src/main/res/drawable-mdpi/ab_stacked_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/ab_stacked_solid_transdroid.9.png rename to app/src/main/res/drawable-mdpi/ab_stacked_solid_transdroid.9.png diff --git a/core/res/drawable-mdpi/ab_stacked_solid_transdroid2.9.png b/app/src/main/res/drawable-mdpi/ab_stacked_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/ab_stacked_solid_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/ab_stacked_solid_transdroid2.9.png diff --git a/core/res/drawable-mdpi/ab_texture_tile_transdroid2.png b/app/src/main/res/drawable-mdpi/ab_texture_tile_transdroid2.png similarity index 100% rename from core/res/drawable-mdpi/ab_texture_tile_transdroid2.png rename to app/src/main/res/drawable-mdpi/ab_texture_tile_transdroid2.png diff --git a/core/res/drawable-mdpi/ab_transparent_transdroid.9.png b/app/src/main/res/drawable-mdpi/ab_transparent_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/ab_transparent_transdroid.9.png rename to app/src/main/res/drawable-mdpi/ab_transparent_transdroid.9.png diff --git a/core/res/drawable-mdpi/ab_transparent_transdroid2.9.png b/app/src/main/res/drawable-mdpi/ab_transparent_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/ab_transparent_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/ab_transparent_transdroid2.9.png diff --git a/core/res/drawable-mdpi/abc_list_focused_holo.9.png b/app/src/main/res/drawable-mdpi/abc_list_focused_holo.9.png similarity index 100% rename from core/res/drawable-mdpi/abc_list_focused_holo.9.png rename to app/src/main/res/drawable-mdpi/abc_list_focused_holo.9.png diff --git a/core/res/drawable-mdpi/abc_list_longpressed_holo.9.png b/app/src/main/res/drawable-mdpi/abc_list_longpressed_holo.9.png similarity index 100% rename from core/res/drawable-mdpi/abc_list_longpressed_holo.9.png rename to app/src/main/res/drawable-mdpi/abc_list_longpressed_holo.9.png diff --git a/core/res/drawable-mdpi/abc_list_pressed_holo_dark.9.png b/app/src/main/res/drawable-mdpi/abc_list_pressed_holo_dark.9.png similarity index 100% rename from core/res/drawable-mdpi/abc_list_pressed_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/abc_list_pressed_holo_dark.9.png diff --git a/core/res/drawable-mdpi/abc_list_pressed_holo_light.9.png b/app/src/main/res/drawable-mdpi/abc_list_pressed_holo_light.9.png similarity index 100% rename from core/res/drawable-mdpi/abc_list_pressed_holo_light.9.png rename to app/src/main/res/drawable-mdpi/abc_list_pressed_holo_light.9.png diff --git a/core/res/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png b/app/src/main/res/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png similarity index 100% rename from core/res/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png diff --git a/core/res/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png b/app/src/main/res/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png similarity index 100% rename from core/res/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png rename to app/src/main/res/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png diff --git a/core/res/drawable-mdpi/btn_cab_done_default_transdroid2.9.png b/app/src/main/res/drawable-mdpi/btn_cab_done_default_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/btn_cab_done_default_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/btn_cab_done_default_transdroid2.9.png diff --git a/core/res/drawable-mdpi/btn_cab_done_focused_transdroid2.9.png b/app/src/main/res/drawable-mdpi/btn_cab_done_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/btn_cab_done_focused_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/btn_cab_done_focused_transdroid2.9.png diff --git a/core/res/drawable-mdpi/btn_cab_done_pressed_transdroid2.9.png b/app/src/main/res/drawable-mdpi/btn_cab_done_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/btn_cab_done_pressed_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/btn_cab_done_pressed_transdroid2.9.png diff --git a/core/res/drawable-mdpi/cab_background_bottom_transdroid2.9.png b/app/src/main/res/drawable-mdpi/cab_background_bottom_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/cab_background_bottom_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/cab_background_bottom_transdroid2.9.png diff --git a/core/res/drawable-mdpi/cab_background_top_transdroid2.9.png b/app/src/main/res/drawable-mdpi/cab_background_top_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/cab_background_top_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/cab_background_top_transdroid2.9.png diff --git a/core/res/drawable-mdpi/ic_action_discard.png b/app/src/main/res/drawable-mdpi/ic_action_discard.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_discard.png rename to app/src/main/res/drawable-mdpi/ic_action_discard.png diff --git a/core/res/drawable-mdpi/ic_action_discard_light.png b/app/src/main/res/drawable-mdpi/ic_action_discard_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_discard_light.png rename to app/src/main/res/drawable-mdpi/ic_action_discard_light.png diff --git a/core/res/drawable-mdpi/ic_action_done_dark.png b/app/src/main/res/drawable-mdpi/ic_action_done_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_done_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_done_dark.png diff --git a/core/res/drawable-mdpi/ic_action_done_light.png b/app/src/main/res/drawable-mdpi/ic_action_done_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_done_light.png rename to app/src/main/res/drawable-mdpi/ic_action_done_light.png diff --git a/core/res/drawable-mdpi/ic_action_filter_dark.png b/app/src/main/res/drawable-mdpi/ic_action_filter_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_filter_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_filter_dark.png diff --git a/core/res/drawable-mdpi/ic_action_filter_light.png b/app/src/main/res/drawable-mdpi/ic_action_filter_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_filter_light.png rename to app/src/main/res/drawable-mdpi/ic_action_filter_light.png diff --git a/core/res/drawable-mdpi/ic_action_forcerecheck_dark.png b/app/src/main/res/drawable-mdpi/ic_action_forcerecheck_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_forcerecheck_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_forcerecheck_dark.png diff --git a/core/res/drawable-mdpi/ic_action_forcerecheck_light.png b/app/src/main/res/drawable-mdpi/ic_action_forcerecheck_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_forcerecheck_light.png rename to app/src/main/res/drawable-mdpi/ic_action_forcerecheck_light.png diff --git a/core/res/drawable-mdpi/ic_action_info_dark.png b/app/src/main/res/drawable-mdpi/ic_action_info_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_info_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_info_dark.png diff --git a/core/res/drawable-mdpi/ic_action_info_light.png b/app/src/main/res/drawable-mdpi/ic_action_info_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_info_light.png rename to app/src/main/res/drawable-mdpi/ic_action_info_light.png diff --git a/core/res/drawable-mdpi/ic_action_labels_dark.png b/app/src/main/res/drawable-mdpi/ic_action_labels_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_labels_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_labels_dark.png diff --git a/core/res/drawable-mdpi/ic_action_labels_light.png b/app/src/main/res/drawable-mdpi/ic_action_labels_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_labels_light.png rename to app/src/main/res/drawable-mdpi/ic_action_labels_light.png diff --git a/core/res/drawable-mdpi/ic_action_new_dark.png b/app/src/main/res/drawable-mdpi/ic_action_new_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_new_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_new_dark.png diff --git a/core/res/drawable-mdpi/ic_action_new_light.png b/app/src/main/res/drawable-mdpi/ic_action_new_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_new_light.png rename to app/src/main/res/drawable-mdpi/ic_action_new_light.png diff --git a/core/res/drawable-mdpi/ic_action_overflow.png b/app/src/main/res/drawable-mdpi/ic_action_overflow.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_overflow.png rename to app/src/main/res/drawable-mdpi/ic_action_overflow.png diff --git a/core/res/drawable-mdpi/ic_action_pause_dark.png b/app/src/main/res/drawable-mdpi/ic_action_pause_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_pause_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_pause_dark.png diff --git a/core/res/drawable-mdpi/ic_action_pause_light.png b/app/src/main/res/drawable-mdpi/ic_action_pause_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_pause_light.png rename to app/src/main/res/drawable-mdpi/ic_action_pause_light.png diff --git a/core/res/drawable-mdpi/ic_action_priority_high_dark.png b/app/src/main/res/drawable-mdpi/ic_action_priority_high_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_priority_high_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_priority_high_dark.png diff --git a/core/res/drawable-mdpi/ic_action_priority_high_light.png b/app/src/main/res/drawable-mdpi/ic_action_priority_high_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_priority_high_light.png rename to app/src/main/res/drawable-mdpi/ic_action_priority_high_light.png diff --git a/core/res/drawable-mdpi/ic_action_priority_low_dark.png b/app/src/main/res/drawable-mdpi/ic_action_priority_low_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_priority_low_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_priority_low_dark.png diff --git a/core/res/drawable-mdpi/ic_action_priority_low_light.png b/app/src/main/res/drawable-mdpi/ic_action_priority_low_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_priority_low_light.png rename to app/src/main/res/drawable-mdpi/ic_action_priority_low_light.png diff --git a/core/res/drawable-mdpi/ic_action_priority_normal_dark.png b/app/src/main/res/drawable-mdpi/ic_action_priority_normal_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_priority_normal_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_priority_normal_dark.png diff --git a/core/res/drawable-mdpi/ic_action_priority_normal_light.png b/app/src/main/res/drawable-mdpi/ic_action_priority_normal_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_priority_normal_light.png rename to app/src/main/res/drawable-mdpi/ic_action_priority_normal_light.png diff --git a/core/res/drawable-mdpi/ic_action_priority_off_dark.png b/app/src/main/res/drawable-mdpi/ic_action_priority_off_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_priority_off_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_priority_off_dark.png diff --git a/core/res/drawable-mdpi/ic_action_priority_off_light.png b/app/src/main/res/drawable-mdpi/ic_action_priority_off_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_priority_off_light.png rename to app/src/main/res/drawable-mdpi/ic_action_priority_off_light.png diff --git a/core/res/drawable-mdpi/ic_action_refresh_dark.png b/app/src/main/res/drawable-mdpi/ic_action_refresh_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_refresh_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_refresh_dark.png diff --git a/core/res/drawable-mdpi/ic_action_refresh_light.png b/app/src/main/res/drawable-mdpi/ic_action_refresh_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_refresh_light.png rename to app/src/main/res/drawable-mdpi/ic_action_refresh_light.png diff --git a/core/res/drawable-mdpi/ic_action_remove_dark.png b/app/src/main/res/drawable-mdpi/ic_action_remove_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_remove_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_remove_dark.png diff --git a/core/res/drawable-mdpi/ic_action_remove_light.png b/app/src/main/res/drawable-mdpi/ic_action_remove_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_remove_light.png rename to app/src/main/res/drawable-mdpi/ic_action_remove_light.png diff --git a/core/res/drawable-mdpi/ic_action_resume_dark.png b/app/src/main/res/drawable-mdpi/ic_action_resume_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_resume_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_resume_dark.png diff --git a/core/res/drawable-mdpi/ic_action_resume_light.png b/app/src/main/res/drawable-mdpi/ic_action_resume_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_resume_light.png rename to app/src/main/res/drawable-mdpi/ic_action_resume_light.png diff --git a/core/res/drawable-mdpi/ic_action_rss_dark.png b/app/src/main/res/drawable-mdpi/ic_action_rss_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_rss_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_rss_dark.png diff --git a/core/res/drawable-mdpi/ic_action_rss_light.png b/app/src/main/res/drawable-mdpi/ic_action_rss_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_rss_light.png rename to app/src/main/res/drawable-mdpi/ic_action_rss_light.png diff --git a/core/res/drawable-mdpi/ic_action_save_dark.png b/app/src/main/res/drawable-mdpi/ic_action_save_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_save_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_save_dark.png diff --git a/core/res/drawable-mdpi/ic_action_save_light.png b/app/src/main/res/drawable-mdpi/ic_action_save_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_save_light.png rename to app/src/main/res/drawable-mdpi/ic_action_save_light.png diff --git a/core/res/drawable-mdpi/ic_action_search_dark.png b/app/src/main/res/drawable-mdpi/ic_action_search_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_search_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_search_dark.png diff --git a/core/res/drawable-mdpi/ic_action_search_light.png b/app/src/main/res/drawable-mdpi/ic_action_search_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_search_light.png rename to app/src/main/res/drawable-mdpi/ic_action_search_light.png diff --git a/core/res/drawable-mdpi/ic_action_sort_by_size_dark.png b/app/src/main/res/drawable-mdpi/ic_action_sort_by_size_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_sort_by_size_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_sort_by_size_dark.png diff --git a/core/res/drawable-mdpi/ic_action_sort_by_size_light.png b/app/src/main/res/drawable-mdpi/ic_action_sort_by_size_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_sort_by_size_light.png rename to app/src/main/res/drawable-mdpi/ic_action_sort_by_size_light.png diff --git a/core/res/drawable-mdpi/ic_action_start_dark.png b/app/src/main/res/drawable-mdpi/ic_action_start_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_start_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_start_dark.png diff --git a/core/res/drawable-mdpi/ic_action_start_light.png b/app/src/main/res/drawable-mdpi/ic_action_start_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_start_light.png rename to app/src/main/res/drawable-mdpi/ic_action_start_light.png diff --git a/core/res/drawable-mdpi/ic_action_stop_dark.png b/app/src/main/res/drawable-mdpi/ic_action_stop_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_stop_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_stop_dark.png diff --git a/core/res/drawable-mdpi/ic_action_stop_light.png b/app/src/main/res/drawable-mdpi/ic_action_stop_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_stop_light.png rename to app/src/main/res/drawable-mdpi/ic_action_stop_light.png diff --git a/core/res/drawable-mdpi/ic_action_trackers_dark.png b/app/src/main/res/drawable-mdpi/ic_action_trackers_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_trackers_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_trackers_dark.png diff --git a/core/res/drawable-mdpi/ic_action_trackers_light.png b/app/src/main/res/drawable-mdpi/ic_action_trackers_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_trackers_light.png rename to app/src/main/res/drawable-mdpi/ic_action_trackers_light.png diff --git a/core/res/drawable-mdpi/ic_action_turtle_disabled.png b/app/src/main/res/drawable-mdpi/ic_action_turtle_disabled.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_turtle_disabled.png rename to app/src/main/res/drawable-mdpi/ic_action_turtle_disabled.png diff --git a/core/res/drawable-mdpi/ic_action_turtle_enabled.png b/app/src/main/res/drawable-mdpi/ic_action_turtle_enabled.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_turtle_enabled.png rename to app/src/main/res/drawable-mdpi/ic_action_turtle_enabled.png diff --git a/core/res/drawable-mdpi/ic_action_website_dark.png b/app/src/main/res/drawable-mdpi/ic_action_website_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_website_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_website_dark.png diff --git a/core/res/drawable-mdpi/ic_action_website_light.png b/app/src/main/res/drawable-mdpi/ic_action_website_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_action_website_light.png rename to app/src/main/res/drawable-mdpi/ic_action_website_light.png diff --git a/core/res/drawable-mdpi/ic_activity_torrents.png b/app/src/main/res/drawable-mdpi/ic_activity_torrents.png similarity index 100% rename from core/res/drawable-mdpi/ic_activity_torrents.png rename to app/src/main/res/drawable-mdpi/ic_activity_torrents.png diff --git a/core/res/drawable-mdpi/ic_empty_details_dark.png b/app/src/main/res/drawable-mdpi/ic_empty_details_dark.png similarity index 100% rename from core/res/drawable-mdpi/ic_empty_details_dark.png rename to app/src/main/res/drawable-mdpi/ic_empty_details_dark.png diff --git a/core/res/drawable-mdpi/ic_empty_details_light.png b/app/src/main/res/drawable-mdpi/ic_empty_details_light.png similarity index 100% rename from core/res/drawable-mdpi/ic_empty_details_light.png rename to app/src/main/res/drawable-mdpi/ic_empty_details_light.png diff --git a/core/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from core/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/core/res/drawable-mdpi/ic_stat_notification.png b/app/src/main/res/drawable-mdpi/ic_stat_notification.png similarity index 100% rename from core/res/drawable-mdpi/ic_stat_notification.png rename to app/src/main/res/drawable-mdpi/ic_stat_notification.png diff --git a/core/res/drawable-mdpi/list_focused_transdroid.9.png b/app/src/main/res/drawable-mdpi/list_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/list_focused_transdroid.9.png rename to app/src/main/res/drawable-mdpi/list_focused_transdroid.9.png diff --git a/core/res/drawable-mdpi/list_focused_transdroid2.9.png b/app/src/main/res/drawable-mdpi/list_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/list_focused_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/list_focused_transdroid2.9.png diff --git a/core/res/drawable-mdpi/menu_dropdown_panel_transdroid.9.png b/app/src/main/res/drawable-mdpi/menu_dropdown_panel_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/menu_dropdown_panel_transdroid.9.png rename to app/src/main/res/drawable-mdpi/menu_dropdown_panel_transdroid.9.png diff --git a/core/res/drawable-mdpi/menu_dropdown_panel_transdroid2.9.png b/app/src/main/res/drawable-mdpi/menu_dropdown_panel_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/menu_dropdown_panel_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/menu_dropdown_panel_transdroid2.9.png diff --git a/core/res/drawable-mdpi/menu_hardkey_panel_transdroid.9.png b/app/src/main/res/drawable-mdpi/menu_hardkey_panel_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/menu_hardkey_panel_transdroid.9.png rename to app/src/main/res/drawable-mdpi/menu_hardkey_panel_transdroid.9.png diff --git a/core/res/drawable-mdpi/progress_bg_transdroid.9.png b/app/src/main/res/drawable-mdpi/progress_bg_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/progress_bg_transdroid.9.png rename to app/src/main/res/drawable-mdpi/progress_bg_transdroid.9.png diff --git a/core/res/drawable-mdpi/progress_bg_transdroid2.9.png b/app/src/main/res/drawable-mdpi/progress_bg_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/progress_bg_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/progress_bg_transdroid2.9.png diff --git a/core/res/drawable-mdpi/progress_primary_transdroid.9.png b/app/src/main/res/drawable-mdpi/progress_primary_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/progress_primary_transdroid.9.png rename to app/src/main/res/drawable-mdpi/progress_primary_transdroid.9.png diff --git a/core/res/drawable-mdpi/progress_primary_transdroid2.9.png b/app/src/main/res/drawable-mdpi/progress_primary_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/progress_primary_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/progress_primary_transdroid2.9.png diff --git a/core/res/drawable-mdpi/progress_secondary_transdroid.9.png b/app/src/main/res/drawable-mdpi/progress_secondary_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/progress_secondary_transdroid.9.png rename to app/src/main/res/drawable-mdpi/progress_secondary_transdroid.9.png diff --git a/core/res/drawable-mdpi/progress_secondary_transdroid2.9.png b/app/src/main/res/drawable-mdpi/progress_secondary_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/progress_secondary_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/progress_secondary_transdroid2.9.png diff --git a/core/res/drawable-mdpi/spinner_ab_default_transdroid.9.png b/app/src/main/res/drawable-mdpi/spinner_ab_default_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/spinner_ab_default_transdroid.9.png rename to app/src/main/res/drawable-mdpi/spinner_ab_default_transdroid.9.png diff --git a/core/res/drawable-mdpi/spinner_ab_default_transdroid2.9.png b/app/src/main/res/drawable-mdpi/spinner_ab_default_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/spinner_ab_default_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/spinner_ab_default_transdroid2.9.png diff --git a/core/res/drawable-mdpi/spinner_ab_disabled_transdroid.9.png b/app/src/main/res/drawable-mdpi/spinner_ab_disabled_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/spinner_ab_disabled_transdroid.9.png rename to app/src/main/res/drawable-mdpi/spinner_ab_disabled_transdroid.9.png diff --git a/core/res/drawable-mdpi/spinner_ab_disabled_transdroid2.9.png b/app/src/main/res/drawable-mdpi/spinner_ab_disabled_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/spinner_ab_disabled_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/spinner_ab_disabled_transdroid2.9.png diff --git a/core/res/drawable-mdpi/spinner_ab_focused_transdroid.9.png b/app/src/main/res/drawable-mdpi/spinner_ab_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/spinner_ab_focused_transdroid.9.png rename to app/src/main/res/drawable-mdpi/spinner_ab_focused_transdroid.9.png diff --git a/core/res/drawable-mdpi/spinner_ab_focused_transdroid2.9.png b/app/src/main/res/drawable-mdpi/spinner_ab_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/spinner_ab_focused_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/spinner_ab_focused_transdroid2.9.png diff --git a/core/res/drawable-mdpi/spinner_ab_pressed_transdroid.9.png b/app/src/main/res/drawable-mdpi/spinner_ab_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/spinner_ab_pressed_transdroid.9.png rename to app/src/main/res/drawable-mdpi/spinner_ab_pressed_transdroid.9.png diff --git a/core/res/drawable-mdpi/spinner_ab_pressed_transdroid2.9.png b/app/src/main/res/drawable-mdpi/spinner_ab_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/spinner_ab_pressed_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/spinner_ab_pressed_transdroid2.9.png diff --git a/core/res/drawable-mdpi/tab_selected_focused_transdroid.9.png b/app/src/main/res/drawable-mdpi/tab_selected_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_selected_focused_transdroid.9.png rename to app/src/main/res/drawable-mdpi/tab_selected_focused_transdroid.9.png diff --git a/core/res/drawable-mdpi/tab_selected_focused_transdroid2.9.png b/app/src/main/res/drawable-mdpi/tab_selected_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_selected_focused_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/tab_selected_focused_transdroid2.9.png diff --git a/core/res/drawable-mdpi/tab_selected_pressed_transdroid.9.png b/app/src/main/res/drawable-mdpi/tab_selected_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_selected_pressed_transdroid.9.png rename to app/src/main/res/drawable-mdpi/tab_selected_pressed_transdroid.9.png diff --git a/core/res/drawable-mdpi/tab_selected_pressed_transdroid2.9.png b/app/src/main/res/drawable-mdpi/tab_selected_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_selected_pressed_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/tab_selected_pressed_transdroid2.9.png diff --git a/core/res/drawable-mdpi/tab_selected_transdroid.9.png b/app/src/main/res/drawable-mdpi/tab_selected_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_selected_transdroid.9.png rename to app/src/main/res/drawable-mdpi/tab_selected_transdroid.9.png diff --git a/core/res/drawable-mdpi/tab_selected_transdroid2.9.png b/app/src/main/res/drawable-mdpi/tab_selected_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_selected_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/tab_selected_transdroid2.9.png diff --git a/core/res/drawable-mdpi/tab_unselected_focused_transdroid.9.png b/app/src/main/res/drawable-mdpi/tab_unselected_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_unselected_focused_transdroid.9.png rename to app/src/main/res/drawable-mdpi/tab_unselected_focused_transdroid.9.png diff --git a/core/res/drawable-mdpi/tab_unselected_focused_transdroid2.9.png b/app/src/main/res/drawable-mdpi/tab_unselected_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_unselected_focused_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/tab_unselected_focused_transdroid2.9.png diff --git a/core/res/drawable-mdpi/tab_unselected_pressed_transdroid.9.png b/app/src/main/res/drawable-mdpi/tab_unselected_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_unselected_pressed_transdroid.9.png rename to app/src/main/res/drawable-mdpi/tab_unselected_pressed_transdroid.9.png diff --git a/core/res/drawable-mdpi/tab_unselected_pressed_transdroid2.9.png b/app/src/main/res/drawable-mdpi/tab_unselected_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_unselected_pressed_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/tab_unselected_pressed_transdroid2.9.png diff --git a/core/res/drawable-mdpi/tab_unselected_transdroid2.9.png b/app/src/main/res/drawable-mdpi/tab_unselected_transdroid2.9.png similarity index 100% rename from core/res/drawable-mdpi/tab_unselected_transdroid2.9.png rename to app/src/main/res/drawable-mdpi/tab_unselected_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/ab_bottom_solid_transdroid.9.png b/app/src/main/res/drawable-xhdpi/ab_bottom_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/ab_bottom_solid_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/ab_bottom_solid_transdroid.9.png diff --git a/core/res/drawable-xhdpi/ab_bottom_solid_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/ab_bottom_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/ab_bottom_solid_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/ab_bottom_solid_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/ab_solid_transdroid.9.png b/app/src/main/res/drawable-xhdpi/ab_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/ab_solid_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/ab_solid_transdroid.9.png diff --git a/core/res/drawable-xhdpi/ab_solid_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/ab_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/ab_solid_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/ab_solid_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/ab_stacked_solid_transdroid.9.png b/app/src/main/res/drawable-xhdpi/ab_stacked_solid_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/ab_stacked_solid_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/ab_stacked_solid_transdroid.9.png diff --git a/core/res/drawable-xhdpi/ab_stacked_solid_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/ab_stacked_solid_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/ab_stacked_solid_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/ab_stacked_solid_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/ab_texture_tile_transdroid2.png b/app/src/main/res/drawable-xhdpi/ab_texture_tile_transdroid2.png similarity index 100% rename from core/res/drawable-xhdpi/ab_texture_tile_transdroid2.png rename to app/src/main/res/drawable-xhdpi/ab_texture_tile_transdroid2.png diff --git a/core/res/drawable-xhdpi/ab_transparent_transdroid.9.png b/app/src/main/res/drawable-xhdpi/ab_transparent_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/ab_transparent_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/ab_transparent_transdroid.9.png diff --git a/core/res/drawable-xhdpi/ab_transparent_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/ab_transparent_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/ab_transparent_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/ab_transparent_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/abc_list_focused_holo.9.png b/app/src/main/res/drawable-xhdpi/abc_list_focused_holo.9.png similarity index 100% rename from core/res/drawable-xhdpi/abc_list_focused_holo.9.png rename to app/src/main/res/drawable-xhdpi/abc_list_focused_holo.9.png diff --git a/core/res/drawable-xhdpi/abc_list_longpressed_holo.9.png b/app/src/main/res/drawable-xhdpi/abc_list_longpressed_holo.9.png similarity index 100% rename from core/res/drawable-xhdpi/abc_list_longpressed_holo.9.png rename to app/src/main/res/drawable-xhdpi/abc_list_longpressed_holo.9.png diff --git a/core/res/drawable-xhdpi/abc_list_pressed_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/abc_list_pressed_holo_dark.9.png similarity index 100% rename from core/res/drawable-xhdpi/abc_list_pressed_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/abc_list_pressed_holo_dark.9.png diff --git a/core/res/drawable-xhdpi/abc_list_pressed_holo_light.9.png b/app/src/main/res/drawable-xhdpi/abc_list_pressed_holo_light.9.png similarity index 100% rename from core/res/drawable-xhdpi/abc_list_pressed_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/abc_list_pressed_holo_light.9.png diff --git a/core/res/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png similarity index 100% rename from core/res/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png diff --git a/core/res/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png b/app/src/main/res/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png similarity index 100% rename from core/res/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png diff --git a/core/res/drawable-xhdpi/btn_cab_done_default_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/btn_cab_done_default_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/btn_cab_done_default_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/btn_cab_done_default_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/btn_cab_done_focused_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/btn_cab_done_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/btn_cab_done_focused_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/btn_cab_done_focused_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/btn_cab_done_pressed_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/btn_cab_done_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/btn_cab_done_pressed_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/btn_cab_done_pressed_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/cab_background_bottom_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/cab_background_bottom_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/cab_background_bottom_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/cab_background_bottom_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/cab_background_top_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/cab_background_top_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/cab_background_top_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/cab_background_top_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/ic_action_discard_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_discard_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_discard_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_discard_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_discard_light.png b/app/src/main/res/drawable-xhdpi/ic_action_discard_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_discard_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_discard_light.png diff --git a/core/res/drawable-xhdpi/ic_action_done_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_done_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_done_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_done_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_done_light.png b/app/src/main/res/drawable-xhdpi/ic_action_done_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_done_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_done_light.png diff --git a/core/res/drawable-xhdpi/ic_action_filter_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_filter_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_filter_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_filter_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_filter_light.png b/app/src/main/res/drawable-xhdpi/ic_action_filter_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_filter_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_filter_light.png diff --git a/core/res/drawable-xhdpi/ic_action_forcerecheck_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_forcerecheck_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_forcerecheck_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_forcerecheck_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_forcerecheck_light.png b/app/src/main/res/drawable-xhdpi/ic_action_forcerecheck_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_forcerecheck_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_forcerecheck_light.png diff --git a/core/res/drawable-xhdpi/ic_action_info_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_info_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_info_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_info_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_info_light.png b/app/src/main/res/drawable-xhdpi/ic_action_info_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_info_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_info_light.png diff --git a/core/res/drawable-xhdpi/ic_action_labels_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_labels_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_labels_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_labels_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_labels_light.png b/app/src/main/res/drawable-xhdpi/ic_action_labels_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_labels_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_labels_light.png diff --git a/core/res/drawable-xhdpi/ic_action_new_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_new_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_new_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_new_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_new_light.png b/app/src/main/res/drawable-xhdpi/ic_action_new_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_new_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_new_light.png diff --git a/core/res/drawable-xhdpi/ic_action_overflow.png b/app/src/main/res/drawable-xhdpi/ic_action_overflow.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_overflow.png rename to app/src/main/res/drawable-xhdpi/ic_action_overflow.png diff --git a/core/res/drawable-xhdpi/ic_action_pause_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_pause_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_pause_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_pause_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_pause_light.png b/app/src/main/res/drawable-xhdpi/ic_action_pause_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_pause_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_pause_light.png diff --git a/core/res/drawable-xhdpi/ic_action_priority_high_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_priority_high_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_priority_high_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_priority_high_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_priority_high_light.png b/app/src/main/res/drawable-xhdpi/ic_action_priority_high_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_priority_high_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_priority_high_light.png diff --git a/core/res/drawable-xhdpi/ic_action_priority_low_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_priority_low_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_priority_low_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_priority_low_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_priority_low_light.png b/app/src/main/res/drawable-xhdpi/ic_action_priority_low_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_priority_low_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_priority_low_light.png diff --git a/core/res/drawable-xhdpi/ic_action_priority_normal_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_priority_normal_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_priority_normal_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_priority_normal_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_priority_normal_light.png b/app/src/main/res/drawable-xhdpi/ic_action_priority_normal_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_priority_normal_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_priority_normal_light.png diff --git a/core/res/drawable-xhdpi/ic_action_priority_off_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_priority_off_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_priority_off_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_priority_off_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_priority_off_light.png b/app/src/main/res/drawable-xhdpi/ic_action_priority_off_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_priority_off_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_priority_off_light.png diff --git a/core/res/drawable-xhdpi/ic_action_refresh_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_refresh_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_refresh_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_refresh_light.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_refresh_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_refresh_light.png diff --git a/core/res/drawable-xhdpi/ic_action_remove_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_remove_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_remove_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_remove_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_remove_light.png b/app/src/main/res/drawable-xhdpi/ic_action_remove_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_remove_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_remove_light.png diff --git a/core/res/drawable-xhdpi/ic_action_resume_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_resume_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_resume_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_resume_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_resume_light.png b/app/src/main/res/drawable-xhdpi/ic_action_resume_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_resume_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_resume_light.png diff --git a/core/res/drawable-xhdpi/ic_action_rss_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_rss_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_rss_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_rss_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_rss_light.png b/app/src/main/res/drawable-xhdpi/ic_action_rss_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_rss_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_rss_light.png diff --git a/core/res/drawable-xhdpi/ic_action_save_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_save_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_save_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_save_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_save_light.png b/app/src/main/res/drawable-xhdpi/ic_action_save_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_save_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_save_light.png diff --git a/core/res/drawable-xhdpi/ic_action_search_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_search_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_search_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_search_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_search_light.png b/app/src/main/res/drawable-xhdpi/ic_action_search_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_search_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_search_light.png diff --git a/core/res/drawable-xhdpi/ic_action_sort_by_size_light.png b/app/src/main/res/drawable-xhdpi/ic_action_sort_by_size_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_sort_by_size_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_sort_by_size_light.png diff --git a/core/res/drawable-xhdpi/ic_action_start_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_start_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_start_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_start_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_start_light.png b/app/src/main/res/drawable-xhdpi/ic_action_start_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_start_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_start_light.png diff --git a/core/res/drawable-xhdpi/ic_action_stop_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_stop_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_stop_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_stop_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_stop_light.png b/app/src/main/res/drawable-xhdpi/ic_action_stop_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_stop_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_stop_light.png diff --git a/core/res/drawable-xhdpi/ic_action_trackers_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_trackers_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_trackers_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_trackers_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_trackers_light.png b/app/src/main/res/drawable-xhdpi/ic_action_trackers_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_trackers_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_trackers_light.png diff --git a/core/res/drawable-xhdpi/ic_action_turtle_disabled.png b/app/src/main/res/drawable-xhdpi/ic_action_turtle_disabled.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_turtle_disabled.png rename to app/src/main/res/drawable-xhdpi/ic_action_turtle_disabled.png diff --git a/core/res/drawable-xhdpi/ic_action_turtle_enabled.png b/app/src/main/res/drawable-xhdpi/ic_action_turtle_enabled.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_turtle_enabled.png rename to app/src/main/res/drawable-xhdpi/ic_action_turtle_enabled.png diff --git a/core/res/drawable-xhdpi/ic_action_website_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_website_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_website_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_website_dark.png diff --git a/core/res/drawable-xhdpi/ic_action_website_light.png b/app/src/main/res/drawable-xhdpi/ic_action_website_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_action_website_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_website_light.png diff --git a/core/res/drawable-xhdpi/ic_activity_torrents.png b/app/src/main/res/drawable-xhdpi/ic_activity_torrents.png similarity index 100% rename from core/res/drawable-xhdpi/ic_activity_torrents.png rename to app/src/main/res/drawable-xhdpi/ic_activity_torrents.png diff --git a/core/res/drawable-xhdpi/ic_empty_details_dark.png b/app/src/main/res/drawable-xhdpi/ic_empty_details_dark.png similarity index 100% rename from core/res/drawable-xhdpi/ic_empty_details_dark.png rename to app/src/main/res/drawable-xhdpi/ic_empty_details_dark.png diff --git a/core/res/drawable-xhdpi/ic_empty_details_light.png b/app/src/main/res/drawable-xhdpi/ic_empty_details_light.png similarity index 100% rename from core/res/drawable-xhdpi/ic_empty_details_light.png rename to app/src/main/res/drawable-xhdpi/ic_empty_details_light.png diff --git a/core/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from core/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/core/res/drawable-xhdpi/ic_stat_notification.png b/app/src/main/res/drawable-xhdpi/ic_stat_notification.png similarity index 100% rename from core/res/drawable-xhdpi/ic_stat_notification.png rename to app/src/main/res/drawable-xhdpi/ic_stat_notification.png diff --git a/core/res/drawable-xhdpi/list_focused_transdroid.9.png b/app/src/main/res/drawable-xhdpi/list_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/list_focused_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/list_focused_transdroid.9.png diff --git a/core/res/drawable-xhdpi/list_focused_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/list_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/list_focused_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/list_focused_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/menu_dropdown_panel_transdroid.9.png b/app/src/main/res/drawable-xhdpi/menu_dropdown_panel_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/menu_dropdown_panel_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/menu_dropdown_panel_transdroid.9.png diff --git a/core/res/drawable-xhdpi/menu_dropdown_panel_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/menu_dropdown_panel_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/menu_dropdown_panel_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/menu_dropdown_panel_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/menu_hardkey_panel_transdroid.9.png b/app/src/main/res/drawable-xhdpi/menu_hardkey_panel_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/menu_hardkey_panel_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/menu_hardkey_panel_transdroid.9.png diff --git a/core/res/drawable-xhdpi/progress_bg_transdroid.9.png b/app/src/main/res/drawable-xhdpi/progress_bg_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/progress_bg_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/progress_bg_transdroid.9.png diff --git a/core/res/drawable-xhdpi/progress_bg_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/progress_bg_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/progress_bg_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/progress_bg_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/progress_primary_transdroid.9.png b/app/src/main/res/drawable-xhdpi/progress_primary_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/progress_primary_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/progress_primary_transdroid.9.png diff --git a/core/res/drawable-xhdpi/progress_primary_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/progress_primary_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/progress_primary_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/progress_primary_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/progress_secondary_transdroid.9.png b/app/src/main/res/drawable-xhdpi/progress_secondary_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/progress_secondary_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/progress_secondary_transdroid.9.png diff --git a/core/res/drawable-xhdpi/progress_secondary_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/progress_secondary_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/progress_secondary_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/progress_secondary_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/spinner_ab_default_transdroid.9.png b/app/src/main/res/drawable-xhdpi/spinner_ab_default_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/spinner_ab_default_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/spinner_ab_default_transdroid.9.png diff --git a/core/res/drawable-xhdpi/spinner_ab_default_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/spinner_ab_default_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/spinner_ab_default_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/spinner_ab_default_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/spinner_ab_disabled_transdroid.9.png b/app/src/main/res/drawable-xhdpi/spinner_ab_disabled_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/spinner_ab_disabled_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/spinner_ab_disabled_transdroid.9.png diff --git a/core/res/drawable-xhdpi/spinner_ab_disabled_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/spinner_ab_disabled_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/spinner_ab_disabled_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/spinner_ab_disabled_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/spinner_ab_focused_transdroid.9.png b/app/src/main/res/drawable-xhdpi/spinner_ab_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/spinner_ab_focused_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/spinner_ab_focused_transdroid.9.png diff --git a/core/res/drawable-xhdpi/spinner_ab_focused_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/spinner_ab_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/spinner_ab_focused_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/spinner_ab_focused_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/spinner_ab_pressed_transdroid.9.png b/app/src/main/res/drawable-xhdpi/spinner_ab_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/spinner_ab_pressed_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/spinner_ab_pressed_transdroid.9.png diff --git a/core/res/drawable-xhdpi/spinner_ab_pressed_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/spinner_ab_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/spinner_ab_pressed_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/spinner_ab_pressed_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/tab_selected_focused_transdroid.9.png b/app/src/main/res/drawable-xhdpi/tab_selected_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_selected_focused_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/tab_selected_focused_transdroid.9.png diff --git a/core/res/drawable-xhdpi/tab_selected_focused_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/tab_selected_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_selected_focused_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/tab_selected_focused_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/tab_selected_pressed_transdroid.9.png b/app/src/main/res/drawable-xhdpi/tab_selected_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_selected_pressed_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/tab_selected_pressed_transdroid.9.png diff --git a/core/res/drawable-xhdpi/tab_selected_pressed_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/tab_selected_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_selected_pressed_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/tab_selected_pressed_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/tab_selected_transdroid.9.png b/app/src/main/res/drawable-xhdpi/tab_selected_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_selected_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/tab_selected_transdroid.9.png diff --git a/core/res/drawable-xhdpi/tab_selected_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/tab_selected_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_selected_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/tab_selected_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/tab_unselected_focused_transdroid.9.png b/app/src/main/res/drawable-xhdpi/tab_unselected_focused_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_unselected_focused_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/tab_unselected_focused_transdroid.9.png diff --git a/core/res/drawable-xhdpi/tab_unselected_focused_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/tab_unselected_focused_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_unselected_focused_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/tab_unselected_focused_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/tab_unselected_pressed_transdroid.9.png b/app/src/main/res/drawable-xhdpi/tab_unselected_pressed_transdroid.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_unselected_pressed_transdroid.9.png rename to app/src/main/res/drawable-xhdpi/tab_unselected_pressed_transdroid.9.png diff --git a/core/res/drawable-xhdpi/tab_unselected_pressed_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/tab_unselected_pressed_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_unselected_pressed_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/tab_unselected_pressed_transdroid2.9.png diff --git a/core/res/drawable-xhdpi/tab_unselected_transdroid2.9.png b/app/src/main/res/drawable-xhdpi/tab_unselected_transdroid2.9.png similarity index 100% rename from core/res/drawable-xhdpi/tab_unselected_transdroid2.9.png rename to app/src/main/res/drawable-xhdpi/tab_unselected_transdroid2.9.png diff --git a/core/res/drawable-xxhdpi/ic_action_filter_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_filter_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png diff --git a/core/res/drawable-xxhdpi/ic_action_filter_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_filter_light.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_filter_light.png rename to app/src/main/res/drawable-xxhdpi/ic_action_filter_light.png diff --git a/core/res/drawable-xxhdpi/ic_action_forcerecheck_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_forcerecheck_dark.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_forcerecheck_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_forcerecheck_dark.png diff --git a/core/res/drawable-xxhdpi/ic_action_forcerecheck_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_forcerecheck_light.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_forcerecheck_light.png rename to app/src/main/res/drawable-xxhdpi/ic_action_forcerecheck_light.png diff --git a/core/res/drawable-xxhdpi/ic_action_info_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_info_dark.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_info_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_info_dark.png diff --git a/core/res/drawable-xxhdpi/ic_action_info_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_info_light.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_info_light.png rename to app/src/main/res/drawable-xxhdpi/ic_action_info_light.png diff --git a/core/res/drawable-xxhdpi/ic_action_overflow.png b/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_overflow.png rename to app/src/main/res/drawable-xxhdpi/ic_action_overflow.png diff --git a/core/res/drawable-xxhdpi/ic_action_save_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_save_dark.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_save_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_save_dark.png diff --git a/core/res/drawable-xxhdpi/ic_action_save_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_save_light.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_action_save_light.png rename to app/src/main/res/drawable-xxhdpi/ic_action_save_light.png diff --git a/core/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/core/res/drawable-xxhdpi/ic_stat_notification.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notification.png similarity index 100% rename from core/res/drawable-xxhdpi/ic_stat_notification.png rename to app/src/main/res/drawable-xxhdpi/ic_stat_notification.png diff --git a/core/res/drawable/ab_background_textured_transdroid2.xml b/app/src/main/res/drawable/ab_background_textured_transdroid2.xml similarity index 100% rename from core/res/drawable/ab_background_textured_transdroid2.xml rename to app/src/main/res/drawable/ab_background_textured_transdroid2.xml diff --git a/core/res/drawable/abc_list_selector_background_transition_holo_dark.xml b/app/src/main/res/drawable/abc_list_selector_background_transition_holo_dark.xml similarity index 100% rename from core/res/drawable/abc_list_selector_background_transition_holo_dark.xml rename to app/src/main/res/drawable/abc_list_selector_background_transition_holo_dark.xml diff --git a/core/res/drawable/abc_list_selector_background_transition_holo_light.xml b/app/src/main/res/drawable/abc_list_selector_background_transition_holo_light.xml similarity index 100% rename from core/res/drawable/abc_list_selector_background_transition_holo_light.xml rename to app/src/main/res/drawable/abc_list_selector_background_transition_holo_light.xml diff --git a/core/res/drawable/activatable_background_transdroid.xml b/app/src/main/res/drawable/activatable_background_transdroid.xml similarity index 100% rename from core/res/drawable/activatable_background_transdroid.xml rename to app/src/main/res/drawable/activatable_background_transdroid.xml diff --git a/core/res/drawable/activatable_background_transdroid2.xml b/app/src/main/res/drawable/activatable_background_transdroid2.xml similarity index 100% rename from core/res/drawable/activatable_background_transdroid2.xml rename to app/src/main/res/drawable/activatable_background_transdroid2.xml diff --git a/core/res/drawable/btn_cab_done_transdroid2.xml b/app/src/main/res/drawable/btn_cab_done_transdroid2.xml similarity index 100% rename from core/res/drawable/btn_cab_done_transdroid2.xml rename to app/src/main/res/drawable/btn_cab_done_transdroid2.xml diff --git a/core/res/drawable/details_list_background_dark.xml b/app/src/main/res/drawable/details_list_background_dark.xml similarity index 100% rename from core/res/drawable/details_list_background_dark.xml rename to app/src/main/res/drawable/details_list_background_dark.xml diff --git a/core/res/drawable/details_list_background_light.xml b/app/src/main/res/drawable/details_list_background_light.xml similarity index 100% rename from core/res/drawable/details_list_background_light.xml rename to app/src/main/res/drawable/details_list_background_light.xml diff --git a/core/res/drawable/loading_progress_dark.xml b/app/src/main/res/drawable/loading_progress_dark.xml similarity index 100% rename from core/res/drawable/loading_progress_dark.xml rename to app/src/main/res/drawable/loading_progress_dark.xml diff --git a/core/res/drawable/loading_progress_light.xml b/app/src/main/res/drawable/loading_progress_light.xml similarity index 100% rename from core/res/drawable/loading_progress_light.xml rename to app/src/main/res/drawable/loading_progress_light.xml diff --git a/core/res/drawable/pressed_background_transdroid.xml b/app/src/main/res/drawable/pressed_background_transdroid.xml similarity index 100% rename from core/res/drawable/pressed_background_transdroid.xml rename to app/src/main/res/drawable/pressed_background_transdroid.xml diff --git a/core/res/drawable/pressed_background_transdroid2.xml b/app/src/main/res/drawable/pressed_background_transdroid2.xml similarity index 100% rename from core/res/drawable/pressed_background_transdroid2.xml rename to app/src/main/res/drawable/pressed_background_transdroid2.xml diff --git a/core/res/drawable/section_header.xml b/app/src/main/res/drawable/section_header.xml similarity index 100% rename from core/res/drawable/section_header.xml rename to app/src/main/res/drawable/section_header.xml diff --git a/core/res/drawable/selectable_background_holo_light.xml b/app/src/main/res/drawable/selectable_background_holo_light.xml similarity index 100% rename from core/res/drawable/selectable_background_holo_light.xml rename to app/src/main/res/drawable/selectable_background_holo_light.xml diff --git a/core/res/drawable/selectable_background_transdroid.xml b/app/src/main/res/drawable/selectable_background_transdroid.xml similarity index 100% rename from core/res/drawable/selectable_background_transdroid.xml rename to app/src/main/res/drawable/selectable_background_transdroid.xml diff --git a/core/res/drawable/selectable_background_transdroid2.xml b/app/src/main/res/drawable/selectable_background_transdroid2.xml similarity index 100% rename from core/res/drawable/selectable_background_transdroid2.xml rename to app/src/main/res/drawable/selectable_background_transdroid2.xml diff --git a/core/res/drawable/spinner_background_ab_transdroid.xml b/app/src/main/res/drawable/spinner_background_ab_transdroid.xml similarity index 100% rename from core/res/drawable/spinner_background_ab_transdroid.xml rename to app/src/main/res/drawable/spinner_background_ab_transdroid.xml diff --git a/core/res/drawable/spinner_background_ab_transdroid2.xml b/app/src/main/res/drawable/spinner_background_ab_transdroid2.xml similarity index 100% rename from core/res/drawable/spinner_background_ab_transdroid2.xml rename to app/src/main/res/drawable/spinner_background_ab_transdroid2.xml diff --git a/core/res/drawable/tab_indicator_ab_transdroid.xml b/app/src/main/res/drawable/tab_indicator_ab_transdroid.xml similarity index 100% rename from core/res/drawable/tab_indicator_ab_transdroid.xml rename to app/src/main/res/drawable/tab_indicator_ab_transdroid.xml diff --git a/core/res/drawable/tab_indicator_ab_transdroid2.xml b/app/src/main/res/drawable/tab_indicator_ab_transdroid2.xml similarity index 100% rename from core/res/drawable/tab_indicator_ab_transdroid2.xml rename to app/src/main/res/drawable/tab_indicator_ab_transdroid2.xml diff --git a/external/ColorPickerPreference/res/layout-land/dialog_color_picker.xml b/app/src/main/res/layout-land/dialog_color_picker.xml similarity index 100% rename from external/ColorPickerPreference/res/layout-land/dialog_color_picker.xml rename to app/src/main/res/layout-land/dialog_color_picker.xml diff --git a/core/res/layout-w600dp/activity_search.xml b/app/src/main/res/layout-w600dp/activity_search.xml similarity index 100% rename from core/res/layout-w600dp/activity_search.xml rename to app/src/main/res/layout-w600dp/activity_search.xml diff --git a/core/res/layout-w600dp/activity_torrents.xml b/app/src/main/res/layout-w600dp/activity_torrents.xml similarity index 100% rename from core/res/layout-w600dp/activity_torrents.xml rename to app/src/main/res/layout-w600dp/activity_torrents.xml diff --git a/core/res/layout-w900dp/activity_rssfeeds.xml b/app/src/main/res/layout-w900dp/activity_rssfeeds.xml similarity index 100% rename from core/res/layout-w900dp/activity_rssfeeds.xml rename to app/src/main/res/layout-w900dp/activity_rssfeeds.xml diff --git a/core/res/layout-w900dp/activity_torrents.xml b/app/src/main/res/layout-w900dp/activity_torrents.xml similarity index 100% rename from core/res/layout-w900dp/activity_torrents.xml rename to app/src/main/res/layout-w900dp/activity_torrents.xml diff --git a/core/res/layout/actionbar_donebutton.xml b/app/src/main/res/layout/actionbar_donebutton.xml similarity index 100% rename from core/res/layout/actionbar_donebutton.xml rename to app/src/main/res/layout/actionbar_donebutton.xml diff --git a/core/res/layout/actionbar_navigation.xml b/app/src/main/res/layout/actionbar_navigation.xml similarity index 100% rename from core/res/layout/actionbar_navigation.xml rename to app/src/main/res/layout/actionbar_navigation.xml diff --git a/core/res/layout/actionbar_searchsite.xml b/app/src/main/res/layout/actionbar_searchsite.xml similarity index 100% rename from core/res/layout/actionbar_searchsite.xml rename to app/src/main/res/layout/actionbar_searchsite.xml diff --git a/core/res/layout/actionbar_serverstatus.xml b/app/src/main/res/layout/actionbar_serverstatus.xml similarity index 100% rename from core/res/layout/actionbar_serverstatus.xml rename to app/src/main/res/layout/actionbar_serverstatus.xml diff --git a/core/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml similarity index 100% rename from core/res/layout/activity_details.xml rename to app/src/main/res/layout/activity_details.xml diff --git a/core/res/layout/activity_rssfeeds.xml b/app/src/main/res/layout/activity_rssfeeds.xml similarity index 100% rename from core/res/layout/activity_rssfeeds.xml rename to app/src/main/res/layout/activity_rssfeeds.xml diff --git a/core/res/layout/activity_rssitems.xml b/app/src/main/res/layout/activity_rssitems.xml similarity index 100% rename from core/res/layout/activity_rssitems.xml rename to app/src/main/res/layout/activity_rssitems.xml diff --git a/core/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml similarity index 100% rename from core/res/layout/activity_search.xml rename to app/src/main/res/layout/activity_search.xml diff --git a/core/res/layout/activity_torrents.xml b/app/src/main/res/layout/activity_torrents.xml similarity index 100% rename from core/res/layout/activity_torrents.xml rename to app/src/main/res/layout/activity_torrents.xml diff --git a/core/res/layout/activity_widgetconfig.xml b/app/src/main/res/layout/activity_widgetconfig.xml similarity index 100% rename from core/res/layout/activity_widgetconfig.xml rename to app/src/main/res/layout/activity_widgetconfig.xml diff --git a/core/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml similarity index 100% rename from core/res/layout/dialog_about.xml rename to app/src/main/res/layout/dialog_about.xml diff --git a/core/res/layout/dialog_changelog.xml b/app/src/main/res/layout/dialog_changelog.xml similarity index 100% rename from core/res/layout/dialog_changelog.xml rename to app/src/main/res/layout/dialog_changelog.xml diff --git a/external/ColorPickerPreference/res/layout/dialog_color_picker.xml b/app/src/main/res/layout/dialog_color_picker.xml similarity index 100% rename from external/ColorPickerPreference/res/layout/dialog_color_picker.xml rename to app/src/main/res/layout/dialog_color_picker.xml diff --git a/core/res/layout/dialog_setlabel.xml b/app/src/main/res/layout/dialog_setlabel.xml similarity index 100% rename from core/res/layout/dialog_setlabel.xml rename to app/src/main/res/layout/dialog_setlabel.xml diff --git a/core/res/layout/dialog_storagelocation.xml b/app/src/main/res/layout/dialog_storagelocation.xml similarity index 100% rename from core/res/layout/dialog_storagelocation.xml rename to app/src/main/res/layout/dialog_storagelocation.xml diff --git a/core/res/layout/dialog_trackers.xml b/app/src/main/res/layout/dialog_trackers.xml similarity index 100% rename from core/res/layout/dialog_trackers.xml rename to app/src/main/res/layout/dialog_trackers.xml diff --git a/core/res/layout/dialog_transferrates.xml b/app/src/main/res/layout/dialog_transferrates.xml similarity index 100% rename from core/res/layout/dialog_transferrates.xml rename to app/src/main/res/layout/dialog_transferrates.xml diff --git a/core/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml similarity index 100% rename from core/res/layout/fragment_details.xml rename to app/src/main/res/layout/fragment_details.xml diff --git a/core/res/layout/fragment_details_header.xml b/app/src/main/res/layout/fragment_details_header.xml similarity index 100% rename from core/res/layout/fragment_details_header.xml rename to app/src/main/res/layout/fragment_details_header.xml diff --git a/core/res/layout/fragment_filters.xml b/app/src/main/res/layout/fragment_filters.xml similarity index 100% rename from core/res/layout/fragment_filters.xml rename to app/src/main/res/layout/fragment_filters.xml diff --git a/core/res/layout/fragment_rssfeeds.xml b/app/src/main/res/layout/fragment_rssfeeds.xml similarity index 100% rename from core/res/layout/fragment_rssfeeds.xml rename to app/src/main/res/layout/fragment_rssfeeds.xml diff --git a/core/res/layout/fragment_rssitems.xml b/app/src/main/res/layout/fragment_rssitems.xml similarity index 100% rename from core/res/layout/fragment_rssitems.xml rename to app/src/main/res/layout/fragment_rssitems.xml diff --git a/core/res/layout/fragment_searchresults.xml b/app/src/main/res/layout/fragment_searchresults.xml similarity index 100% rename from core/res/layout/fragment_searchresults.xml rename to app/src/main/res/layout/fragment_searchresults.xml diff --git a/core/res/layout/fragment_torrents.xml b/app/src/main/res/layout/fragment_torrents.xml similarity index 100% rename from core/res/layout/fragment_torrents.xml rename to app/src/main/res/layout/fragment_torrents.xml diff --git a/core/res/layout/list_item_filter.xml b/app/src/main/res/layout/list_item_filter.xml similarity index 100% rename from core/res/layout/list_item_filter.xml rename to app/src/main/res/layout/list_item_filter.xml diff --git a/core/res/layout/list_item_rssfeed.xml b/app/src/main/res/layout/list_item_rssfeed.xml similarity index 100% rename from core/res/layout/list_item_rssfeed.xml rename to app/src/main/res/layout/list_item_rssfeed.xml diff --git a/core/res/layout/list_item_rssitem.xml b/app/src/main/res/layout/list_item_rssitem.xml similarity index 100% rename from core/res/layout/list_item_rssitem.xml rename to app/src/main/res/layout/list_item_rssitem.xml diff --git a/core/res/layout/list_item_searchresult.xml b/app/src/main/res/layout/list_item_searchresult.xml similarity index 100% rename from core/res/layout/list_item_searchresult.xml rename to app/src/main/res/layout/list_item_searchresult.xml diff --git a/core/res/layout/list_item_searchsite.xml b/app/src/main/res/layout/list_item_searchsite.xml similarity index 100% rename from core/res/layout/list_item_searchsite.xml rename to app/src/main/res/layout/list_item_searchsite.xml diff --git a/core/res/layout/list_item_separator.xml b/app/src/main/res/layout/list_item_separator.xml similarity index 100% rename from core/res/layout/list_item_separator.xml rename to app/src/main/res/layout/list_item_separator.xml diff --git a/core/res/layout/list_item_simple.xml b/app/src/main/res/layout/list_item_simple.xml similarity index 100% rename from core/res/layout/list_item_simple.xml rename to app/src/main/res/layout/list_item_simple.xml diff --git a/core/res/layout/list_item_torrent.xml b/app/src/main/res/layout/list_item_torrent.xml similarity index 100% rename from core/res/layout/list_item_torrent.xml rename to app/src/main/res/layout/list_item_torrent.xml diff --git a/core/res/layout/list_item_torrentfile.xml b/app/src/main/res/layout/list_item_torrentfile.xml similarity index 100% rename from core/res/layout/list_item_torrentfile.xml rename to app/src/main/res/layout/list_item_torrentfile.xml diff --git a/core/res/layout/list_item_widget_dark.xml b/app/src/main/res/layout/list_item_widget_dark.xml similarity index 100% rename from core/res/layout/list_item_widget_dark.xml rename to app/src/main/res/layout/list_item_widget_dark.xml diff --git a/core/res/layout/list_item_widget_light.xml b/app/src/main/res/layout/list_item_widget_light.xml similarity index 100% rename from core/res/layout/list_item_widget_light.xml rename to app/src/main/res/layout/list_item_widget_light.xml diff --git a/core/res/layout/pref_withoverflow.xml b/app/src/main/res/layout/pref_withoverflow.xml similarity index 100% rename from core/res/layout/pref_withoverflow.xml rename to app/src/main/res/layout/pref_withoverflow.xml diff --git a/core/res/layout/widget_torrents_dark.xml b/app/src/main/res/layout/widget_torrents_dark.xml similarity index 100% rename from core/res/layout/widget_torrents_dark.xml rename to app/src/main/res/layout/widget_torrents_dark.xml diff --git a/core/res/layout/widget_torrents_light.xml b/app/src/main/res/layout/widget_torrents_light.xml similarity index 100% rename from core/res/layout/widget_torrents_light.xml rename to app/src/main/res/layout/widget_torrents_light.xml diff --git a/core/res/menu/activity_deleteableprefs.xml b/app/src/main/res/menu/activity_deleteableprefs.xml similarity index 100% rename from core/res/menu/activity_deleteableprefs.xml rename to app/src/main/res/menu/activity_deleteableprefs.xml diff --git a/core/res/menu/activity_details.xml b/app/src/main/res/menu/activity_details.xml similarity index 100% rename from core/res/menu/activity_details.xml rename to app/src/main/res/menu/activity_details.xml diff --git a/core/res/menu/activity_search.xml b/app/src/main/res/menu/activity_search.xml similarity index 100% rename from core/res/menu/activity_search.xml rename to app/src/main/res/menu/activity_search.xml diff --git a/core/res/menu/activity_torrents.xml b/app/src/main/res/menu/activity_torrents.xml similarity index 100% rename from core/res/menu/activity_torrents.xml rename to app/src/main/res/menu/activity_torrents.xml diff --git a/core/res/menu/dialog_about.xml b/app/src/main/res/menu/dialog_about.xml similarity index 100% rename from core/res/menu/dialog_about.xml rename to app/src/main/res/menu/dialog_about.xml diff --git a/core/res/menu/fragment_details.xml b/app/src/main/res/menu/fragment_details.xml similarity index 100% rename from core/res/menu/fragment_details.xml rename to app/src/main/res/menu/fragment_details.xml diff --git a/core/res/menu/fragment_details_cab.xml b/app/src/main/res/menu/fragment_details_cab.xml similarity index 100% rename from core/res/menu/fragment_details_cab.xml rename to app/src/main/res/menu/fragment_details_cab.xml diff --git a/core/res/menu/fragment_rssfeeds.xml b/app/src/main/res/menu/fragment_rssfeeds.xml similarity index 100% rename from core/res/menu/fragment_rssfeeds.xml rename to app/src/main/res/menu/fragment_rssfeeds.xml diff --git a/core/res/menu/fragment_rssitems_cab.xml b/app/src/main/res/menu/fragment_rssitems_cab.xml similarity index 100% rename from core/res/menu/fragment_rssitems_cab.xml rename to app/src/main/res/menu/fragment_rssitems_cab.xml diff --git a/core/res/menu/fragment_searchresults_cab.xml b/app/src/main/res/menu/fragment_searchresults_cab.xml similarity index 100% rename from core/res/menu/fragment_searchresults_cab.xml rename to app/src/main/res/menu/fragment_searchresults_cab.xml diff --git a/core/res/menu/fragment_torrents_cab.xml b/app/src/main/res/menu/fragment_torrents_cab.xml similarity index 100% rename from core/res/menu/fragment_torrents_cab.xml rename to app/src/main/res/menu/fragment_torrents_cab.xml diff --git a/core/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml similarity index 100% rename from core/res/values-cs/strings.xml rename to app/src/main/res/values-cs/strings.xml diff --git a/core/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from core/res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/core/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from core/res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/core/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml similarity index 100% rename from core/res/values-en/strings.xml rename to app/src/main/res/values-en/strings.xml diff --git a/core/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from core/res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/core/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml similarity index 100% rename from core/res/values-fa/strings.xml rename to app/src/main/res/values-fa/strings.xml diff --git a/core/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml similarity index 100% rename from core/res/values-fi/strings.xml rename to app/src/main/res/values-fi/strings.xml diff --git a/core/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from core/res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/core/res/values-h400dp/dimens.xml b/app/src/main/res/values-h400dp/dimens.xml similarity index 100% rename from core/res/values-h400dp/dimens.xml rename to app/src/main/res/values-h400dp/dimens.xml diff --git a/core/res/values-h600dp/dimens.xml b/app/src/main/res/values-h600dp/dimens.xml similarity index 100% rename from core/res/values-h600dp/dimens.xml rename to app/src/main/res/values-h600dp/dimens.xml diff --git a/core/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml similarity index 100% rename from core/res/values-hu/strings.xml rename to app/src/main/res/values-hu/strings.xml diff --git a/core/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from core/res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/core/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml similarity index 100% rename from core/res/values-land/dimens.xml rename to app/src/main/res/values-land/dimens.xml diff --git a/core/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 100% rename from core/res/values-nl/strings.xml rename to app/src/main/res/values-nl/strings.xml diff --git a/core/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml similarity index 100% rename from core/res/values-no-rNB/strings.xml rename to app/src/main/res/values-no-rNB/strings.xml diff --git a/core/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from core/res/values-pt-rBR/strings.xml rename to app/src/main/res/values-pt-rBR/strings.xml diff --git a/core/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml similarity index 100% rename from core/res/values-pt/strings.xml rename to app/src/main/res/values-pt/strings.xml diff --git a/core/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from core/res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/core/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml similarity index 100% rename from core/res/values-sl/strings.xml rename to app/src/main/res/values-sl/strings.xml diff --git a/core/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml similarity index 100% rename from core/res/values-sv/strings.xml rename to app/src/main/res/values-sv/strings.xml diff --git a/core/res/values-sw500dp/bools.xml b/app/src/main/res/values-sw500dp/bools.xml similarity index 100% rename from core/res/values-sw500dp/bools.xml rename to app/src/main/res/values-sw500dp/bools.xml diff --git a/core/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from core/res/values-sw600dp/dimens.xml rename to app/src/main/res/values-sw600dp/dimens.xml diff --git a/core/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml similarity index 100% rename from core/res/values-uk/strings.xml rename to app/src/main/res/values-uk/strings.xml diff --git a/core/res/values-v16/styles.xml b/app/src/main/res/values-v16/styles.xml similarity index 100% rename from core/res/values-v16/styles.xml rename to app/src/main/res/values-v16/styles.xml diff --git a/core/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml similarity index 100% rename from core/res/values-vi/strings.xml rename to app/src/main/res/values-vi/strings.xml diff --git a/core/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from core/res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/core/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from core/res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/core/res/values/bools.xml b/app/src/main/res/values/bools.xml similarity index 100% rename from core/res/values/bools.xml rename to app/src/main/res/values/bools.xml diff --git a/core/res/values/changelog.xml b/app/src/main/res/values/changelog.xml similarity index 97% rename from core/res/values/changelog.xml rename to app/src/main/res/values/changelog.xml index c3f65cdf..2c486afe 100644 --- a/core/res/values/changelog.xml +++ b/app/src/main/res/values/changelog.xml @@ -19,6 +19,8 @@ Transdroid 2.3.0\n - Aria2 support\n +- Fixed server checker when one is unavailable\n +- Fixed Deluge magnet links from Chrome\n \n Transdroid 2.2.0\n - Dropped legacy Android support; Android 4.0.3 is the new minimum\n diff --git a/core/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from core/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/core/res/values/colors_transdroid_dark.xml b/app/src/main/res/values/colors_transdroid_dark.xml similarity index 100% rename from core/res/values/colors_transdroid_dark.xml rename to app/src/main/res/values/colors_transdroid_dark.xml diff --git a/core/res/values/colors_transdroid_light.xml b/app/src/main/res/values/colors_transdroid_light.xml similarity index 100% rename from core/res/values/colors_transdroid_light.xml rename to app/src/main/res/values/colors_transdroid_light.xml diff --git a/core/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from core/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/external/ColorPickerPreference/res/values/integer.xml b/app/src/main/res/values/integer_colorpicker.xml similarity index 100% rename from external/ColorPickerPreference/res/values/integer.xml rename to app/src/main/res/values/integer_colorpicker.xml diff --git a/core/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 99% rename from core/res/values/strings.xml rename to app/src/main/res/values/strings.xml index d2491257..ecd592e3 100644 --- a/core/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,7 +16,7 @@ along with Transdroid. If not, see . --> - + Add Add all From file diff --git a/external/ColorPickerPreference/res/values/strings.xml b/app/src/main/res/values/strings_colorpicker.xml similarity index 100% rename from external/ColorPickerPreference/res/values/strings.xml rename to app/src/main/res/values/strings_colorpicker.xml diff --git a/core/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 97% rename from core/res/values/styles.xml rename to app/src/main/res/values/styles.xml index 56ba4c3e..6f662670 100644 --- a/core/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -99,11 +99,7 @@ - - - + - - \ No newline at end of file diff --git a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/DefaultHeaderTransformer.java b/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/DefaultHeaderTransformer.java deleted file mode 100644 index d5989de4..00000000 --- a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/DefaultHeaderTransformer.java +++ /dev/null @@ -1,397 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.co.senab.actionbarpulltorefresh.library; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.TypedArray; -import android.graphics.PixelFormat; -import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; -import android.os.Build; -import android.util.TypedValue; -import android.view.View; -import android.view.ViewGroup; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.Interpolator; -import android.widget.ProgressBar; -import android.widget.TextView; - -import uk.co.senab.actionbarpulltorefresh.library.platform.SDK11; - -/** - * Default Header Transformer. - */ -public class DefaultHeaderTransformer extends PullToRefreshAttacher.HeaderTransformer { - - private View mHeaderView; - private ViewGroup mContentLayout; - private TextView mHeaderTextView; - private ProgressBar mHeaderProgressBar; - - private CharSequence mPullRefreshLabel, mRefreshingLabel, mReleaseLabel; - - private boolean mUseCustomProgressColor = false; - private int mProgressDrawableColor; - private long mAnimationDuration; - - private final Interpolator mInterpolator = new AccelerateInterpolator(); - - protected DefaultHeaderTransformer() { - final int min = getMinimumApiLevel(); - if (Build.VERSION.SDK_INT < min) { - throw new IllegalStateException("This HeaderTransformer is designed to run on SDK " - + min - + "+. If using ActionBarSherlock or ActionBarCompat you should use the appropriate provided extra."); - } - } - - @Override - public void onViewCreated(Activity activity, View headerView) { - mHeaderView = headerView; - - // Get ProgressBar and TextView - mHeaderProgressBar = (ProgressBar) headerView.findViewById(R.id.ptr_progress); - mHeaderTextView = (TextView) headerView.findViewById(R.id.ptr_text); - mContentLayout = (ViewGroup) headerView.findViewById(R.id.ptr_content); - - // Default Labels to display - mPullRefreshLabel = activity.getString(R.string.pull_to_refresh_pull_label); - mRefreshingLabel = activity.getString(R.string.pull_to_refresh_refreshing_label); - mReleaseLabel = activity.getString(R.string.pull_to_refresh_release_label); - - mAnimationDuration = activity.getResources() - .getInteger(android.R.integer.config_shortAnimTime); - - // Setup the View styles - setupViewsFromStyles(activity, headerView); - - // Apply any custom ProgressBar colors - applyProgressBarColor(); - - // FIXME: I do not like this call here - onReset(); - } - - @Override - public void onConfigurationChanged(Activity activity, Configuration newConfig) { - setupViewsFromStyles(activity, getHeaderView()); - } - - @Override - public void onReset() { - // Reset Progress Bar - if (mHeaderProgressBar != null) { - mHeaderProgressBar.setVisibility(View.GONE); - mHeaderProgressBar.setProgress(0); - mHeaderProgressBar.setIndeterminate(false); - } - - // Reset Text View - if (mHeaderTextView != null) { - mHeaderTextView.setVisibility(View.VISIBLE); - mHeaderTextView.setText(mPullRefreshLabel); - } - - // Reset the Content Layout - if (mContentLayout != null) { - mContentLayout.setVisibility(View.VISIBLE); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - SDK11.setAlpha(mContentLayout, 1f); - } - } - } - - @Override - public void onPulled(float percentagePulled) { - if (mHeaderProgressBar != null) { - mHeaderProgressBar.setVisibility(View.VISIBLE); - final float progress = mInterpolator.getInterpolation(percentagePulled); - mHeaderProgressBar.setProgress(Math.round(mHeaderProgressBar.getMax() * progress)); - } - } - - @Override - public void onRefreshStarted() { - if (mHeaderTextView != null) { - mHeaderTextView.setText(mRefreshingLabel); - } - if (mHeaderProgressBar != null) { - mHeaderProgressBar.setVisibility(View.VISIBLE); - mHeaderProgressBar.setIndeterminate(true); - } - } - - @Override - public void onReleaseToRefresh() { - if (mHeaderTextView != null) { - mHeaderTextView.setText(mReleaseLabel); - } - if (mHeaderProgressBar != null) { - mHeaderProgressBar.setProgress(mHeaderProgressBar.getMax()); - } - } - - @Override - public void onRefreshMinimized() { - // Here we fade out most of the header, leaving just the progress bar - if (mContentLayout != null) { - ObjectAnimator.ofFloat(mContentLayout, "alpha", 1f, 0f).start(); - } - } - - public View getHeaderView() { - return mHeaderView; - } - - @Override - public boolean showHeaderView() { - final boolean changeVis = mHeaderView.getVisibility() != View.VISIBLE; - - if (changeVis) { - mHeaderView.setVisibility(View.VISIBLE); - AnimatorSet animSet = new AnimatorSet(); - ObjectAnimator transAnim = ObjectAnimator.ofFloat(mContentLayout, "translationY", - -mContentLayout.getHeight(), 0f); - ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mHeaderView, "alpha", 0f, 1f); - animSet.playTogether(transAnim, alphaAnim); - animSet.setDuration(mAnimationDuration); - animSet.start(); - } - - return changeVis; - } - - @Override - public boolean hideHeaderView() { - final boolean changeVis = mHeaderView.getVisibility() != View.GONE; - - if (changeVis) { - Animator animator; - if (mContentLayout.getAlpha() >= 0.5f) { - // If the content layout is showing, translate and fade out - animator = new AnimatorSet(); - ObjectAnimator transAnim = ObjectAnimator.ofFloat(mContentLayout, "translationY", - 0f, -mContentLayout.getHeight()); - ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mHeaderView, "alpha", 1f, 0f); - ((AnimatorSet) animator).playTogether(transAnim, alphaAnim); - } else { - // If the content layout isn't showing (minimized), just fade out - animator = ObjectAnimator.ofFloat(mHeaderView, "alpha", 1f, 0f); - } - animator.setDuration(mAnimationDuration); - animator.addListener(new HideAnimationCallback()); - animator.start(); - } - - return changeVis; - } - - /** - * Set color to apply to the progress bar. Automatically enables usage of the custom color. Use - * {@link #setProgressBarColorEnabled(boolean)} to disable and re-enable the custom color usage. - *

- * The best way to apply a color is to load the color from resources: {@code - * setProgressBarColor(getResources().getColor(R.color.your_color_name))}. - * - * @param color The color to use. - */ - public void setProgressBarColor(int color) { - mProgressDrawableColor = color; - setProgressBarColorEnabled(true); - } - - /** - * Enable or disable the use of a custom progress bar color. You can set what color to use with - * {@link #setProgressBarColor(int)}, which also automatically enables custom color usage. - */ - public void setProgressBarColorEnabled(boolean enabled) { - mUseCustomProgressColor = enabled; - applyProgressBarColor(); - } - - - /** - * Set Text to show to prompt the user is pull (or keep pulling). - * - * @param pullText - Text to display. - */ - public void setPullText(CharSequence pullText) { - mPullRefreshLabel = pullText; - if (mHeaderTextView != null) { - mHeaderTextView.setText(mPullRefreshLabel); - } - } - - /** - * Set Text to show to tell the user that a refresh is currently in progress. - * - * @param refreshingText - Text to display. - */ - public void setRefreshingText(CharSequence refreshingText) { - mRefreshingLabel = refreshingText; - } - - /** - * Set Text to show to tell the user has scrolled enough to refresh. - * - * @param releaseText - Text to display. - */ - public void setReleaseText(CharSequence releaseText) { - mReleaseLabel = releaseText; - } - - private void setupViewsFromStyles(Activity activity, View headerView) { - final TypedArray styleAttrs = obtainStyledAttrsFromThemeAttr(activity, - R.attr.ptrHeaderStyle, R.styleable.PullToRefreshHeader); - - // Retrieve the Action Bar size from the app theme or the Action Bar's style - if (mContentLayout != null) { - final int height = styleAttrs - .getDimensionPixelSize(R.styleable.PullToRefreshHeader_ptrHeaderHeight, - getActionBarSize(activity)); - mContentLayout.getLayoutParams().height = height; - mContentLayout.requestLayout(); - } - - // Retrieve the Action Bar background from the app theme or the Action Bar's style (see #93) - Drawable bg = styleAttrs.hasValue(R.styleable.PullToRefreshHeader_ptrHeaderBackground) - ? styleAttrs.getDrawable(R.styleable.PullToRefreshHeader_ptrHeaderBackground) - : getActionBarBackground(activity); - if (bg != null) { - mHeaderTextView.setBackgroundDrawable(bg); - - // If we have an opaque background we can remove the background from the content layout - if (mContentLayout != null && bg.getOpacity() == PixelFormat.OPAQUE) { - mContentLayout.setBackgroundResource(0); - } - } - - // Retrieve the Action Bar Title Style from the app theme or the Action Bar's style - Context abContext = headerView.getContext(); - final int titleTextStyle = styleAttrs - .getResourceId(R.styleable.PullToRefreshHeader_ptrHeaderTitleTextAppearance, - getActionBarTitleStyle(abContext)); - if (titleTextStyle != 0) { - mHeaderTextView.setTextAppearance(abContext, titleTextStyle); - } - - // Retrieve the Progress Bar Color the style - if (styleAttrs.hasValue(R.styleable.PullToRefreshHeader_ptrProgressBarColor)) { - mUseCustomProgressColor = true; - mProgressDrawableColor = styleAttrs - .getColor(R.styleable.PullToRefreshHeader_ptrProgressBarColor, 0); - } - - // Retrieve the text strings from the style (if they're set) - if (styleAttrs.hasValue(R.styleable.PullToRefreshHeader_ptrPullText)) { - mPullRefreshLabel = styleAttrs.getString(R.styleable.PullToRefreshHeader_ptrPullText); - } - if (styleAttrs.hasValue(R.styleable.PullToRefreshHeader_ptrRefreshingText)) { - mRefreshingLabel = styleAttrs - .getString(R.styleable.PullToRefreshHeader_ptrRefreshingText); - } - if (styleAttrs.hasValue(R.styleable.PullToRefreshHeader_ptrReleaseText)) { - mReleaseLabel = styleAttrs.getString(R.styleable.PullToRefreshHeader_ptrReleaseText); - } - - styleAttrs.recycle(); - } - - private void applyProgressBarColor() { - if (mHeaderProgressBar != null) { - if (mUseCustomProgressColor) { - mHeaderProgressBar.getProgressDrawable() - .setColorFilter(mProgressDrawableColor, PorterDuff.Mode.SRC_ATOP); - mHeaderProgressBar.getIndeterminateDrawable() - .setColorFilter(mProgressDrawableColor, PorterDuff.Mode.SRC_ATOP); - } else { - mHeaderProgressBar.getProgressDrawable().clearColorFilter(); - mHeaderProgressBar.getIndeterminateDrawable().clearColorFilter(); - } - } - } - - protected Drawable getActionBarBackground(Context context) { - int[] android_styleable_ActionBar = {android.R.attr.background}; - - // Now get the action bar style values... - TypedArray abStyle = obtainStyledAttrsFromThemeAttr(context, android.R.attr.actionBarStyle, - android_styleable_ActionBar); - try { - // background is the first attr in the array above so it's index is 0. - return abStyle.getDrawable(0); - } finally { - abStyle.recycle(); - } - } - - protected int getActionBarSize(Context context) { - int[] attrs = {android.R.attr.actionBarSize}; - TypedArray values = context.getTheme().obtainStyledAttributes(attrs); - try { - return values.getDimensionPixelSize(0, 0); - } finally { - values.recycle(); - } - } - - protected int getActionBarTitleStyle(Context context) { - int[] android_styleable_ActionBar = {android.R.attr.titleTextStyle}; - - // Now get the action bar style values... - TypedArray abStyle = obtainStyledAttrsFromThemeAttr(context, android.R.attr.actionBarStyle, - android_styleable_ActionBar); - try { - // titleTextStyle is the first attr in the array above so it's index is 0. - return abStyle.getResourceId(0, 0); - } finally { - abStyle.recycle(); - } - } - - protected int getMinimumApiLevel() { - return Build.VERSION_CODES.ICE_CREAM_SANDWICH; - } - - class HideAnimationCallback extends AnimatorListenerAdapter { - @Override - public void onAnimationEnd(Animator animation) { - View headerView = getHeaderView(); - if (headerView != null) { - headerView.setVisibility(View.GONE); - } - onReset(); - } - } - - protected static TypedArray obtainStyledAttrsFromThemeAttr(Context context, int themeAttr, - int[] styleAttrs) { - // Need to get resource id of style pointed to from the theme attr - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(themeAttr, outValue, true); - final int styleResId = outValue.resourceId; - - // Now return the values (from styleAttrs) from the style - return context.obtainStyledAttributes(styleResId, styleAttrs); - } -} diff --git a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/InstanceCreationUtils.java b/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/InstanceCreationUtils.java deleted file mode 100644 index 77766f8a..00000000 --- a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/InstanceCreationUtils.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.co.senab.actionbarpulltorefresh.library; - -import android.content.Context; -import android.util.Log; -import android.view.View; - -import java.lang.reflect.Constructor; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import uk.co.senab.actionbarpulltorefresh.library.viewdelegates.AbsListViewDelegate; -import uk.co.senab.actionbarpulltorefresh.library.viewdelegates.ScrollYDelegate; -import uk.co.senab.actionbarpulltorefresh.library.viewdelegates.WebViewDelegate; - -class InstanceCreationUtils { - - private static final String LOG_TAG = "InstanceCreationUtils"; - - private static final Class[] VIEW_DELEGATE_CONSTRUCTOR_SIGNATURE = new Class[]{}; - private static final Class[] TRANSFORMER_CONSTRUCTOR_SIGNATURE = new Class[]{}; - - private static final HashMap BUILT_IN_DELEGATES; - static { - BUILT_IN_DELEGATES = new HashMap(); - BUILT_IN_DELEGATES.put(AbsListViewDelegate.SUPPORTED_VIEW_CLASS, AbsListViewDelegate.class); - BUILT_IN_DELEGATES.put(WebViewDelegate.SUPPORTED_VIEW_CLASS, WebViewDelegate.class); - } - - static PullToRefreshAttacher.ViewDelegate getBuiltInViewDelegate(final View view) { - final Set> entries = BUILT_IN_DELEGATES.entrySet(); - for (final Map.Entry entry : entries) { - if (entry.getKey().isInstance(view)) { - return InstanceCreationUtils.newInstance(view.getContext(), - entry.getValue(), VIEW_DELEGATE_CONSTRUCTOR_SIGNATURE, null); - } - } - - // Default is the ScrollYDelegate - return InstanceCreationUtils.newInstance(view.getContext(), - ScrollYDelegate.class, VIEW_DELEGATE_CONSTRUCTOR_SIGNATURE, null); - } - - static T instantiateViewDelegate(Context context, String className, Object[] arguments) { - try { - Class clazz = context.getClassLoader().loadClass(className); - return newInstance(context, clazz, VIEW_DELEGATE_CONSTRUCTOR_SIGNATURE, arguments); - } catch (Exception e) { - Log.w(LOG_TAG, "Cannot instantiate class: " + className, e); - } - return null; - } - - static T instantiateTransformer(Context context, String className, Object[] arguments) { - try { - Class clazz = context.getClassLoader().loadClass(className); - return newInstance(context, clazz, TRANSFORMER_CONSTRUCTOR_SIGNATURE, arguments); - } catch (Exception e) { - Log.w(LOG_TAG, "Cannot instantiate class: " + className, e); - } - return null; - } - - private static T newInstance(Context context, Class clazz, Class[] constructorSig, - Object[] arguments) { - try { - Constructor constructor = clazz.getConstructor(constructorSig); - return (T) constructor.newInstance(arguments); - } catch (Exception e) { - Log.w(LOG_TAG, "Cannot instantiate class: " + clazz.getName(), e); - } - return null; - } - -} diff --git a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/PullToRefreshAttacher.java b/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/PullToRefreshAttacher.java deleted file mode 100644 index 5b344be1..00000000 --- a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/PullToRefreshAttacher.java +++ /dev/null @@ -1,948 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.co.senab.actionbarpulltorefresh.library; - -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; -import android.graphics.Rect; -import android.os.Build; -import android.os.Handler; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewConfiguration; -import android.view.ViewGroup; -import android.widget.FrameLayout; - -import java.util.Set; -import java.util.WeakHashMap; - -/** - * FIXME - */ -public class PullToRefreshAttacher implements View.OnTouchListener { - - /* Default configuration values */ - private static final int DEFAULT_HEADER_LAYOUT = R.layout.default_header; - private static final float DEFAULT_REFRESH_SCROLL_DISTANCE = 0.5f; - private static final boolean DEFAULT_REFRESH_ON_UP = false; - private static final int DEFAULT_REFRESH_MINIMIZED_DELAY = 1 * 1000; - private static final boolean DEFAULT_REFRESH_MINIMIZE = true; - - private static final boolean DEBUG = false; - private static final String LOG_TAG = "PullToRefreshAttacher"; - - /* Member Variables */ - - private final EnvironmentDelegate mEnvironmentDelegate; - private final HeaderTransformer mHeaderTransformer; - - private final Activity mActivity; - private final View mHeaderView; - private HeaderViewListener mHeaderViewListener; - - private final int mTouchSlop; - private final float mRefreshScrollDistance; - - private int mInitialMotionY, mLastMotionY, mPullBeginY; - private boolean mIsBeingDragged, mIsRefreshing, mHandlingTouchEventFromDown; - - private final WeakHashMap mRefreshableViews; - - private boolean mEnabled = true; - private final boolean mRefreshOnUp; - private final int mRefreshMinimizeDelay; - private final boolean mRefreshMinimize; - - private final Handler mHandler = new Handler(); - - /** - * Get a PullToRefreshAttacher for this Activity. If there is already a - * PullToRefreshAttacher attached to the Activity, the existing one is - * returned, otherwise a new instance is created. This version of the method - * will use default configuration options for everything. - * - * @param activity - * Activity to attach to. - * @return PullToRefresh attached to the Activity. - */ - public static PullToRefreshAttacher get(Activity activity) { - return get(activity, new Options()); - } - - /** - * Get a PullToRefreshAttacher for this Activity. If there is already a - * PullToRefreshAttacher attached to the Activity, the existing one is - * returned, otherwise a new instance is created. - * - * @param activity - * Activity to attach to. - * @param options - * Options used when creating the PullToRefreshAttacher. - * @return PullToRefresh attached to the Activity. - */ - public static PullToRefreshAttacher get(Activity activity, Options options) { - return new PullToRefreshAttacher(activity, options); - } - - protected PullToRefreshAttacher(Activity activity, Options options) { - if (options == null) { - Log.i(LOG_TAG, "Given null options so using default options."); - options = new Options(); - } - - mActivity = activity; - mRefreshableViews = new WeakHashMap(); - - // Copy necessary values from options - mRefreshScrollDistance = options.refreshScrollDistance; - mRefreshOnUp = options.refreshOnUp; - mRefreshMinimizeDelay = options.refreshMinimizeDelay; - mRefreshMinimize = options.refreshMinimize; - - // EnvironmentDelegate - mEnvironmentDelegate = options.environmentDelegate != null ? options.environmentDelegate - : createDefaultEnvironmentDelegate(); - - // Header Transformer - mHeaderTransformer = options.headerTransformer != null ? options.headerTransformer - : createDefaultHeaderTransformer(); - - // Get touch slop for use later - mTouchSlop = ViewConfiguration.get(activity).getScaledTouchSlop(); - - // Get Window Decor View - final ViewGroup decorView = (ViewGroup) activity.getWindow() - .getDecorView(); - - // Check to see if there is already a Attacher view installed - if (decorView.getChildCount() == 1 - && decorView.getChildAt(0) instanceof DecorChildLayout) { - throw new IllegalStateException( - "You should only create one PullToRefreshAttacher per Activity"); - } - - // Create Header view and then add to Decor View - mHeaderView = LayoutInflater.from( - mEnvironmentDelegate.getContextForInflater(activity)).inflate( - options.headerLayout, decorView, false); - if (mHeaderView == null) { - throw new IllegalArgumentException( - "Must supply valid layout id for header."); - } - // Make Header View invisible so it still gets a layout pass - mHeaderView.setVisibility(View.INVISIBLE); - - // Create DecorChildLayout which will move all of the system's decor - // view's children + the - // Header View to itself. See DecorChildLayout for more info. - DecorChildLayout decorContents = new DecorChildLayout(activity, - decorView, mHeaderView); - - // Now add the DecorChildLayout to the decor view - decorView.addView(decorContents, ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT); - - // Notify transformer - mHeaderTransformer.onViewCreated(activity, mHeaderView); - // TODO Remove the follow deprecated method call before v1.0 - mHeaderTransformer.onViewCreated(mHeaderView); - } - - /** - * Add a view which will be used to initiate refresh requests and a listener - * to be invoked when a refresh is started. This version of the method will - * try to find a handler for the view from the built-in view delegates. - * - * @param view - * View which will be used to initiate refresh requests. - * @param refreshListener - * Listener to be invoked when a refresh is started. - */ - public void addRefreshableView(View view, OnRefreshListener refreshListener) { - addRefreshableView(view, null, refreshListener); - } - - /** - * Add a view which will be used to initiate refresh requests, along with a - * delegate which knows how to handle the given view, and a listener to be - * invoked when a refresh is started. - * - * @param view - * View which will be used to initiate refresh requests. - * @param viewDelegate - * delegate which knows how to handle view. - * @param refreshListener - * Listener to be invoked when a refresh is started. - */ - public void addRefreshableView(View view, ViewDelegate viewDelegate, - OnRefreshListener refreshListener) { - addRefreshableView(view, viewDelegate, refreshListener, true); - } - - /** - * Add a view which will be used to initiate refresh requests, along with a - * delegate which knows how to handle the given view, and a listener to be - * invoked when a refresh is started. - * - * @param view - * View which will be used to initiate refresh requests. - * @param viewDelegate - * delegate which knows how to handle view. - * @param refreshListener - * Listener to be invoked when a refresh is started. - * @param setTouchListener - * Whether to set this as the - * {@link android.view.View.OnTouchListener}. - */ - void addRefreshableView(View view, ViewDelegate viewDelegate, - OnRefreshListener refreshListener, final boolean setTouchListener) { - // Check to see if view is null - if (view == null) { - Log.i(LOG_TAG, "Refreshable View is null."); - return; - } - - if (refreshListener == null) { - throw new IllegalArgumentException( - "OnRefreshListener not given. Please provide one."); - } - - // ViewDelegate - if (viewDelegate == null) { - viewDelegate = InstanceCreationUtils.getBuiltInViewDelegate(view); - if (viewDelegate == null) { - throw new IllegalArgumentException( - "No view handler found. Please provide one."); - } - } - - // View to detect refreshes for - mRefreshableViews.put(view, new ViewParams(viewDelegate, refreshListener)); - if (setTouchListener) { - view.setOnTouchListener(this); - } - } - - /** - * Remove a view which was previously used to initiate refresh requests. - * - * @param view - * - View which will be used to initiate refresh requests. - */ - public void removeRefreshableView(View view) { - if (mRefreshableViews.containsKey(view)) { - mRefreshableViews.remove(view); - view.setOnTouchListener(null); - } - } - - /** - * Clear all views which were previously used to initiate refresh requests. - */ - public void clearRefreshableViews() { - Set views = mRefreshableViews.keySet(); - for (View view : views) { - view.setOnTouchListener(null); - } - mRefreshableViews.clear(); - } - - /** - * This method should be called by your Activity's or Fragment's - * onConfigurationChanged method. - * - * @param newConfig The new configuration - */ - public void onConfigurationChanged(Configuration newConfig) { - mHeaderTransformer.onConfigurationChanged(mActivity, newConfig); - } - - /** - * Manually set this Attacher's refreshing state. The header will be - * displayed or hidden as requested. - * - * @param refreshing - * - Whether the attacher should be in a refreshing state, - */ - public final void setRefreshing(boolean refreshing) { - setRefreshingInt(null, refreshing, false); - } - - /** - * @return true if this Attacher is currently in a refreshing state. - */ - public final boolean isRefreshing() { - return mIsRefreshing; - } - - /** - * @return true if this PullToRefresh is currently enabled (defaults to - * true) - */ - public boolean isEnabled() { - return mEnabled; - } - - /** - * Allows the enable/disable of this PullToRefreshAttacher. If disabled when - * refreshing then the UI is automatically reset. - * - * @param enabled - * - Whether this PullToRefreshAttacher is enabled. - */ - public void setEnabled(boolean enabled) { - mEnabled = enabled; - - if (!enabled) { - // If we're not enabled, reset any touch handling - resetTouch(); - - // If we're currently refreshing, reset the ptr UI - if (mIsRefreshing) { - reset(false); - } - } - } - - /** - * Call this when your refresh is complete and this view should reset itself - * (header view will be hidden). - * - * This is the equivalent of calling setRefreshing(false). - */ - public final void setRefreshComplete() { - setRefreshingInt(null, false, false); - } - - /** - * Set a {@link HeaderViewListener} which is called when the visibility - * state of the Header View has changed. - * - * @param listener - */ - public final void setHeaderViewListener(HeaderViewListener listener) { - mHeaderViewListener = listener; - } - - /** - * @return The Header View which is displayed when the user is pulling, or - * we are refreshing. - */ - public final View getHeaderView() { - return mHeaderView; - } - - /** - * @return The HeaderTransformer currently used by this Attacher. - */ - public HeaderTransformer getHeaderTransformer() { - return mHeaderTransformer; - } - - @Override - public final boolean onTouch(final View view, final MotionEvent event) { - // Just call onTouchEvent. It now handles the proper calling of onInterceptTouchEvent - onTouchEvent(view, event); - // Always return false as we only want to observe events - return false; - } - - final boolean onInterceptTouchEvent(View view, MotionEvent event) { - if (DEBUG) { - Log.d(LOG_TAG, "onInterceptTouchEvent: " + event.toString()); - } - - // If we're not enabled or currently refreshing don't handle any touch - // events - if (!isEnabled() || isRefreshing()) { - return false; - } - - final ViewParams params = mRefreshableViews.get(view); - if (params == null) { - return false; - } - - if (DEBUG) Log.d(LOG_TAG, "onInterceptTouchEvent. Got ViewParams. " + view.toString()); - - switch (event.getAction()) { - case MotionEvent.ACTION_MOVE: { - // We're not currently being dragged so check to see if the user has - // scrolled enough - if (!mIsBeingDragged && mInitialMotionY > 0) { - final int y = (int) event.getY(); - final int yDiff = y - mInitialMotionY; - - if (yDiff > mTouchSlop) { - mIsBeingDragged = true; - onPullStarted(y); - } else if (yDiff < -mTouchSlop) { - resetTouch(); - } - } - break; - } - - case MotionEvent.ACTION_DOWN: { - // If we're already refreshing, ignore - if (canRefresh(true, params.onRefreshListener) - && params.viewDelegate.isReadyForPull(view, event.getX(), event.getY())) { - mInitialMotionY = (int) event.getY(); - } - break; - } - - case MotionEvent.ACTION_CANCEL: - case MotionEvent.ACTION_UP: { - resetTouch(); - break; - } - } - - if (DEBUG) Log.d(LOG_TAG, "onInterceptTouchEvent. Returning " + mIsBeingDragged); - - return mIsBeingDragged; - } - - final boolean onTouchEvent(View view, MotionEvent event) { - if (DEBUG) { - Log.d(LOG_TAG, "onTouchEvent: " + event.toString()); - } - - // If we're not enabled or currently refreshing don't handle any touch - // events - if (!isEnabled()) { - return false; - } - - final ViewParams params = mRefreshableViews.get(view); - if (params == null) { - Log.i(LOG_TAG, "View does not have ViewParams"); - return false; - } - - // Record whether our handling is started from ACTION_DOWN - if (event.getAction() == MotionEvent.ACTION_DOWN) { - mHandlingTouchEventFromDown = true; - } - - // If we're being called from ACTION_DOWN then we must call through to - // onInterceptTouchEvent until it sets mIsBeingDragged - if (mHandlingTouchEventFromDown && !mIsBeingDragged) { - onInterceptTouchEvent(view, event); - return true; - } - - switch (event.getAction()) { - case MotionEvent.ACTION_MOVE: { - // If we're already refreshing ignore it - if (isRefreshing()) { - return false; - } - - final int y = (int) event.getY(); - - if (mIsBeingDragged && y != mLastMotionY) { - final int yDx = y - mLastMotionY; - - /** - * Check to see if the user is scrolling the right direction - * (down). We allow a small scroll up which is the check against - * negative touch slop. - */ - if (yDx >= -mTouchSlop) { - onPull(view, y); - // Only record the y motion if the user has scrolled down. - if (yDx > 0) { - mLastMotionY = y; - } - } else { - onPullEnded(); - resetTouch(); - } - } - break; - } - - case MotionEvent.ACTION_CANCEL: - case MotionEvent.ACTION_UP: { - checkScrollForRefresh(view); - if (mIsBeingDragged) { - onPullEnded(); - } - resetTouch(); - break; - } - } - - return true; - } - - void resetTouch() { - mIsBeingDragged = false; - mHandlingTouchEventFromDown = false; - mInitialMotionY = mLastMotionY = mPullBeginY = -1; - } - - void onPullStarted(int y) { - if (DEBUG) { - Log.d(LOG_TAG, "onPullStarted"); - } - showHeaderView(); - mPullBeginY = y; - } - - void onPull(View view, int y) { - if (DEBUG) { - Log.d(LOG_TAG, "onPull"); - } - - final float pxScrollForRefresh = getScrollNeededForRefresh(view); - final int scrollLength = y - mPullBeginY; - - if (scrollLength < pxScrollForRefresh) { - mHeaderTransformer.onPulled(scrollLength / pxScrollForRefresh); - } else { - if (mRefreshOnUp) { - mHeaderTransformer.onReleaseToRefresh(); - } else { - setRefreshingInt(view, true, true); - } - } - } - - void onPullEnded() { - if (DEBUG) { - Log.d(LOG_TAG, "onPullEnded"); - } - if (!mIsRefreshing) { - reset(true); - } - } - - void showHeaderView() { - if (mHeaderTransformer.showHeaderView()) { - if (mHeaderViewListener != null) { - mHeaderViewListener.onStateChanged(mHeaderView, - HeaderViewListener.STATE_VISIBLE); - } - } - } - - void hideHeaderView() { - if (mHeaderTransformer.hideHeaderView()) { - if (mHeaderViewListener != null) { - mHeaderViewListener.onStateChanged(mHeaderView, - HeaderViewListener.STATE_HIDDEN); - } - } - } - - protected EnvironmentDelegate createDefaultEnvironmentDelegate() { - return new EnvironmentDelegate(); - } - - protected HeaderTransformer createDefaultHeaderTransformer() { - return new DefaultHeaderTransformer(); - } - - private boolean checkScrollForRefresh(View view) { - if (mIsBeingDragged && mRefreshOnUp && view != null) { - if (mLastMotionY - mPullBeginY >= getScrollNeededForRefresh(view)) { - setRefreshingInt(view, true, true); - return true; - } - } - return false; - } - - private void setRefreshingInt(View view, boolean refreshing, boolean fromTouch) { - if (DEBUG) { - Log.d(LOG_TAG, "setRefreshingInt: " + refreshing); - } - // Check to see if we need to do anything - if (mIsRefreshing == refreshing) { - return; - } - - resetTouch(); - - if (refreshing && canRefresh(fromTouch, getRefreshListenerForView(view))) { - startRefresh(view, fromTouch); - } else { - reset(fromTouch); - } - } - - private OnRefreshListener getRefreshListenerForView(View view) { - if (view != null) { - ViewParams params = mRefreshableViews.get(view); - if (params != null) { - return params.onRefreshListener; - } - } - return null; - } - - /** - * @param fromTouch - * - Whether this is being invoked from a touch event - * @return true if we're currently in a state where a refresh can be - * started. - */ - private boolean canRefresh(boolean fromTouch, OnRefreshListener listener) { - return !mIsRefreshing && (!fromTouch || listener != null); - } - - private float getScrollNeededForRefresh(View view) { - return view.getHeight() * mRefreshScrollDistance; - } - - private void reset(boolean fromTouch) { - // Update isRefreshing state - mIsRefreshing = false; - - // Remove any minimize callbacks - if (mRefreshMinimize) { - mHandler.removeCallbacks(mRefreshMinimizeRunnable); - } - - // Hide Header View - hideHeaderView(); - } - - private void startRefresh(View view, boolean fromTouch) { - // Update isRefreshing state - mIsRefreshing = true; - - // Call OnRefreshListener if this call has originated from a touch event - if (fromTouch) { - OnRefreshListener listener = getRefreshListenerForView(view); - if (listener != null) { - listener.onRefreshStarted(view); - } - } - - // Call Transformer - mHeaderTransformer.onRefreshStarted(); - - // Show Header View - showHeaderView(); - - // Post a runnable to minimize the refresh header - if (mRefreshMinimize) { - if (mRefreshMinimizeDelay > 0) { - mHandler.postDelayed(mRefreshMinimizeRunnable, mRefreshMinimizeDelay); - } else { - mHandler.post(mRefreshMinimizeRunnable); - } - } - } - - /** - * Simple Listener to listen for any callbacks to Refresh. - */ - public interface OnRefreshListener { - /** - * Called when the user has initiated a refresh by pulling. - * - * @param view - * - View which the user has started the refresh from. - */ - public void onRefreshStarted(View view); - } - - public interface HeaderViewListener { - /** - * The state when the header view is completely visible. - */ - public static int STATE_VISIBLE = 0; - - /** - * The state when the header view is minimized. By default this means - * that the progress bar is still visible, but the rest of the view is - * hidden, showing the Action Bar behind. - *

- * This will not be called in header minimization is disabled. - */ - public static int STATE_MINIMIZED = 1; - - /** - * The state when the header view is completely hidden. - */ - public static int STATE_HIDDEN = 2; - - /** - * Called when the visibility state of the Header View has changed. - * - * @param headerView - * HeaderView who's state has changed. - * @param state - * The new state. One of {@link #STATE_VISIBLE}, - * {@link #STATE_MINIMIZED} and {@link #STATE_HIDDEN} - */ - public void onStateChanged(View headerView, int state); - } - - /** - * HeaderTransformers are what controls and update the Header View to reflect the current state - * of the pull-to-refresh interaction. They are responsible for showing and hiding the header - * view, as well as update the state. - */ - public static abstract class HeaderTransformer { - - /** - * Called whether the header view has been inflated from the resources - * defined in {@link Options#headerLayout}. - * - * @param activity The {@link Activity} that the header view is attached to. - * @param headerView The inflated header view. - */ - public void onViewCreated(Activity activity, View headerView) {} - - /** - * @deprecated This will be removed before v1.0. Override - * {@link #onViewCreated(android.app.Activity, android.view.View)} instead. - */ - public void onViewCreated(View headerView) {} - - /** - * Called when the header should be reset. You should update any child - * views to reflect this. - *

- * You should not change the visibility of the header - * view. - */ - public void onReset() {} - - /** - * Called the user has pulled on the scrollable view. - * - * @param percentagePulled value between 0.0f and 1.0f depending on how far the - * user has pulled. - */ - public void onPulled(float percentagePulled) {} - - /** - * Called when a refresh has begun. Theoretically this call is similar - * to that provided from {@link OnRefreshListener} but is more suitable - * for header view updates. - */ - public void onRefreshStarted() {} - - /** - * Called when a refresh can be initiated when the user ends the touch - * event. This is only called when {@link Options#refreshOnUp} is set to - * true. - */ - public void onReleaseToRefresh() {} - - /** - * Called when the current refresh has taken longer than the time - * specified in {@link Options#refreshMinimizeDelay}. - */ - public void onRefreshMinimized() {} - - /** - * Called when the Header View should be made visible, usually with an animation. - * - * @return true if the visibility has changed. - */ - public abstract boolean showHeaderView(); - - /** - * Called when the Header View should be made invisible, usually with an animation. - * - * @return true if the visibility has changed. - */ - public abstract boolean hideHeaderView(); - - /** - * Called when the Activity's configuration has changed. - * - * @param activity The {@link Activity} that the header view is attached to. - * @param newConfig New configuration. - * - * @see android.app.Activity#onConfigurationChanged(android.content.res.Configuration) - */ - public void onConfigurationChanged(Activity activity, Configuration newConfig) {} - } - - /** - * ViewDelegates are what are used to de-couple the Attacher from the different types of - * scrollable views. - */ - public static abstract class ViewDelegate { - - /** - * Allows you to provide support for View which do not have built-in - * support. In this method you should cast view to it's - * native class, and check if it is scrolled to the top. - * - * @param view - * The view which has should be checked against. - * @param x The X co-ordinate of the touch event - * @param y The Y co-ordinate of the touch event - * @return true if view is scrolled to the top. - */ - public abstract boolean isReadyForPull(View view, float x, float y); - } - - /** - * This is used to provide platform and environment specific functionality for the Attacher. - */ - public static class EnvironmentDelegate { - - /** - * @return Context which should be used for inflating the header layout - */ - public Context getContextForInflater(Activity activity) { - if (Build.VERSION.SDK_INT >= 14) { - return activity.getActionBar().getThemedContext(); - } else { - return activity; - } - } - } - - /** - * Allows you to specify a number of configuration options when instantiating a - * {@link PullToRefreshAttacher}. Used with {@link #get(Activity, Options) get()}. - */ - public static class Options { - - /** - * EnvironmentDelegate instance which will be used. If null, we will - * create an instance of the default class. - */ - public EnvironmentDelegate environmentDelegate = null; - - /** - * The layout resource ID which should be inflated to be displayed above - * the Action Bar - */ - public int headerLayout = DEFAULT_HEADER_LAYOUT; - - /** - * The header transformer to be used to transfer the header view. If - * null, an instance of {@link DefaultHeaderTransformer} will be used. - */ - public HeaderTransformer headerTransformer = null; - - /** - * The percentage of the refreshable view that needs to be scrolled - * before a refresh is initiated. - */ - public float refreshScrollDistance = DEFAULT_REFRESH_SCROLL_DISTANCE; - - /** - * Whether a refresh should only be initiated when the user has finished - * the touch event. - */ - public boolean refreshOnUp = DEFAULT_REFRESH_ON_UP; - - /** - * The delay after a refresh is started in which the header should be - * 'minimized'. By default, most of the header is faded out, leaving - * only the progress bar signifying that a refresh is taking place. - */ - public int refreshMinimizeDelay = DEFAULT_REFRESH_MINIMIZED_DELAY; - - /** - * Enable or disable the header 'minimization', which by default means that the majority of - * the header is hidden, leaving only the progress bar still showing. - *

- * If set to true, the header will be minimized after the delay set in - * {@link #refreshMinimizeDelay}. If set to false then the whole header will be displayed - * until the refresh is finished. - */ - public boolean refreshMinimize = DEFAULT_REFRESH_MINIMIZE; - } - - /** - * This class allows us to insert a layer in between the system decor view - * and the actual decor. (e.g. Action Bar views). This is needed so we can - * receive a call to fitSystemWindows(Rect) so we can adjust the header view - * to fit the system windows too. - */ - final static class DecorChildLayout extends FrameLayout { - private final ViewGroup mHeaderViewWrapper; - - DecorChildLayout(Context context, ViewGroup systemDecorView, - View headerView) { - super(context); - - // Move all children from decor view to here - for (int i = 0, z = systemDecorView.getChildCount(); i < z; i++) { - View child = systemDecorView.getChildAt(i); - systemDecorView.removeView(child); - addView(child); - } - - /** - * Wrap the Header View in a FrameLayout and add it to this view. It - * is wrapped so any inset changes do not affect the actual header - * view. - */ - mHeaderViewWrapper = new FrameLayout(context); - mHeaderViewWrapper.addView(headerView); - addView(mHeaderViewWrapper, ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT); - } - - @Override - protected boolean fitSystemWindows(Rect insets) { - if (DEBUG) { - Log.d(LOG_TAG, "fitSystemWindows: " + insets.toString()); - } - - // Adjust the Header View's padding to take the insets into account - mHeaderViewWrapper.setPadding(insets.left, insets.top, - insets.right, insets.bottom); - - // Call return super so that the rest of the - return super.fitSystemWindows(insets); - } - } - - private static final class ViewParams { - final OnRefreshListener onRefreshListener; - final ViewDelegate viewDelegate; - - ViewParams(ViewDelegate _viewDelegate, - OnRefreshListener _onRefreshListener) { - onRefreshListener = _onRefreshListener; - viewDelegate = _viewDelegate; - } - } - - private final Runnable mRefreshMinimizeRunnable = new Runnable() { - @Override - public void run() { - mHeaderTransformer.onRefreshMinimized(); - - if (mHeaderViewListener != null) { - mHeaderViewListener.onStateChanged(mHeaderView, - HeaderViewListener.STATE_MINIMIZED); - } - } - }; - -} diff --git a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/PullToRefreshLayout.java b/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/PullToRefreshLayout.java deleted file mode 100644 index 296a44f0..00000000 --- a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/PullToRefreshLayout.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.co.senab.actionbarpulltorefresh.library; - -import android.content.Context; -import android.content.res.Configuration; -import android.util.AttributeSet; -import android.util.Log; -import android.view.MotionEvent; -import android.view.View; -import android.widget.FrameLayout; - -/** - * FIXME - */ -public class PullToRefreshLayout extends FrameLayout { - - private static final boolean DEBUG = false; - private static final String LOG_TAG = "PullToRefreshLayout"; - - private PullToRefreshAttacher mPullToRefreshAttacher; - private View mCurrentTouchTarget; - - public PullToRefreshLayout(Context context) { - this(context, null); - } - - public PullToRefreshLayout(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public PullToRefreshLayout(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - /** - * Set the {@link PullToRefreshAttacher} to be used with this layout. The view which is added - * to this layout will automatically be added as a refreshable-view in the attacher. - */ - public void setPullToRefreshAttacher(PullToRefreshAttacher attacher, - PullToRefreshAttacher.OnRefreshListener refreshListener) { - View view; - for (int i = 0, z = getChildCount(); i < z; i++) { - view = getChildAt(i); - - if (mPullToRefreshAttacher != null) { - mPullToRefreshAttacher.removeRefreshableView(view); - } - - if (attacher != null) { - if (DEBUG) Log.d(LOG_TAG, "Adding View to Attacher: " + view); - attacher.addRefreshableView(view, null, refreshListener, false); - } - } - - mPullToRefreshAttacher = attacher; - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent event) { - if (DEBUG) Log.d(LOG_TAG, "onInterceptTouchEvent. " + event.toString()); - - if (mPullToRefreshAttacher != null && getChildCount() > 0) { - View target = getChildForTouchEvent(event); - if (target != null && mPullToRefreshAttacher.onInterceptTouchEvent(target, event)) { - mCurrentTouchTarget = target; - return true; - } - } - // Reset Current Touch Target - mCurrentTouchTarget = null; - return false; - } - - @Override - public boolean onTouchEvent(MotionEvent event) { - if (DEBUG) Log.d(LOG_TAG, "onTouchEvent. " + event.toString()); - - if (mPullToRefreshAttacher != null) { - // This is an edge-case. If the ViewGroup does not contain a valid touch target then - // Android calls onTouchEvent after onInterceptTouchEvent with ACTION_DOWN event. - // If that happens then we need to find the visible view and pass it to the attacher as - // usual. - if (mCurrentTouchTarget == null && event.getAction() == MotionEvent.ACTION_DOWN) { - mCurrentTouchTarget = getChildForTouchEvent(event); - } - - if (mCurrentTouchTarget != null) { - return mPullToRefreshAttacher.onTouchEvent(mCurrentTouchTarget, event); - } - } - // Reset Current Touch Target - mCurrentTouchTarget = null; - return super.onTouchEvent(event); - } - - @Override - protected void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - - if (mPullToRefreshAttacher != null) { - mPullToRefreshAttacher.onConfigurationChanged(newConfig); - } - } - - private View getChildForTouchEvent(MotionEvent event) { - final float x = event.getX(), y = event.getY(); - View child; - for (int z = getChildCount() - 1; z >= 0 ; z--) { - child = getChildAt(z); - if (child.isShown() && x >= child.getLeft() && x <= child.getRight() - && y >= child.getTop() && y <= child.getBottom()) { - if (DEBUG) Log.d(LOG_TAG, "Got Child for Touch Event: " + child); - return child; - } - } - return null; - } -} diff --git a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/platform/SDK11.java b/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/platform/SDK11.java deleted file mode 100644 index da55ebb6..00000000 --- a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/platform/SDK11.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.co.senab.actionbarpulltorefresh.library.platform; - -import android.view.View; - -public class SDK11 { - - public static void setAlpha(View view, float alpha) { - view.setAlpha(alpha); - } - -} diff --git a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/AbsListViewDelegate.java b/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/AbsListViewDelegate.java deleted file mode 100644 index 8276e146..00000000 --- a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/AbsListViewDelegate.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.co.senab.actionbarpulltorefresh.library.viewdelegates; - -import android.annotation.TargetApi; -import android.os.Build; -import android.view.View; -import android.widget.AbsListView; - -import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshAttacher; - -/** - * FIXME - */ -public class AbsListViewDelegate - extends PullToRefreshAttacher.ViewDelegate { - - public static final Class SUPPORTED_VIEW_CLASS = AbsListView.class; - - @Override - public boolean isReadyForPull(View view, final float x, final float y) { - boolean ready = false; - - // First we check whether we're scrolled to the top - AbsListView absListView = (AbsListView) view; - if (absListView.getCount() == 0) { - ready = true; - } else if (absListView.getFirstVisiblePosition() == 0) { - final View firstVisibleChild = absListView.getChildAt(0); - ready = firstVisibleChild != null && firstVisibleChild.getTop() >= 0; - } - - // Then we have to check whether the fas scroller is enabled, and check we're not starting - // the gesture from the scroller - if (ready && absListView.isFastScrollEnabled() && isFastScrollAlwaysVisible(absListView)) { - switch (getVerticalScrollbarPosition(absListView)) { - case View.SCROLLBAR_POSITION_RIGHT: - ready = x < absListView.getRight() - absListView.getVerticalScrollbarWidth(); - break; - case View.SCROLLBAR_POSITION_LEFT: - ready = x > absListView.getVerticalScrollbarWidth(); - break; - } - } - - return ready; - } - - int getVerticalScrollbarPosition(AbsListView absListView) { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ? - CompatV11.getVerticalScrollbarPosition(absListView) : - Compat.getVerticalScrollbarPosition(absListView); - } - - boolean isFastScrollAlwaysVisible(AbsListView absListView) { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ? - CompatV11.isFastScrollAlwaysVisible(absListView) : - Compat.isFastScrollAlwaysVisible(absListView); - } - - static class Compat { - static int getVerticalScrollbarPosition(AbsListView absListView) { - return View.SCROLLBAR_POSITION_RIGHT; - } - static boolean isFastScrollAlwaysVisible(AbsListView absListView) { - return false; - } - } - - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - static class CompatV11 { - static int getVerticalScrollbarPosition(AbsListView absListView) { - return absListView.getVerticalScrollbarPosition(); - } - static boolean isFastScrollAlwaysVisible(AbsListView absListView) { - return absListView.isFastScrollAlwaysVisible(); - } - } -} diff --git a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/ScrollYDelegate.java b/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/ScrollYDelegate.java deleted file mode 100644 index a38885d0..00000000 --- a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/ScrollYDelegate.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.co.senab.actionbarpulltorefresh.library.viewdelegates; - -import android.view.View; - -import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshAttacher; - -/** - * FIXME - */ -public class ScrollYDelegate extends PullToRefreshAttacher.ViewDelegate { - - @Override - public boolean isReadyForPull(View view, float x, float y) { - return view.getScrollY() <= 0; - } -} diff --git a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/WebViewDelegate.java b/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/WebViewDelegate.java deleted file mode 100644 index 80c6a83d..00000000 --- a/external/ActionBar-PullToRefresh/src/uk/co/senab/actionbarpulltorefresh/library/viewdelegates/WebViewDelegate.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.co.senab.actionbarpulltorefresh.library.viewdelegates; - -import android.view.View; -import android.webkit.WebView; - -import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshAttacher; - -/** - * FIXME - */ -public class WebViewDelegate extends PullToRefreshAttacher.ViewDelegate { - - public static final Class SUPPORTED_VIEW_CLASS = WebView.class; - - @Override - public boolean isReadyForPull(View view, float x, float y) { - return view.getScrollY() <= 0; - } -} diff --git a/external/ColorPickerPreference/.classpath b/external/ColorPickerPreference/.classpath deleted file mode 100644 index 7bc01d9a..00000000 --- a/external/ColorPickerPreference/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/external/ColorPickerPreference/.gitattributes b/external/ColorPickerPreference/.gitattributes deleted file mode 100644 index dfe07704..00000000 --- a/external/ColorPickerPreference/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/external/ColorPickerPreference/.gitignore b/external/ColorPickerPreference/.gitignore deleted file mode 100644 index 4b1a60ae..00000000 --- a/external/ColorPickerPreference/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/bin -/gen -.classpath -.project \ No newline at end of file diff --git a/external/ColorPickerPreference/.project b/external/ColorPickerPreference/.project deleted file mode 100644 index b3e7744d..00000000 --- a/external/ColorPickerPreference/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - ColorPickerPreference - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/external/ColorPickerPreference/AndroidManifest.xml b/external/ColorPickerPreference/AndroidManifest.xml deleted file mode 100644 index e09215a9..00000000 --- a/external/ColorPickerPreference/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/external/ColorPickerPreference/CHANGELOG.rst b/external/ColorPickerPreference/CHANGELOG.rst deleted file mode 100644 index 5342d2ac..00000000 --- a/external/ColorPickerPreference/CHANGELOG.rst +++ /dev/null @@ -1,26 +0,0 @@ -================================ -ColorPickerPreference Change Log -================================ - -2011-02-11 v1.11: ----------------- -fix: color controls not visible in landscape orientation -fix: colorPickerDialog constructor was protected - -2011-01-25 v1.1: ----------------- -* new: Alpha Slider is disabled by default -* new: Alpha Slider can be enabled: - * with preference XML using attribute alphaSlider="true" - * with function setAlphaSliderEnabled(true) -* new: defaultValue in preference XML now accepts HEX color code: - * #FF00FF, rgb - * #FF00FF00, argb - -2011-01-20 v1.01: ------------------ -fix: sometimes preview color disappear - -2011-01-19 v1.0: ----------------- -release \ No newline at end of file diff --git a/external/ColorPickerPreference/LICENSE b/external/ColorPickerPreference/LICENSE deleted file mode 100644 index da9cd5cb..00000000 --- a/external/ColorPickerPreference/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) 2011 Sergey Margaritov & Daniel Nilsson - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ \ No newline at end of file diff --git a/external/ColorPickerPreference/README.rst b/external/ColorPickerPreference/README.rst deleted file mode 100644 index bffa417a..00000000 --- a/external/ColorPickerPreference/README.rst +++ /dev/null @@ -1,47 +0,0 @@ -===================== -ColorPickerPreference -===================== - -Generally used classes by Daniel Nilsson. -ColorPickerPreference class by Sergey Margaritov. -Packed by Sergey Margaritov. - -Features -======== - -* Color Area -* Hue Slider -* Alpha Slider (disabled by default) -* Old & New Color -* Color Preview in Preferences List - -Requirements -============ - -Tested with APIv7, but maybe will work with early versions - -Usage -===== - -You can see some tests inside - -:: - - - alphaSlider="true" - /> - -To enable Alpha Slider in your code use function: -:: - setAlphaSliderEnabled(boolean enable) - -Screens -======= - -* .. image:: https://github.com/attenzione/android-ColorPickerPreference/raw/master/screen_1.png - -* .. image:: https://github.com/attenzione/android-ColorPickerPreference/raw/master/screen_2.png \ No newline at end of file diff --git a/external/ColorPickerPreference/ant.properties b/external/ColorPickerPreference/ant.properties deleted file mode 100644 index b0971e89..00000000 --- a/external/ColorPickerPreference/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/external/ColorPickerPreference/build.xml b/external/ColorPickerPreference/build.xml deleted file mode 100644 index c575c550..00000000 --- a/external/ColorPickerPreference/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/external/ColorPickerPreference/proguard-project.txt b/external/ColorPickerPreference/proguard-project.txt deleted file mode 100644 index f2fe1559..00000000 --- a/external/ColorPickerPreference/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/external/ColorPickerPreference/proguard.cfg b/external/ColorPickerPreference/proguard.cfg deleted file mode 100644 index 8ad7d335..00000000 --- a/external/ColorPickerPreference/proguard.cfg +++ /dev/null @@ -1,34 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembernames class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembernames class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} diff --git a/external/ColorPickerPreference/project.properties b/external/ColorPickerPreference/project.properties deleted file mode 100644 index 6905bdf0..00000000 --- a/external/ColorPickerPreference/project.properties +++ /dev/null @@ -1,12 +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 use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -android.library=true -# Project target. -target=android-18 diff --git a/external/ColorPickerPreference/res/drawable-hdpi/icon.png b/external/ColorPickerPreference/res/drawable-hdpi/icon.png deleted file mode 100644 index 8074c4c5..00000000 Binary files a/external/ColorPickerPreference/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/external/ColorPickerPreference/res/drawable-ldpi/icon.png b/external/ColorPickerPreference/res/drawable-ldpi/icon.png deleted file mode 100644 index 1095584e..00000000 Binary files a/external/ColorPickerPreference/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/external/ColorPickerPreference/res/drawable-mdpi/icon.png b/external/ColorPickerPreference/res/drawable-mdpi/icon.png deleted file mode 100644 index a07c69fa..00000000 Binary files a/external/ColorPickerPreference/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/external/ColorPickerPreference/res/xml/settings.xml b/external/ColorPickerPreference/res/xml/settings.xml deleted file mode 100644 index 0cd87af9..00000000 --- a/external/ColorPickerPreference/res/xml/settings.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/external/ColorPickerPreference/screen_1.png b/external/ColorPickerPreference/screen_1.png deleted file mode 100644 index 4798dae7..00000000 Binary files a/external/ColorPickerPreference/screen_1.png and /dev/null differ diff --git a/external/ColorPickerPreference/screen_2.png b/external/ColorPickerPreference/screen_2.png deleted file mode 100644 index 3bb2d671..00000000 Binary files a/external/ColorPickerPreference/screen_2.png and /dev/null differ diff --git a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/Test.java b/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/Test.java deleted file mode 100644 index e5e167d9..00000000 --- a/external/ColorPickerPreference/src/net/margaritov/preference/colorpicker/Test.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2011 Sergey Margaritov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.margaritov.preference.colorpicker; - -import net.margaritov.preference.colorpicker.R; - -import android.os.Bundle; -import android.preference.Preference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.PreferenceActivity; - -public class Test extends PreferenceActivity { - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.settings); - ((ColorPickerPreference)findPreference("color2")).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - preference.setSummary(ColorPickerPreference.convertToARGB(Integer.valueOf(String.valueOf(newValue)))); - return true; - } - - }); - ((ColorPickerPreference)findPreference("color2")).setAlphaSliderEnabled(true); - } -} \ No newline at end of file diff --git a/external/Crouton/.gitignore b/external/Crouton/.gitignore deleted file mode 100644 index 90705626..00000000 --- a/external/Crouton/.gitignore +++ /dev/null @@ -1,41 +0,0 @@ -# built application files -*.apk -*.ap_ -*.jar -gen-external-apklibs - -# keystore -*.keystore - -# files for the dex VM -*.dex - -# Java class files -*.class - -# generated files -bin/ -gen/ -target/ - -# Local configuration file (sdk path, etc) -local.properties - -# Eclipse project files -.classpath -.project -.metadata -.settings - -# IntelliJ files -.idea -*.iml - -# OSX files -.DS_Store - -#vi swap files -*.swp - -# maven target -target diff --git a/external/Crouton/LICENSE b/external/Crouton/LICENSE deleted file mode 100644 index d6456956..00000000 --- a/external/Crouton/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/external/Crouton/README.markdown b/external/Crouton/README.markdown deleted file mode 100644 index 8d4a3d77..00000000 --- a/external/Crouton/README.markdown +++ /dev/null @@ -1,199 +0,0 @@ -# Crouton -![Crouton](https://raw.github.com/keyboardsurfer/Crouton/master/sample/res/drawable-xhdpi/ic_launcher.png "Crouton logo") - -Context sensitive notifications for Android - -## Overview - -**Crouton** is a class that can be used by Android developers that feel the need for an **alternative to the Context insensitive [Toast](http://developer.android.com/reference/android/widget/Toast.html)**. - -A Crouton will be displayed at the position the developer decides. -Standard will be the of an application window. -You can line up multiple Croutons for display, that will be shown one after another. - -You can check some features in the Crouton Demo. - - - Crouton Demo on Google Play - - -If you're already using Crouton and just want to download the latest version of the library, follow [this link](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22de.keyboardsurfer.android.widget%22). - -### Changelog -#### Current version: 1.7 - -####[1.7](https://github.com/keyboardsurfer/Crouton/tree/1.7) - -- `Crouton.setOnClickListener(OnClickListener)` has been introduced. -- Infinite display of Crouton is possible via `Style.setDuration(Style.DURATION_INFINITE)` -- Via `Crouton.hide(Crouton)` a Crouton can be hidden. - -####[1.6](https://github.com/keyboardsurfer/Crouton/tree/1.6) - -- Crouton now can be used on any Android device with **API level 4+**. -- Changes the package name to `de.keyboardsurfer.android.widget` -- Adds possibility to set a custom width -- Can now be added to any ViewGroup (@coreform) -- Integration with TalkBack (@coreform) -- Adds Accessibility features (@coreform) -- Fixes bug that got Crouton out of sync with reality (@coreform) -- New [LifecycleCallback](https://github.com/keyboardsurfer/Crouton/blob/master/library/src/de/keyboardsurfer/android/widget/crouton/LifecycleCallback.java) (@coreform) -- initializeCroutonView was refactored, to make it easier on the eyes -- removes redundant initialization within Style.Builder -- documentation improvments - -#### older versions - -Please see the `git log` - -## Usage - -The API is kept as simple as the Toast API: - -Create a Crouton for any CharSequence: - - Crouton.makeText(Activity, CharSequence, [Style]).show(); - -Create a Crouton with a String from your application's resources: - - Crouton.makeText(Activity, int, Style).show(); - -Further you can attach a Crouton to any view like this: - - Crouton.makeText(Activity, int, Style, int).show(); - -If you would like a more graphical introduction to Crouton check out [this presentation](https://speakerdeck.com/keyboardsurfer/crouton-devfest-berlin-2012). - -##Important! - -In your Activity.onDestroy() make sure to call - - Crouton.cancelAllCroutons(); - -to cancel cancel all scheduled Croutons. - -This is a workaround and further description is available in #24. - -## Basic Examples -Currently you can use the three different Style attributes displayed below out of the box: - -![Alert](https://github.com/keyboardsurfer/Crouton/raw/master/res/Alert.png "Example of Style.ALERT") - -![Confirm](https://github.com/keyboardsurfer/Crouton/raw/master/res/Confirm.png "Example of Style.CONFIRM") - -![Info](https://github.com/keyboardsurfer/Crouton/raw/master/res/Info.png "Example of Style.INFO") - -## Extension and Modification - -The whole design of a Crouton is defined by [Style](https://github.com/keyboardsurfer/Crouton/blob/master/library/src/de/keyboardsurfer/android/widget/crouton/Style.java). - -You can use one of the styles Crouton ships with: **Style.ALERT**, **Style.CONFIRM** and **Style.INFO**. Or you can create your own Style. - -In general you can modify - -- display duration -- dimension settings -- options for the text to display -- custom Views -- appearance & disappearance Animation -- displayed Image - -Since [Style](https://github.com/keyboardsurfer/Crouton/blob/master/library/src/de/keyboardsurfer/android/widget/crouton/Style.java) is the general entry point for tweaking Croutons, go and see for yourself what can be done with it. - - -## Maven - -### From maven central - -Crouton is available in the maven central repository. - -To use crouton simply add - -```xml - - crouton - 1.7 - de.keyboardsurfer.android.widget - -``` - -to your pom.xml - -If you also want the sources or javadoc add the respective classifier - -```xml - sources -``` - -or - -```xml - javadoc -``` -to the dependency. - -If you are referencing a newer version of the Android Support Library in your application, you might want to exclude Crouton's dependency like this: - -```xml - - crouton - ${crouton.version} - de.keyboardsurfer.android.widget - - - com.google.android - support-v4 - - - -``` - -### DIY - -The build requires Maven. Operations are very simple: - -* `mvn -f library/pom.xml clean package` will build a `jar` library; -* `mvn clean package` will build a `jar` library and the sample application `apk`; -* `mvn -f library/pom.xml clean install` will put Crouton in your local Maven repository. - -After putting Crouton in the repository you can add it as a dependency. - -```xml - - crouton - 1.6 - de.keyboardsurfer.android.widget - -``` - -## Contribution - -### Pull requests welcome - -Feel free to contribute to Crouton. - -Either you found a bug or have created a new and awesome feature, just create a pull request. - -If you want to start to create a new feature or have any other questions regarding Crouton, [file an issue](https://github.com/keyboardsurfer/Crouton/issues/new). -I'll try to answer as soon as I find the time. - -### Formatting - -For contributors using Eclipse there's a formatter available at the [download section](https://github.com/downloads/keyboardsurfer/Crouton/Crouton_Eclipseformatter.xml). - -In order to reduce merging pains on my end, please use this formatter or format your commit in a way similar to it's example. - -If you're using IDEA, the Eclipse Formatter plugin should allow you to use the formatter as well. - -## License - -* [Apache Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) - -## Attributions - -The initial version was written by Benjamin Weiss at [Neofonie Mobile GmbH](http://mobile.neofonie.de). - -The name and the idea of [Crouton](https://github.com/keyboardsurfer/Crouton/blob/master/library/src/de/keyboardsurfer/android/widget/crouton/Crouton.java) originates in a [blog article](http://android.cyrilmottier.com/?p=773) by Cyril Mottier. - -The Crouton logo has been created by [Marie Schweiz](http://marie-schweiz.de). diff --git a/external/Crouton/build.gradle b/external/Crouton/build.gradle deleted file mode 100644 index e69de29b..00000000 diff --git a/external/Crouton/library/.classpath b/external/Crouton/library/.classpath deleted file mode 100644 index 7bc01d9a..00000000 --- a/external/Crouton/library/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/external/Crouton/library/.project b/external/Crouton/library/.project deleted file mode 100644 index a5d8dde2..00000000 --- a/external/Crouton/library/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Crouton - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/external/Crouton/library/AndroidManifest.xml b/external/Crouton/library/AndroidManifest.xml deleted file mode 100644 index 14d01dea..00000000 --- a/external/Crouton/library/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/external/Crouton/library/ant.properties b/external/Crouton/library/ant.properties deleted file mode 100644 index b0971e89..00000000 --- a/external/Crouton/library/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/external/Crouton/library/build.xml b/external/Crouton/library/build.xml deleted file mode 100644 index 5ecd4a3a..00000000 --- a/external/Crouton/library/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/external/Crouton/library/project.properties b/external/Crouton/library/project.properties deleted file mode 100644 index d9aef210..00000000 --- a/external/Crouton/library/project.properties +++ /dev/null @@ -1,16 +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 -android.library=true diff --git a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Configuration.java b/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Configuration.java deleted file mode 100644 index 4464988a..00000000 --- a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Configuration.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright 2012 - 2014 Benjamin Weiss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package de.keyboardsurfer.android.widget.crouton; - -/** - * Allows configuring a {@link Crouton}s behaviour aside from the actual view, - * which is defined via {@link Style}. - *

- * This allows to re-use a {@link Style} while modifying parameters that only have to be applied - * when the {@link Crouton} is being displayed. - * - * @author chris - * @since 1.8 - */ -public class Configuration { - - - /** - * Display a {@link Crouton} for an infinite amount of time or - * until {@link de.keyboardsurfer.android.widget.crouton.Crouton#cancel()} has been called. - */ - public static final int DURATION_INFINITE = -1; - /** The default short display duration of a {@link Crouton}. */ - public static final int DURATION_SHORT = 3000; - /** The default long display duration of a {@link Crouton}. */ - public static final int DURATION_LONG = 5000; - - /** The default {@link Configuration} of a {@link Crouton}. */ - public static final Configuration DEFAULT; - - static { - DEFAULT = new Builder().setDuration(DURATION_SHORT).build(); - } - - /** The durationInMilliseconds the {@link Crouton} will be displayed in milliseconds. */ - final int durationInMilliseconds; - /** The resource id for the in animation. */ - final int inAnimationResId; - /** The resource id for the out animation. */ - final int outAnimationResId; - - private Configuration(Builder builder) { - this.durationInMilliseconds = builder.durationInMilliseconds; - this.inAnimationResId = builder.inAnimationResId; - this.outAnimationResId = builder.outAnimationResId; - } - - /** Creates a {@link Builder} to build a {@link Configuration} upon. */ - public static class Builder { - private int durationInMilliseconds = DURATION_SHORT; - private int inAnimationResId = 0; - private int outAnimationResId = 0; - - /** - * Set the durationInMilliseconds option of the {@link Crouton}. - * - * @param duration - * The durationInMilliseconds the crouton will be displayed - * {@link Crouton} in milliseconds. - * - * @return the {@link Builder}. - */ - public Builder setDuration(final int duration) { - this.durationInMilliseconds = duration; - - return this; - } - - /** - * The resource id for the in animation. - * - * @param inAnimationResId - * The resource identifier for the animation that's being shown - * when the {@link Crouton} is going to be displayed. - * - * @return the {@link Builder}. - */ - public Builder setInAnimation(final int inAnimationResId) { - this.inAnimationResId = inAnimationResId; - - return this; - } - - /** - * The resource id for the out animation - * - * @param outAnimationResId - * The resource identifier for the animation that's being shown - * when the {@link Crouton} is going to be removed. - * - * @return the {@link Builder}. - */ - public Builder setOutAnimation(final int outAnimationResId) { - this.outAnimationResId = outAnimationResId; - - return this; - } - - /** - * Builds the {@link Configuration}. - * - * @return The built {@link Configuration}. - */ - public Configuration build() { - return new Configuration(this); - } - } - - @Override - public String toString() { - return "Configuration{" + - "durationInMilliseconds=" + durationInMilliseconds + - ", inAnimationResId=" + inAnimationResId + - ", outAnimationResId=" + outAnimationResId + - '}'; - } -} \ No newline at end of file diff --git a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Crouton.java b/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Crouton.java deleted file mode 100644 index 7986014a..00000000 --- a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Crouton.java +++ /dev/null @@ -1,964 +0,0 @@ -/* - * Copyright 2012 - 2014 Benjamin Weiss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package de.keyboardsurfer.android.widget.crouton; - -import android.app.Activity; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Shader; -import android.graphics.Typeface; -import android.graphics.drawable.BitmapDrawable; -import android.util.TypedValue; -import android.view.Gravity; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.animation.Animation; -import android.view.animation.AnimationUtils; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.RelativeLayout; -import android.widget.TextView; - -/* - * Based on an article by Cyril Mottier (http://android.cyrilmottier.com/?p=773)
- */ - - -/** - * Displays information in a non-invasive context related manner. Like - * {@link android.widget.Toast}, but better. - *

- * Important: - * Call {@link Crouton#clearCroutonsForActivity(Activity)} within - * {@link android.app.Activity#onDestroy()} to avoid {@link Context} leaks. - */ -public final class Crouton { - private static final String NULL_PARAMETERS_ARE_NOT_ACCEPTED = "Null parameters are not accepted"; - private static final int IMAGE_ID = 0x100; - private static final int TEXT_ID = 0x101; - private final CharSequence text; - private final Style style; - private Configuration configuration = null; - private final View customView; - - private OnClickListener onClickListener; - - private Activity activity; - private ViewGroup viewGroup; - private FrameLayout croutonView; - private Animation inAnimation; - private Animation outAnimation; - private LifecycleCallback lifecycleCallback = null; - - /** - * Creates the {@link Crouton}. - * - * @param activity - * The {@link Activity} that the {@link Crouton} should be attached - * to. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - */ - private Crouton(Activity activity, CharSequence text, Style style) { - if ((activity == null) || (text == null) || (style == null)) { - throw new IllegalArgumentException(NULL_PARAMETERS_ARE_NOT_ACCEPTED); - } - - this.activity = activity; - this.viewGroup = null; - this.text = text; - this.style = style; - this.customView = null; - } - - /** - * Creates the {@link Crouton}. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - */ - private Crouton(Activity activity, CharSequence text, Style style, ViewGroup viewGroup) { - if ((activity == null) || (text == null) || (style == null)) { - throw new IllegalArgumentException(NULL_PARAMETERS_ARE_NOT_ACCEPTED); - } - - this.activity = activity; - this.text = text; - this.style = style; - this.viewGroup = viewGroup; - this.customView = null; - } - - /** - * Creates the {@link Crouton}. - * - * @param activity - * The {@link Activity} that the {@link Crouton} should be attached - * to. - * @param customView - * The custom {@link View} to display - */ - private Crouton(Activity activity, View customView) { - if ((activity == null) || (customView == null)) { - throw new IllegalArgumentException(NULL_PARAMETERS_ARE_NOT_ACCEPTED); - } - - this.activity = activity; - this.viewGroup = null; - this.customView = customView; - this.style = new Style.Builder().build(); - this.text = null; - } - - /** - * Creates the {@link Crouton}. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param customView - * The custom {@link View} to display - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - */ - private Crouton(Activity activity, View customView, ViewGroup viewGroup) { - this(activity, customView, viewGroup, Configuration.DEFAULT); - } - - /** - * Creates the {@link Crouton}. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param customView - * The custom {@link View} to display - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - * @param configuration - * The {@link Configuration} for this {@link Crouton}. - */ - private Crouton(final Activity activity, final View customView, final ViewGroup viewGroup, - final Configuration configuration) { - if ((activity == null) || (customView == null)) { - throw new IllegalArgumentException(NULL_PARAMETERS_ARE_NOT_ACCEPTED); - } - - this.activity = activity; - this.customView = customView; - this.viewGroup = viewGroup; - this.style = new Style.Builder().build(); - this.text = null; - this.configuration = configuration; - } - - /** - * Creates a {@link Crouton} with provided text and style for a given - * activity. - * - * @param activity - * The {@link Activity} that the {@link Crouton} should be attached - * to. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * - * @return The created {@link Crouton}. - */ - public static Crouton makeText(Activity activity, CharSequence text, Style style) { - return new Crouton(activity, text, style); - } - - /** - * Creates a {@link Crouton} with provided text and style for a given - * activity. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - * - * @return The created {@link Crouton}. - */ - public static Crouton makeText(Activity activity, CharSequence text, Style style, ViewGroup viewGroup) { - return new Crouton(activity, text, style, viewGroup); - } - - /** - * Creates a {@link Crouton} with provided text and style for a given - * activity. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroupResId - * The resource id of the {@link ViewGroup} that this {@link Crouton} should be added to. - * - * @return The created {@link Crouton}. - */ - public static Crouton makeText(Activity activity, CharSequence text, Style style, int viewGroupResId) { - return new Crouton(activity, text, style, (ViewGroup) activity.findViewById(viewGroupResId)); - } - - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity. - * - * @param activity - * The {@link Activity} that the {@link Crouton} should be attached - * to. - * @param textResourceId - * The resource id of the text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * - * @return The created {@link Crouton}. - */ - public static Crouton makeText(Activity activity, int textResourceId, Style style) { - return makeText(activity, activity.getString(textResourceId), style); - } - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param textResourceId - * The resource id of the text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - * - * @return The created {@link Crouton}. - */ - public static Crouton makeText(Activity activity, int textResourceId, Style style, ViewGroup viewGroup) { - return makeText(activity, activity.getString(textResourceId), style, viewGroup); - } - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param textResourceId - * The resource id of the text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroupResId - * The resource id of the {@link ViewGroup} that this {@link Crouton} should be added to. - * - * @return The created {@link Crouton}. - */ - public static Crouton makeText(Activity activity, int textResourceId, Style style, int viewGroupResId) { - return makeText(activity, activity.getString(textResourceId), style, - (ViewGroup) activity.findViewById(viewGroupResId)); - } - - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity. - * - * @param activity - * The {@link Activity} that the {@link Crouton} should be attached - * to. - * @param customView - * The custom {@link View} to display - * - * @return The created {@link Crouton}. - */ - public static Crouton make(Activity activity, View customView) { - return new Crouton(activity, customView); - } - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param customView - * The custom {@link View} to display - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - * - * @return The created {@link Crouton}. - */ - public static Crouton make(Activity activity, View customView, ViewGroup viewGroup) { - return new Crouton(activity, customView, viewGroup); - } - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param customView - * The custom {@link View} to display - * @param viewGroupResId - * The resource id of the {@link ViewGroup} that this {@link Crouton} should be added to. - * - * @return The created {@link Crouton}. - */ - public static Crouton make(Activity activity, View customView, int viewGroupResId) { - return new Crouton(activity, customView, (ViewGroup) activity.findViewById(viewGroupResId)); - } - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param customView - * The custom {@link View} to display - * @param viewGroupResId - * The resource id of the {@link ViewGroup} that this {@link Crouton} should be added to. - * @param configuration - * The configuration for this crouton. - * - * @return The created {@link Crouton}. - */ - public static Crouton make(Activity activity, View customView, int viewGroupResId, - final Configuration configuration) { - return new Crouton(activity, customView, (ViewGroup) activity.findViewById(viewGroupResId), configuration); - } - - /** - * Creates a {@link Crouton} with provided text and style for a given activity - * and displays it directly. - * - * @param activity - * The {@link android.app.Activity} that the {@link Crouton} should - * be attached to. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - */ - public static void showText(Activity activity, CharSequence text, Style style) { - makeText(activity, text, style).show(); - } - - /** - * Creates a {@link Crouton} with provided text and style for a given activity - * and displays it directly. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - */ - public static void showText(Activity activity, CharSequence text, Style style, ViewGroup viewGroup) { - makeText(activity, text, style, viewGroup).show(); - } - - /** - * Creates a {@link Crouton} with provided text and style for a given activity - * and displays it directly. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroupResId - * The resource id of the {@link ViewGroup} that this {@link Crouton} should be added to. - */ - public static void showText(Activity activity, CharSequence text, Style style, int viewGroupResId) { - makeText(activity, text, style, (ViewGroup) activity.findViewById(viewGroupResId)).show(); - } - - /** - * Creates a {@link Crouton} with provided text and style for a given activity - * and displays it directly. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param text - * The text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroupResId - * The resource id of the {@link ViewGroup} that this {@link Crouton} should be added to. - * @param configuration - * The configuration for this Crouton. - */ - public static void showText(Activity activity, CharSequence text, Style style, int viewGroupResId, - final Configuration configuration) { - makeText(activity, text, style, (ViewGroup) activity.findViewById(viewGroupResId)).setConfiguration(configuration) - .show(); - } - - - /** - * Creates a {@link Crouton} with provided text and style for a given activity - * and displays it directly. - * - * @param activity - * The {@link android.app.Activity} that the {@link Crouton} should - * be attached to. - * @param customView - * The custom {@link View} to display - */ - public static void show(Activity activity, View customView) { - make(activity, customView).show(); - } - - /** - * Creates a {@link Crouton} with provided text and style for a given activity - * and displays it directly. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param customView - * The custom {@link View} to display - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - */ - public static void show(Activity activity, View customView, ViewGroup viewGroup) { - make(activity, customView, viewGroup).show(); - } - - /** - * Creates a {@link Crouton} with provided text and style for a given activity - * and displays it directly. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param customView - * The custom {@link View} to display - * @param viewGroupResId - * The resource id of the {@link ViewGroup} that this {@link Crouton} should be added to. - */ - public static void show(Activity activity, View customView, int viewGroupResId) { - make(activity, customView, viewGroupResId).show(); - } - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity and displays it directly. - * - * @param activity - * The {@link Activity} that the {@link Crouton} should be attached - * to. - * @param textResourceId - * The resource id of the text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - */ - public static void showText(Activity activity, int textResourceId, Style style) { - showText(activity, activity.getString(textResourceId), style); - } - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity and displays it directly. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param textResourceId - * The resource id of the text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroup - * The {@link ViewGroup} that this {@link Crouton} should be added to. - */ - public static void showText(Activity activity, int textResourceId, Style style, ViewGroup viewGroup) { - showText(activity, activity.getString(textResourceId), style, viewGroup); - } - - /** - * Creates a {@link Crouton} with provided text-resource and style for a given - * activity and displays it directly. - * - * @param activity - * The {@link Activity} that represents the context in which the Crouton should exist. - * @param textResourceId - * The resource id of the text you want to display. - * @param style - * The style that this {@link Crouton} should be created with. - * @param viewGroupResId - * The resource id of the {@link ViewGroup} that this {@link Crouton} should be added to. - */ - public static void showText(Activity activity, int textResourceId, Style style, int viewGroupResId) { - showText(activity, activity.getString(textResourceId), style, viewGroupResId); - } - - /** - * Allows hiding of a previously displayed {@link Crouton}. - * - * @param crouton - * The {@link Crouton} you want to hide. - */ - public static void hide(Crouton crouton) { - crouton.hide(); - } - - /** - * Cancels all queued {@link Crouton}s. If there is a {@link Crouton} - * displayed currently, it will be the last one displayed. - */ - public static void cancelAllCroutons() { - Manager.getInstance().clearCroutonQueue(); - } - - /** - * Clears (and removes from {@link Activity}'s content view, if necessary) all - * croutons for the provided activity - * - * @param activity - * - The {@link Activity} to clear the croutons for. - */ - public static void clearCroutonsForActivity(Activity activity) { - Manager.getInstance().clearCroutonsForActivity(activity); - } - - /** - * Cancels a {@link Crouton} immediately. - */ - public void cancel() { - Manager manager = Manager.getInstance(); - manager.removeCroutonImmediately(this); - } - - /** - * Displays the {@link Crouton}. If there's another {@link Crouton} visible at - * the time, this {@link Crouton} will be displayed afterwards. - */ - public void show() { - Manager.getInstance().add(this); - } - - public Animation getInAnimation() { - if ((null == this.inAnimation) && (null != this.activity)) { - if (getConfiguration().inAnimationResId > 0) { - this.inAnimation = AnimationUtils.loadAnimation(getActivity(), getConfiguration().inAnimationResId); - } else { - measureCroutonView(); - this.inAnimation = DefaultAnimationsBuilder.buildDefaultSlideInDownAnimation(getView()); - } - } - - return inAnimation; - } - - public Animation getOutAnimation() { - if ((null == this.outAnimation) && (null != this.activity)) { - if (getConfiguration().outAnimationResId > 0) { - this.outAnimation = AnimationUtils.loadAnimation(getActivity(), getConfiguration().outAnimationResId); - } else { - this.outAnimation = DefaultAnimationsBuilder.buildDefaultSlideOutUpAnimation(getView()); - } - } - - return outAnimation; - } - - /** - * @param lifecycleCallback - * Callback object for notable events in the life of a Crouton. - */ - public void setLifecycleCallback(LifecycleCallback lifecycleCallback) { - this.lifecycleCallback = lifecycleCallback; - } - - /** - * Removes this {@link Crouton}. - * - * @since 1.9 - */ - public void hide() { - Manager.getInstance().removeCrouton(this); - } - - /** - * Allows setting of an {@link OnClickListener} directly to a {@link Crouton} without having to use a custom view. - * - * @param onClickListener - * The {@link OnClickListener} to set. - * - * @return this {@link Crouton}. - */ - public Crouton setOnClickListener(OnClickListener onClickListener) { - this.onClickListener = onClickListener; - return this; - } - - /** - * Set the {@link Configuration} on this {@link Crouton}, prior to showing it. - * - * @param configuration - * a {@link Configuration} built using the {@link Configuration.Builder}. - * - * @return this {@link Crouton}. - */ - public Crouton setConfiguration(final Configuration configuration) { - this.configuration = configuration; - return this; - } - - @Override - public String toString() { - return "Crouton{" + - "text=" + text + - ", style=" + style + - ", configuration=" + configuration + - ", customView=" + customView + - ", onClickListener=" + onClickListener + - ", activity=" + activity + - ", viewGroup=" + viewGroup + - ", croutonView=" + croutonView + - ", inAnimation=" + inAnimation + - ", outAnimation=" + outAnimation + - ", lifecycleCallback=" + lifecycleCallback + - '}'; - } - - /** - * Convenience method to get the license text for embedding within your application. - * - * @return The license text. - */ - public static String getLicenseText() { - return "This application uses the Crouton library.\n\n" + - "Copyright 2012 - 2013 Benjamin Weiss \n" + - "\n" + - "Licensed under the Apache License, Version 2.0 (the \"License\");\n" + - "you may not use this file except in compliance with the License.\n" + - "You may obtain a copy of the License at\n" + - "\n" + - " http://www.apache.org/licenses/LICENSE-2.0\n" + - "\n" + - "Unless required by applicable law or agreed to in writing, software\n" + - "distributed under the License is distributed on an \"AS IS\" BASIS,\n" + - "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" + - "See the License for the specific language governing permissions and\n" + - "limitations under the License."; - } - - ////////////////////////////////////////////////////////////////////////////////////// - // You have reached the internal API of Crouton. - // If you do not plan to develop for Crouton there is nothing of interest below here. - ////////////////////////////////////////////////////////////////////////////////////// - - /** - * @return true if the {@link Crouton} is being displayed, else - * false. - */ - boolean isShowing() { - return (null != activity) && (isCroutonViewNotNull() || isCustomViewNotNull()); - } - - private boolean isCroutonViewNotNull() { - return (null != croutonView) && (null != croutonView.getParent()); - } - - private boolean isCustomViewNotNull() { - return (null != customView) && (null != customView.getParent()); - } - - /** - * Removes the activity reference this {@link Crouton} is holding - */ - void detachActivity() { - activity = null; - } - - /** - * Removes the viewGroup reference this {@link Crouton} is holding - */ - void detachViewGroup() { - viewGroup = null; - } - - /** - * Removes the lifecycleCallback reference this {@link Crouton} is holding - */ - void detachLifecycleCallback() { - lifecycleCallback = null; - } - - /** - * @return the lifecycleCallback - */ - LifecycleCallback getLifecycleCallback() { - return lifecycleCallback; - } - - /** - * @return the style - */ - Style getStyle() { - return style; - } - - /** - * @return this croutons configuration - */ - Configuration getConfiguration() { - if (null == configuration) { - configuration = getStyle().configuration; - } - return configuration; - } - - /** - * @return the activity - */ - Activity getActivity() { - return activity; - } - - /** - * @return the viewGroup - */ - ViewGroup getViewGroup() { - return viewGroup; - } - - /** - * @return the text - */ - CharSequence getText() { - return text; - } - - /** - * @return the view - */ - View getView() { - // return the custom view if one exists - if (null != this.customView) { - return this.customView; - } - - // if already setup return the view - if (null == this.croutonView) { - initializeCroutonView(); - } - - return croutonView; - } - - private void measureCroutonView() { - View view = getView(); - int widthSpec; - if (viewGroup != null) { - widthSpec = View.MeasureSpec.makeMeasureSpec(viewGroup.getMeasuredWidth(), View.MeasureSpec.AT_MOST); - } else { - widthSpec = View.MeasureSpec.makeMeasureSpec(activity.getWindow().getDecorView().getMeasuredWidth(), - View.MeasureSpec.AT_MOST); - } - - view.measure(widthSpec, View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)); - } - - private void initializeCroutonView() { - Resources resources = this.activity.getResources(); - - this.croutonView = initializeCroutonViewGroup(resources); - - // create content view - RelativeLayout contentView = initializeContentView(resources); - this.croutonView.addView(contentView); - } - - @SuppressWarnings("deprecation") - private FrameLayout initializeCroutonViewGroup(Resources resources) { - FrameLayout croutonView = new FrameLayout(this.activity); - - if (null != onClickListener) { - croutonView.setOnClickListener(onClickListener); - } - - final int height; - if (this.style.heightDimensionResId > 0) { - height = resources.getDimensionPixelSize(this.style.heightDimensionResId); - } else { - height = this.style.heightInPixels; - } - - final int width; - if (this.style.widthDimensionResId > 0) { - width = resources.getDimensionPixelSize(this.style.widthDimensionResId); - } else { - width = this.style.widthInPixels; - } - - croutonView.setLayoutParams( - new FrameLayout.LayoutParams(width != 0 ? width : FrameLayout.LayoutParams.MATCH_PARENT, height)); - - // set background - if (this.style.backgroundColorValue != Style.NOT_SET) { - croutonView.setBackgroundColor(this.style.backgroundColorValue); - } else { - croutonView.setBackgroundColor(resources.getColor(this.style.backgroundColorResourceId)); - } - - // set the background drawable if set. This will override the background - // color. - if (this.style.backgroundDrawableResourceId != 0) { - Bitmap background = BitmapFactory.decodeResource(resources, this.style.backgroundDrawableResourceId); - BitmapDrawable drawable = new BitmapDrawable(resources, background); - if (this.style.isTileEnabled) { - drawable.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT); - } - croutonView.setBackgroundDrawable(drawable); - } - return croutonView; - } - - private RelativeLayout initializeContentView(final Resources resources) { - RelativeLayout contentView = new RelativeLayout(this.activity); - contentView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, - RelativeLayout.LayoutParams.MATCH_PARENT)); - - // set padding - int padding = this.style.paddingInPixels; - - // if a padding dimension has been set, this will overwrite any padding - // in pixels - if (this.style.paddingDimensionResId > 0) { - padding = resources.getDimensionPixelSize(this.style.paddingDimensionResId); - } - contentView.setPadding(padding, padding, padding, padding); - - // only setup image if one is requested - ImageView image = null; - if ((null != this.style.imageDrawable) || (0 != this.style.imageResId)) { - image = initializeImageView(); - contentView.addView(image, image.getLayoutParams()); - } - - TextView text = initializeTextView(resources); - - RelativeLayout.LayoutParams textParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, - RelativeLayout.LayoutParams.WRAP_CONTENT); - if (null != image) { - textParams.addRule(RelativeLayout.RIGHT_OF, image.getId()); - } - - if ((this.style.gravity & Gravity.CENTER) != 0) { - textParams.addRule(RelativeLayout.CENTER_IN_PARENT); - } else if ((this.style.gravity & Gravity.CENTER_VERTICAL) != 0) { - textParams.addRule(RelativeLayout.CENTER_VERTICAL); - } else if ((this.style.gravity & Gravity.CENTER_HORIZONTAL) != 0) { - textParams.addRule(RelativeLayout.CENTER_HORIZONTAL); - } - - contentView.addView(text, textParams); - return contentView; - } - - private TextView initializeTextView(final Resources resources) { - TextView text = new TextView(this.activity); - text.setId(TEXT_ID); - text.setText(this.text); - text.setTypeface(Typeface.DEFAULT_BOLD); - text.setGravity(this.style.gravity); - - // set the text color if set - if (this.style.textColorValue != Style.NOT_SET) { - text.setTextColor(this.style.textColorValue); - } else if (this.style.textColorResourceId != 0) { - text.setTextColor(resources.getColor(this.style.textColorResourceId)); - } - - // Set the text size. If the user has set a text size and text - // appearance, the text size in the text appearance - // will override this. - if (this.style.textSize != 0) { - text.setTextSize(TypedValue.COMPLEX_UNIT_SP, this.style.textSize); - } - - // Setup the shadow if requested - if (this.style.textShadowColorResId != 0) { - initializeTextViewShadow(resources, text); - } - - // Set the text appearance - if (this.style.textAppearanceResId != 0) { - text.setTextAppearance(this.activity, this.style.textAppearanceResId); - } - return text; - } - - private void initializeTextViewShadow(final Resources resources, final TextView text) { - int textShadowColor = resources.getColor(this.style.textShadowColorResId); - float textShadowRadius = this.style.textShadowRadius; - float textShadowDx = this.style.textShadowDx; - float textShadowDy = this.style.textShadowDy; - text.setShadowLayer(textShadowRadius, textShadowDx, textShadowDy, textShadowColor); - } - - private ImageView initializeImageView() { - ImageView image; - image = new ImageView(this.activity); - image.setId(IMAGE_ID); - image.setAdjustViewBounds(true); - image.setScaleType(this.style.imageScaleType); - - // set the image drawable if not null - if (null != this.style.imageDrawable) { - image.setImageDrawable(this.style.imageDrawable); - } - - // set the image resource if not 0. This will overwrite the drawable - // if both are set - if (this.style.imageResId != 0) { - image.setImageResource(this.style.imageResId); - } - - RelativeLayout.LayoutParams imageParams = new RelativeLayout.LayoutParams( - RelativeLayout.LayoutParams.WRAP_CONTENT, - RelativeLayout.LayoutParams.WRAP_CONTENT); - imageParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT, RelativeLayout.TRUE); - imageParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE); - - image.setLayoutParams(imageParams); - - return image; - } -} diff --git a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/DefaultAnimationsBuilder.java b/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/DefaultAnimationsBuilder.java deleted file mode 100644 index 0e52d498..00000000 --- a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/DefaultAnimationsBuilder.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2012 - 2014 Benjamin Weiss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package de.keyboardsurfer.android.widget.crouton; - -import android.view.View; -import android.view.animation.Animation; -import android.view.animation.TranslateAnimation; - -/** Builds the default animations for showing and hiding a {@link Crouton}. */ -final class DefaultAnimationsBuilder { - private static final long DURATION = 400; - private static Animation slideInDownAnimation, slideOutUpAnimation; - private static int lastInAnimationHeight, lastOutAnimationHeight; - - private DefaultAnimationsBuilder() { - /* no-op */ - } - - /** - * @param croutonView - * The croutonView which gets animated. - * - * @return The default Animation for a showing {@link Crouton}. - */ - static Animation buildDefaultSlideInDownAnimation(View croutonView) { - if (!areLastMeasuredInAnimationHeightAndCurrentEqual(croutonView) || (null == slideInDownAnimation)) { - slideInDownAnimation = new TranslateAnimation( - 0, 0, // X: from, to - -croutonView.getMeasuredHeight(), 0 // Y: from, to - ); - slideInDownAnimation.setDuration(DURATION); - setLastInAnimationHeight(croutonView.getMeasuredHeight()); - } - return slideInDownAnimation; - } - - /** - * @param croutonView - * The croutonView which gets animated. - * - * @return The default Animation for a hiding {@link Crouton}. - */ - static Animation buildDefaultSlideOutUpAnimation(View croutonView) { - if (!areLastMeasuredOutAnimationHeightAndCurrentEqual(croutonView) || (null == slideOutUpAnimation)) { - slideOutUpAnimation = new TranslateAnimation( - 0, 0, // X: from, to - 0, -croutonView.getMeasuredHeight() // Y: from, to - ); - slideOutUpAnimation.setDuration(DURATION); - setLastOutAnimationHeight(croutonView.getMeasuredHeight()); - } - return slideOutUpAnimation; - } - - private static boolean areLastMeasuredInAnimationHeightAndCurrentEqual(View croutonView) { - return areLastMeasuredAnimationHeightAndCurrentEqual(lastInAnimationHeight, croutonView); - } - - private static boolean areLastMeasuredOutAnimationHeightAndCurrentEqual(View croutonView) { - return areLastMeasuredAnimationHeightAndCurrentEqual(lastOutAnimationHeight, croutonView); - } - - private static boolean areLastMeasuredAnimationHeightAndCurrentEqual(int lastHeight, View croutonView) { - return lastHeight == croutonView.getMeasuredHeight(); - } - - private static void setLastInAnimationHeight(int lastInAnimationHeight) { - DefaultAnimationsBuilder.lastInAnimationHeight = lastInAnimationHeight; - } - - private static void setLastOutAnimationHeight(int lastOutAnimationHeight) { - DefaultAnimationsBuilder.lastOutAnimationHeight = lastOutAnimationHeight; - } -} diff --git a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/LifecycleCallback.java b/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/LifecycleCallback.java deleted file mode 100644 index a55f734b..00000000 --- a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/LifecycleCallback.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2012 - 2014 Benjamin Weiss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package de.keyboardsurfer.android.widget.crouton; - -/** Provides callback methods on major lifecycle events of a {@link Crouton}. */ -public interface LifecycleCallback { - /** Will be called when your Crouton has been displayed. */ - public void onDisplayed(); - - /** Will be called when your {@link Crouton} has been removed. */ - public void onRemoved(); - - //public void onCeasarDressing(); -} diff --git a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Manager.java b/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Manager.java deleted file mode 100644 index 2faf2987..00000000 --- a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Manager.java +++ /dev/null @@ -1,455 +0,0 @@ -/* - * Copyright 2012 - 2014 Benjamin Weiss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package de.keyboardsurfer.android.widget.crouton; - -import android.annotation.SuppressLint; -import android.annotation.TargetApi; -import android.app.Activity; -import android.content.Context; -import android.content.res.Resources; -import android.os.Build; -import android.os.Handler; -import android.os.Message; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewParent; -import android.view.ViewTreeObserver; -import android.view.WindowManager; -import android.view.accessibility.AccessibilityEvent; -import android.view.accessibility.AccessibilityManager; -import android.widget.FrameLayout; -import java.util.Iterator; -import java.util.Queue; -import java.util.concurrent.LinkedBlockingQueue; - - -/** - * Manages the lifecycle of {@link Crouton}s. - */ -final class Manager extends Handler { - private static final class Messages { - private Messages() { /* no-op */ } - - public static final int DISPLAY_CROUTON = 0xc2007; - public static final int ADD_CROUTON_TO_VIEW = 0xc20074dd; - public static final int REMOVE_CROUTON = 0xc2007de1; - } - - private static Manager INSTANCE; - - private final Queue croutonQueue; - - private Manager() { - croutonQueue = new LinkedBlockingQueue(); - } - - /** - * @return The currently used instance of the {@link Manager}. - */ - static synchronized Manager getInstance() { - if (null == INSTANCE) { - INSTANCE = new Manager(); - } - - return INSTANCE; - } - - /** - * Inserts a {@link Crouton} to be displayed. - * - * @param crouton - * The {@link Crouton} to be displayed. - */ - void add(Crouton crouton) { - croutonQueue.add(crouton); - displayCrouton(); - } - - /** - * Displays the next {@link Crouton} within the queue. - */ - private void displayCrouton() { - if (croutonQueue.isEmpty()) { - return; - } - - // First peek whether the Crouton has an activity. - final Crouton currentCrouton = croutonQueue.peek(); - - // If the activity is null we poll the Crouton off the queue. - if (null == currentCrouton.getActivity()) { - croutonQueue.poll(); - } - - if (!currentCrouton.isShowing()) { - // Display the Crouton - sendMessage(currentCrouton, Messages.ADD_CROUTON_TO_VIEW); - if (null != currentCrouton.getLifecycleCallback()) { - currentCrouton.getLifecycleCallback().onDisplayed(); - } - } else { - sendMessageDelayed(currentCrouton, Messages.DISPLAY_CROUTON, calculateCroutonDuration(currentCrouton)); - } - } - - private long calculateCroutonDuration(Crouton crouton) { - long croutonDuration = crouton.getConfiguration().durationInMilliseconds; - croutonDuration += crouton.getInAnimation().getDuration(); - croutonDuration += crouton.getOutAnimation().getDuration(); - return croutonDuration; - } - - /** - * Sends a {@link Crouton} within a {@link Message}. - * - * @param crouton - * The {@link Crouton} that should be sent. - * @param messageId - * The {@link Message} id. - */ - private void sendMessage(Crouton crouton, final int messageId) { - final Message message = obtainMessage(messageId); - message.obj = crouton; - sendMessage(message); - } - - /** - * Sends a {@link Crouton} within a delayed {@link Message}. - * - * @param crouton - * The {@link Crouton} that should be sent. - * @param messageId - * The {@link Message} id. - * @param delay - * The delay in milliseconds. - */ - private void sendMessageDelayed(Crouton crouton, final int messageId, final long delay) { - Message message = obtainMessage(messageId); - message.obj = crouton; - sendMessageDelayed(message, delay); - } - - /* - * (non-Javadoc) - * - * @see android.os.Handler#handleMessage(android.os.Message) - */ - @Override - public void handleMessage(Message message) { - final Crouton crouton = (Crouton) message.obj; - if (null == crouton) { - return; - } - switch (message.what) { - case Messages.DISPLAY_CROUTON: { - displayCrouton(); - break; - } - - case Messages.ADD_CROUTON_TO_VIEW: { - addCroutonToView(crouton); - break; - } - - case Messages.REMOVE_CROUTON: { - removeCrouton(crouton); - if (null != crouton.getLifecycleCallback()) { - crouton.getLifecycleCallback().onRemoved(); - } - break; - } - - default: { - super.handleMessage(message); - break; - } - } - } - - /** - * Adds a {@link Crouton} to the {@link ViewParent} of it's {@link Activity}. - * - * @param crouton - * The {@link Crouton} that should be added. - */ - private void addCroutonToView(final Crouton crouton) { - // don't add if it is already showing - if (crouton.isShowing()) { - return; - } - - final View croutonView = crouton.getView(); - if (null == croutonView.getParent()) { - ViewGroup.LayoutParams params = croutonView.getLayoutParams(); - if (null == params) { - params = new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - } - // display Crouton in ViewGroup is it has been supplied - if (null != crouton.getViewGroup()) { - // TODO implement add to last position feature (need to align with how this will be requested for activity) - if (crouton.getViewGroup() instanceof FrameLayout) { - crouton.getViewGroup().addView(croutonView, params); - } else { - crouton.getViewGroup().addView(croutonView, 0, params); - } - } else { - Activity activity = crouton.getActivity(); - if (null == activity || activity.isFinishing()) { - return; - } - handleTranslucentActionBar((ViewGroup.MarginLayoutParams) params, activity); - - activity.addContentView(croutonView, params); - } - } - - croutonView.requestLayout(); // This is needed so the animation can use the measured with/height - ViewTreeObserver observer = croutonView.getViewTreeObserver(); - if (null != observer) { - observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { - @SuppressWarnings("deprecation") - @Override - @TargetApi(16) - public void onGlobalLayout() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { - croutonView.getViewTreeObserver().removeGlobalOnLayoutListener(this); - } else { - croutonView.getViewTreeObserver().removeOnGlobalLayoutListener(this); - } - - croutonView.startAnimation(crouton.getInAnimation()); - announceForAccessibilityCompat(crouton.getActivity(), crouton.getText()); - if (Configuration.DURATION_INFINITE != crouton.getConfiguration().durationInMilliseconds) { - sendMessageDelayed(crouton, Messages.REMOVE_CROUTON, - crouton.getConfiguration().durationInMilliseconds + crouton.getInAnimation().getDuration()); - } - } - }); - } - } - - @TargetApi(19) - private void handleTranslucentActionBar(ViewGroup.MarginLayoutParams params, Activity activity) { - // Translucent status is only available as of Android 4.4 Kit Kat. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - final int flags = activity.getWindow().getAttributes().flags; - final int translucentStatusFlag = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; - /* Checks whether translucent status is enabled for this window. - * If true, sets the top margin to show the crouton just below the action bar. */ - if ((flags & translucentStatusFlag) == translucentStatusFlag) { - final int actionBarContainerId = Resources.getSystem().getIdentifier("action_bar_container", "id", "android"); - final View actionBarContainer = activity.findViewById(actionBarContainerId); - // The action bar is present: the app is using a Holo theme. - if (actionBarContainer != null) { - final ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams) params; - marginParams.topMargin = actionBarContainer.getBottom(); - } - } - } - } - - /** - * Removes the {@link Crouton}'s view after it's display - * durationInMilliseconds. - * - * @param crouton - * The {@link Crouton} added to a {@link ViewGroup} and should be - * removed. - */ - protected void removeCrouton(Crouton crouton) { - View croutonView = crouton.getView(); - ViewGroup croutonParentView = (ViewGroup) croutonView.getParent(); - - if (null != croutonParentView) { - croutonView.startAnimation(crouton.getOutAnimation()); - - // Remove the Crouton from the queue. - Crouton removed = croutonQueue.poll(); - - // Remove the crouton from the view's parent. - croutonParentView.removeView(croutonView); - if (null != removed) { - removed.detachActivity(); - removed.detachViewGroup(); - if (null != removed.getLifecycleCallback()) { - removed.getLifecycleCallback().onRemoved(); - } - removed.detachLifecycleCallback(); - } - - // Send a message to display the next crouton but delay it by the out - // animation duration to make sure it finishes - sendMessageDelayed(crouton, Messages.DISPLAY_CROUTON, crouton.getOutAnimation().getDuration()); - } - } - - /** - * Removes a {@link Crouton} immediately, even when it's currently being - * displayed. - * - * @param crouton - * The {@link Crouton} that should be removed. - */ - void removeCroutonImmediately(Crouton crouton) { - // if Crouton has already been displayed then it may not be in the queue (because it was popped). - // This ensures the displayed Crouton is removed from its parent immediately, whether another instance - // of it exists in the queue or not. - // Note: crouton.isShowing() is false here even if it really is showing, as croutonView object in - // Crouton seems to be out of sync with reality! - if (null != crouton.getActivity() && null != crouton.getView() && null != crouton.getView().getParent()) { - ((ViewGroup) crouton.getView().getParent()).removeView(crouton.getView()); - - // remove any messages pending for the crouton - removeAllMessagesForCrouton(crouton); - } - // remove any matching croutons from queue - final Iterator croutonIterator = croutonQueue.iterator(); - while (croutonIterator.hasNext()) { - final Crouton c = croutonIterator.next(); - if (c.equals(crouton) && (null != c.getActivity())) { - // remove the crouton from the content view - removeCroutonFromViewParent(crouton); - - // remove any messages pending for the crouton - removeAllMessagesForCrouton(c); - - // remove the crouton from the queue - croutonIterator.remove(); - - // we have found our crouton so just break - break; - } - } - } - - /** - * Removes all {@link Crouton}s from the queue. - */ - void clearCroutonQueue() { - removeAllMessages(); - - // remove any views that may already have been added to the activity's - // content view - for (Crouton crouton : croutonQueue) { - removeCroutonFromViewParent(crouton); - } - croutonQueue.clear(); - } - - /** - * Removes all {@link Crouton}s for the provided activity. This will remove - * crouton from {@link Activity}s content view immediately. - */ - void clearCroutonsForActivity(Activity activity) { - Iterator croutonIterator = croutonQueue.iterator(); - while (croutonIterator.hasNext()) { - Crouton crouton = croutonIterator.next(); - if ((null != crouton.getActivity()) && crouton.getActivity().equals(activity)) { - // remove the crouton from the content view - removeCroutonFromViewParent(crouton); - - removeAllMessagesForCrouton(crouton); - - // remove the crouton from the queue - croutonIterator.remove(); - } - } - } - - private void removeCroutonFromViewParent(Crouton crouton) { - if (crouton.isShowing()) { - ViewGroup parent = (ViewGroup) crouton.getView().getParent(); - if (null != parent) { - parent.removeView(crouton.getView()); - } - } - } - - private void removeAllMessages() { - removeMessages(Messages.ADD_CROUTON_TO_VIEW); - removeMessages(Messages.DISPLAY_CROUTON); - removeMessages(Messages.REMOVE_CROUTON); - } - - private void removeAllMessagesForCrouton(Crouton crouton) { - removeMessages(Messages.ADD_CROUTON_TO_VIEW, crouton); - removeMessages(Messages.DISPLAY_CROUTON, crouton); - removeMessages(Messages.REMOVE_CROUTON, crouton); - - } - - /** - * Generates and dispatches an SDK-specific spoken announcement. - *

- * For backwards compatibility, we're constructing an event from scratch - * using the appropriate event type. If your application only targets SDK - * 16+, you can just call View.announceForAccessibility(CharSequence). - *

- *

- * note: AccessibilityManager is only available from API lvl 4. - *

- * Adapted from https://http://eyes-free.googlecode.com/files/accessibility_codelab_demos_v2_src.zip - * via https://github.com/coreform/android-formidable-validation - * - * @param context - * Used to get {@link AccessibilityManager} - * @param text - * The text to announce. - */ - @SuppressLint("InlinedApi") - @TargetApi(Build.VERSION_CODES.DONUT) - public static void announceForAccessibilityCompat(Context context, CharSequence text) { - if (Build.VERSION.SDK_INT >= 4) { - AccessibilityManager accessibilityManager = null; - if (null != context) { - accessibilityManager = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE); - } - if (null == accessibilityManager || !accessibilityManager.isEnabled()) { - return; - } - - // Prior to SDK 16, announcements could only be made through FOCUSED - // events. Jelly Bean (SDK 16) added support for speaking text verbatim - // using the ANNOUNCEMENT event type. - final int eventType; - if (Build.VERSION.SDK_INT < 16) { - eventType = AccessibilityEvent.TYPE_VIEW_FOCUSED; - } else { - eventType = AccessibilityEvent.TYPE_ANNOUNCEMENT; - } - - // Construct an accessibility event with the minimum recommended - // attributes. An event without a class name or package may be dropped. - final AccessibilityEvent event = AccessibilityEvent.obtain(eventType); - event.getText().add(text); - event.setClassName(Manager.class.getName()); - event.setPackageName(context.getPackageName()); - - // Sends the event directly through the accessibility manager. If your - // application only targets SDK 14+, you should just call - // getParent().requestSendAccessibilityEvent(this, event); - accessibilityManager.sendAccessibilityEvent(event); - } - } - - @Override - public String toString() { - return "Manager{" + - "croutonQueue=" + croutonQueue + - '}'; - } -} diff --git a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Style.java b/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Style.java deleted file mode 100644 index 38109236..00000000 --- a/external/Crouton/library/src/de/keyboardsurfer/android/widget/crouton/Style.java +++ /dev/null @@ -1,536 +0,0 @@ -/* - * Copyright 2012 - 2014 Benjamin Weiss - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package de.keyboardsurfer.android.widget.crouton; - -import android.graphics.drawable.Drawable; -import android.view.Gravity; -import android.view.ViewGroup.LayoutParams; -import android.widget.ImageView; - - -/** The style for a {@link Crouton}. */ -public class Style { - - public static final int NOT_SET = -1; - - public static final int holoRedLight = 0xffff4444; - public static final int holoGreenLight = 0xff99cc00; - public static final int holoBlueLight = 0xff33b5e5; - - /** Default style for alerting the user. */ - public static final Style ALERT; - /** Default style for confirming an action. */ - public static final Style CONFIRM; - /** Default style for general information. */ - public static final Style INFO; - - static { - ALERT = new Builder() - .setBackgroundColorValue(holoRedLight) - .build(); - CONFIRM = new Builder() - .setBackgroundColorValue(holoGreenLight) - .build(); - INFO = new Builder() - .setBackgroundColorValue(holoBlueLight) - .build(); - } - - /** - * The {@link Configuration} for this {@link Style}. - * It can be overridden via {@link Crouton#setConfiguration(Configuration)}. - */ - final Configuration configuration; - - /** - * The resource id of the backgroundResourceId. - *

- * 0 for no backgroundResourceId. - */ - final int backgroundColorResourceId; - - /** - * The resource id of the backgroundDrawableResourceId. - *

- * 0 for no backgroundDrawableResourceId. - */ - final int backgroundDrawableResourceId; - - /** - * The backgroundColorResourceValue's e.g. 0xffff4444; - *

- * NOT_SET for no value. - */ - final int backgroundColorValue; - - /** Whether we should isTileEnabled the backgroundResourceId or not. */ - final boolean isTileEnabled; - - /** - * The text colorResourceId's resource id. - *

- * 0 sets the text colorResourceId to the system theme default. - */ - final int textColorResourceId; - - /** - * The textColorResourceValue's e.g. 0xffff4444; - *

- * NOT_SET for no value. - */ - final int textColorValue; - - /** The height of the {@link Crouton} in pixels. */ - final int heightInPixels; - - /** Resource ID for the height of the {@link Crouton}. */ - final int heightDimensionResId; - - /** The width of the {@link Crouton} in pixels. */ - final int widthInPixels; - - /** Resource ID for the width of the {@link Crouton}. */ - final int widthDimensionResId; - - /** The text's gravity as provided by {@link Gravity}. */ - final int gravity; - - /** An additional image to display in the {@link Crouton}. */ - final Drawable imageDrawable; - - /** An additional image to display in the {@link Crouton}. */ - final int imageResId; - - /** The {@link ImageView.ScaleType} for the image to display in the {@link Crouton}. */ - final ImageView.ScaleType imageScaleType; - - /** - * The text size in sp - *

- * 0 sets the text size to the system theme default - */ - final int textSize; - - /** The text shadow color's resource id */ - final int textShadowColorResId; - - /** The text shadow radius */ - final float textShadowRadius; - - /** The text shadow vertical offset */ - final float textShadowDy; - - /** The text shadow horizontal offset */ - final float textShadowDx; - - /** The text appearance resource id for the text. */ - final int textAppearanceResId; - - /** The padding for the crouton view content in pixels */ - final int paddingInPixels; - - /** The resource id for the padding for the view content */ - final int paddingDimensionResId; - - private Style(final Builder builder) { - this.configuration = builder.configuration; - this.backgroundColorResourceId = builder.backgroundColorResourceId; - this.backgroundDrawableResourceId = builder.backgroundDrawableResourceId; - this.isTileEnabled = builder.isTileEnabled; - this.textColorResourceId = builder.textColorResourceId; - this.textColorValue = builder.textColorValue; - this.heightInPixels = builder.heightInPixels; - this.heightDimensionResId = builder.heightDimensionResId; - this.widthInPixels = builder.widthInPixels; - this.widthDimensionResId = builder.widthDimensionResId; - this.gravity = builder.gravity; - this.imageDrawable = builder.imageDrawable; - this.textSize = builder.textSize; - this.textShadowColorResId = builder.textShadowColorResId; - this.textShadowRadius = builder.textShadowRadius; - this.textShadowDx = builder.textShadowDx; - this.textShadowDy = builder.textShadowDy; - this.textAppearanceResId = builder.textAppearanceResId; - this.imageResId = builder.imageResId; - this.imageScaleType = builder.imageScaleType; - this.paddingInPixels = builder.paddingInPixels; - this.paddingDimensionResId = builder.paddingDimensionResId; - this.backgroundColorValue = builder.backgroundColorValue; - } - - /** Builder for the {@link Style} object. */ - public static class Builder { - private Configuration configuration; - private int backgroundColorValue; - private int backgroundColorResourceId; - private int backgroundDrawableResourceId; - private boolean isTileEnabled; - private int textColorResourceId; - private int textColorValue; - private int heightInPixels; - private int heightDimensionResId; - private int widthInPixels; - private int widthDimensionResId; - private int gravity; - private Drawable imageDrawable; - private int textSize; - private int textShadowColorResId; - private float textShadowRadius; - private float textShadowDx; - private float textShadowDy; - private int textAppearanceResId; - private int imageResId; - private ImageView.ScaleType imageScaleType; - private int paddingInPixels; - private int paddingDimensionResId; - - /** Creates a {@link Builder} to build a {@link Style} upon. */ - public Builder() { - configuration = Configuration.DEFAULT; - paddingInPixels = 10; - backgroundColorResourceId = android.R.color.holo_blue_light; - backgroundDrawableResourceId = 0; - backgroundColorValue = NOT_SET; - isTileEnabled = false; - textColorResourceId = android.R.color.white; - textColorValue = NOT_SET; - heightInPixels = LayoutParams.WRAP_CONTENT; - widthInPixels = LayoutParams.MATCH_PARENT; - gravity = Gravity.CENTER; - imageDrawable = null; - imageResId = 0; - imageScaleType = ImageView.ScaleType.FIT_XY; - } - - /** - * Creates a {@link Builder} to build a {@link Style} upon. - * - * @param baseStyle - * The base {@link Style} to use for this {@link Style}. - */ - public Builder(final Style baseStyle) { - configuration = baseStyle.configuration; - backgroundColorValue = baseStyle.backgroundColorValue; - backgroundColorResourceId = baseStyle.backgroundColorResourceId; - backgroundDrawableResourceId = baseStyle.backgroundDrawableResourceId; - isTileEnabled = baseStyle.isTileEnabled; - textColorResourceId = baseStyle.textColorResourceId; - textColorValue = baseStyle.textColorValue; - heightInPixels = baseStyle.heightInPixels; - heightDimensionResId = baseStyle.heightDimensionResId; - widthInPixels = baseStyle.widthInPixels; - widthDimensionResId = baseStyle.widthDimensionResId; - gravity = baseStyle.gravity; - imageDrawable = baseStyle.imageDrawable; - textSize = baseStyle.textSize; - textShadowColorResId = baseStyle.textShadowColorResId; - textShadowRadius = baseStyle.textShadowRadius; - textShadowDx = baseStyle.textShadowDx; - textShadowDy = baseStyle.textShadowDy; - textAppearanceResId = baseStyle.textAppearanceResId; - imageResId = baseStyle.imageResId; - imageScaleType = baseStyle.imageScaleType; - paddingInPixels = baseStyle.paddingInPixels; - paddingDimensionResId = baseStyle.paddingDimensionResId; - } - /** - * Set the {@link Configuration} option of the {@link Crouton}. - * - * @param configuration - * The {@link Configuration}. - * - * @return the {@link Builder}. - */ - public Builder setConfiguration(Configuration configuration) { - this.configuration = configuration; - return this; - } - - /** - * Set the backgroundColorResourceId option of the {@link Crouton}. - * - * @param backgroundColorResourceId - * The backgroundColorResourceId's resource id. - * - * @return the {@link Builder}. - */ - public Builder setBackgroundColor(int backgroundColorResourceId) { - this.backgroundColorResourceId = backgroundColorResourceId; - - return this; - } - - /** - * Set the backgroundColorResourceValue option of the {@link Crouton}. - * - * @param backgroundColorValue - * The backgroundColorResourceValue's e.g. 0xffff4444; - * - * @return the {@link Builder}. - */ - public Builder setBackgroundColorValue(int backgroundColorValue) { - this.backgroundColorValue = backgroundColorValue; - return this; - } - - /** - * Set the backgroundDrawableResourceId option for the {@link Crouton}. - * - * @param backgroundDrawableResourceId - * Resource ID of a backgroundDrawableResourceId image drawable. - * - * @return the {@link Builder}. - */ - public Builder setBackgroundDrawable(int backgroundDrawableResourceId) { - this.backgroundDrawableResourceId = backgroundDrawableResourceId; - - return this; - } - - /** - * Set the heightInPixels option for the {@link Crouton}. - * - * @param height - * The height of the {@link Crouton} in pixel. Can also be - * {@link LayoutParams#MATCH_PARENT} or - * {@link LayoutParams#WRAP_CONTENT}. - * - * @return the {@link Builder}. - */ - public Builder setHeight(int height) { - this.heightInPixels = height; - - return this; - } - - /** - * Set the resource id for the height option for the {@link Crouton}. - * - * @param heightDimensionResId - * Resource ID of a dimension for the height of the {@link Crouton}. - * - * @return the {@link Builder}. - */ - public Builder setHeightDimensionResId(int heightDimensionResId) { - this.heightDimensionResId = heightDimensionResId; - - return this; - } - - /** - * Set the widthInPixels option for the {@link Crouton}. - * - * @param width - * The width of the {@link Crouton} in pixel. Can also be - * {@link LayoutParams#MATCH_PARENT} or - * {@link LayoutParams#WRAP_CONTENT}. - * - * @return the {@link Builder}. - */ - public Builder setWidth(int width) { - this.widthInPixels = width; - - return this; - } - - /** - * Set the resource id for the width option for the {@link Crouton}. - * - * @param widthDimensionResId - * Resource ID of a dimension for the width of the {@link Crouton}. - * - * @return the {@link Builder}. - */ - public Builder setWidthDimensionResId(int widthDimensionResId) { - this.widthDimensionResId = widthDimensionResId; - - return this; - } - - /** - * Set the isTileEnabled option for the {@link Crouton}. - * - * @param isTileEnabled - * true if you want the backgroundResourceId to be - * tiled, else false. - * - * @return the {@link Builder}. - */ - public Builder setTileEnabled(boolean isTileEnabled) { - this.isTileEnabled = isTileEnabled; - - return this; - } - - /** - * Set the textColorResourceId option for the {@link Crouton}. - * - * @param textColor - * The resource id of the text colorResourceId. - * - * @return the {@link Builder}. - */ - public Builder setTextColor(int textColor) { - this.textColorResourceId = textColor; - - return this; - } - - /** - * Set the textColorResourceValue option of the {@link Crouton}. - * - * @param textColorValue - * The textColorResourceValue's e.g. 0xffff4444; - * - * @return the {@link Builder}. - */ - public Builder setTextColorValue(int textColorValue) { - this.textColorValue = textColorValue; - return this; - } - - /** - * Set the gravity option for the {@link Crouton}. - * - * @param gravity - * The text's gravity as provided by {@link Gravity}. - * - * @return the {@link Builder}. - */ - public Builder setGravity(int gravity) { - this.gravity = gravity; - - return this; - } - - /** - * Set the image option for the {@link Crouton}. - * - * @param imageDrawable - * An additional image to display in the {@link Crouton}. - * - * @return the {@link Builder}. - */ - public Builder setImageDrawable(Drawable imageDrawable) { - this.imageDrawable = imageDrawable; - - return this; - } - - /** - * Set the image resource option for the {@link Crouton}. - * - * @param imageResId - * An additional image to display in the {@link Crouton}. - * - * @return the {@link Builder}. - */ - public Builder setImageResource(int imageResId) { - this.imageResId = imageResId; - - return this; - } - - /** The text size in sp. */ - public Builder setTextSize(int textSize) { - this.textSize = textSize; - return this; - } - - /** The text shadow color resource id. */ - public Builder setTextShadowColor(int textShadowColorResId) { - this.textShadowColorResId = textShadowColorResId; - return this; - } - - /** The text shadow radius. */ - public Builder setTextShadowRadius(float textShadowRadius) { - this.textShadowRadius = textShadowRadius; - return this; - } - - /** The text shadow horizontal offset. */ - public Builder setTextShadowDx(float textShadowDx) { - this.textShadowDx = textShadowDx; - return this; - } - - /** The text shadow vertical offset. */ - public Builder setTextShadowDy(float textShadowDy) { - this.textShadowDy = textShadowDy; - return this; - } - - /** The text appearance resource id for the text. */ - public Builder setTextAppearance(int textAppearanceResId) { - this.textAppearanceResId = textAppearanceResId; - return this; - } - - /** The {@link android.widget.ImageView.ScaleType} for the image. */ - public Builder setImageScaleType(ImageView.ScaleType imageScaleType) { - this.imageScaleType = imageScaleType; - return this; - } - - /** The padding for the crouton view's content in pixels. */ - public Builder setPaddingInPixels(int padding) { - this.paddingInPixels = padding; - return this; - } - - /** The resource id for the padding for the crouton view's content. */ - public Builder setPaddingDimensionResId(int paddingResId) { - this.paddingDimensionResId = paddingResId; - return this; - } - - /** @return a configured {@link Style} object. */ - public Style build() { - return new Style(this); - } - } - - @Override - public String toString() { - return "Style{" + - "configuration=" + configuration + - ", backgroundColorResourceId=" + backgroundColorResourceId + - ", backgroundDrawableResourceId=" + backgroundDrawableResourceId + - ", backgroundColorValue=" + backgroundColorValue + - ", isTileEnabled=" + isTileEnabled + - ", textColorResourceId=" + textColorResourceId + - ", textColorValue=" + textColorValue + - ", heightInPixels=" + heightInPixels + - ", heightDimensionResId=" + heightDimensionResId + - ", widthInPixels=" + widthInPixels + - ", widthDimensionResId=" + widthDimensionResId + - ", gravity=" + gravity + - ", imageDrawable=" + imageDrawable + - ", imageResId=" + imageResId + - ", imageScaleType=" + imageScaleType + - ", textSize=" + textSize + - ", textShadowColorResId=" + textShadowColorResId + - ", textShadowRadius=" + textShadowRadius + - ", textShadowDy=" + textShadowDy + - ", textShadowDx=" + textShadowDx + - ", textAppearanceResId=" + textAppearanceResId + - ", paddingInPixels=" + paddingInPixels + - ", paddingDimensionResId=" + paddingDimensionResId + - '}'; - } -} diff --git a/external/Crouton/pom.xml b/external/Crouton/pom.xml deleted file mode 100644 index a56203e5..00000000 --- a/external/Crouton/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - 4.0.0 - - Crouton Parent - crouton-parent - 1.7 - de.keyboardsurfer.android.widget - pom - - - - keyboardsurfer - Benjamin Weiss - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - git@github.com:keyboardsurfer/Crouton.git - scm:git:git@github.com:keyboardsurfer/Crouton.git - scm:git:git@github.com:keyboardsurfer/Crouton.git - - - - library - sample - - - - UTF-8 - 4.1.1.4 - 16 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.4.1 - true - - - ${android.version.platform} - - true - true - - - - - - - diff --git a/full/.classpath b/full/.classpath deleted file mode 100644 index 7bc01d9a..00000000 --- a/full/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/full/.project b/full/.project deleted file mode 100644 index a91e6ae4..00000000 --- a/full/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Transdroid Full - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/full/ant.properties b/full/ant.properties deleted file mode 100644 index bc0328fa..00000000 --- a/full/ant.properties +++ /dev/null @@ -1,2 +0,0 @@ -key.store=../..//erickok.keystore -key.alias=transdroid diff --git a/full/build.xml b/full/build.xml deleted file mode 100644 index 5fc86b9f..00000000 --- a/full/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/full/proguard-project.txt b/full/proguard-project.txt deleted file mode 100644 index f2fe1559..00000000 --- a/full/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/full/project.properties b/full/project.properties deleted file mode 100644 index 4bc32995..00000000 --- a/full/project.properties +++ /dev/null @@ -1,15 +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-18 -android.library.reference.1=../core diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..5d08ba75 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Settings specified in this file will override any Gradle settings +# configured through the IDE. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..8c0fb64a Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..1e61d1fd --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..91a7e269 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib/.classpath b/lib/.classpath deleted file mode 100644 index 4970aef8..00000000 --- a/lib/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/lib/.project b/lib/.project deleted file mode 100644 index b2f8c896..00000000 --- a/lib/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Transdroid Torrent Connect - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/lib/.settings/org.eclipse.jdt.core.prefs b/lib/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index fb48e955..00000000 --- a/lib/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Fri Oct 15 20:05:09 EDT 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/lib/build.xml b/lib/build.xml deleted file mode 100644 index 2a50aacb..00000000 --- a/lib/build.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lite/.classpath b/lite/.classpath deleted file mode 100644 index 7bc01d9a..00000000 --- a/lite/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/lite/.project b/lite/.project deleted file mode 100644 index e65b9dd2..00000000 --- a/lite/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Transdroid Lite - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/lite/AndroidManifest.xml b/lite/AndroidManifest.xml deleted file mode 100644 index 40c2c1ad..00000000 --- a/lite/AndroidManifest.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lite/ant.properties b/lite/ant.properties deleted file mode 100644 index 5931745c..00000000 --- a/lite/ant.properties +++ /dev/null @@ -1,2 +0,0 @@ -key.store=../../erickok.keystore -key.alias=transdroid diff --git a/lite/build.xml b/lite/build.xml deleted file mode 100644 index d3518816..00000000 --- a/lite/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lite/proguard-project.txt b/lite/proguard-project.txt deleted file mode 100644 index f2fe1559..00000000 --- a/lite/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/lite/project.properties b/lite/project.properties deleted file mode 100644 index 4bc32995..00000000 --- a/lite/project.properties +++ /dev/null @@ -1,15 +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-18 -android.library.reference.1=../core diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'