diff --git a/app/build.gradle b/app/build.gradle
index 00e76632..0638fd8d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,29 +1,19 @@
apply plugin: 'com.android.application'
apply plugin: 'android-apt'
-apply from: '../signing.gradle'
android {
compileSdkVersion 21
- buildToolsVersion '20.0.0'
+ buildToolsVersion '21.1.1'
defaultConfig {
minSdkVersion 15
targetSdkVersion 21
- versionCode 216
- versionName '2.3.0-beta'
- }
- signingConfigs {
- release {
- storeFile STORE_FILE
- storePassword STORE_PASSWORD
- keyAlias KEY_ALIAS
- keyPassword KEY_PASSWORD
- }
+ versionCode 217
+ versionName '2.5.0-SNAPSHOT'
}
buildTypes {
release {
runProguard false
- signingConfig signingConfigs.release
}
}
productFlavors {
@@ -50,8 +40,9 @@ dependencies {
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.+'
compile 'com.android.support:appcompat-v7:21.0.0'
compile 'com.android.support:support-annotations:20.0.0'
- //compile 'com.getbase:floatingactionbutton:1.2.1'
- apt "org.androidannotations:androidannotations:3.1"
+ compile 'com.getbase:floatingactionbutton:1.2.1'
+ compile 'com.afollestad:material-dialogs:0.3.6'
+ apt 'org.androidannotations:androidannotations:3.1'
}
apt {
diff --git a/app/src/main/java/org/transdroid/core/gui/rss/RssitemStatusLayout.java b/app/src/main/java/org/transdroid/core/gui/rss/RssitemStatusLayout.java
index 453cf7de..8580c2e7 100644
--- a/app/src/main/java/org/transdroid/core/gui/rss/RssitemStatusLayout.java
+++ b/app/src/main/java/org/transdroid/core/gui/rss/RssitemStatusLayout.java
@@ -23,6 +23,8 @@ import android.graphics.RectF;
import android.util.AttributeSet;
import android.widget.RelativeLayout;
+import org.transdroid.R;
+
/**
* A relative layout that that is checkable (to be used in a contextual action bar) and shows a coloured bar in the far
* left indicating the view status, that is, if the item is new to the user or was viewed earlier.
@@ -32,11 +34,10 @@ public class RssitemStatusLayout extends RelativeLayout {
private final float scale = getContext().getResources().getDisplayMetrics().density;
private final int WIDTH = (int) (6 * scale + 0.5f);
-
- private Boolean isNew = null;
private final Paint oldPaint = new Paint();
private final Paint newPaint = new Paint();
private final RectF fullRect = new RectF();
+ private Boolean isNew = null;
public RssitemStatusLayout(Context context) {
super(context);
@@ -51,8 +52,8 @@ public class RssitemStatusLayout extends RelativeLayout {
}
private void initPaints() {
- oldPaint.setColor(0xFF9E9E9E); // Grey
- newPaint.setColor(0xFF8ACC12); // Normal green
+ oldPaint.setColor(getResources().getColor(R.color.file_off)); // Grey
+ newPaint.setColor(getResources().getColor(R.color.file_normal)); // Normal green
}
public void setIsNew(Boolean isNew) {
@@ -72,7 +73,7 @@ public class RssitemStatusLayout extends RelativeLayout {
return;
}
- canvas.drawRect(fullRect, isNew? newPaint: oldPaint);
+ canvas.drawRect(fullRect, isNew ? newPaint : oldPaint);
}
diff --git a/app/src/main/res/drawable-hdpi/ic_action_barcode.png b/app/src/main/res/drawable-hdpi/ic_action_barcode.png
new file mode 100644
index 00000000..d08b52a5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_barcode.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_file.png b/app/src/main/res/drawable-hdpi/ic_action_file.png
new file mode 100755
index 00000000..53d60bce
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_file.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_link.png b/app/src/main/res/drawable-hdpi/ic_action_link.png
new file mode 100755
index 00000000..4186e00c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_link.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_new_dark.png b/app/src/main/res/drawable-hdpi/ic_action_new_dark.png
deleted file mode 100644
index ad8ada6b..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_new_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_new_light.png b/app/src/main/res/drawable-hdpi/ic_action_new_light.png
deleted file mode 100644
index 5741995c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_new_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png
new file mode 100755
index 00000000..a2fc5b2e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_search.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_search_dark.png b/app/src/main/res/drawable-hdpi/ic_action_search_dark.png
deleted file mode 100644
index f12e005e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_search_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_search_light.png b/app/src/main/res/drawable-hdpi/ic_action_search_light.png
deleted file mode 100644
index e6b70451..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_search_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_barcode.png b/app/src/main/res/drawable-xhdpi/ic_action_barcode.png
new file mode 100644
index 00000000..aad3f6c9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_barcode.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_file.png b/app/src/main/res/drawable-xhdpi/ic_action_file.png
new file mode 100755
index 00000000..dbf80e33
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_file.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_link.png b/app/src/main/res/drawable-xhdpi/ic_action_link.png
new file mode 100755
index 00000000..984b572a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_link.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_new_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_new_dark.png
deleted file mode 100644
index 23b9a1c1..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_new_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_new_light.png b/app/src/main/res/drawable-xhdpi/ic_action_new_light.png
deleted file mode 100644
index 9b48a63d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_new_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png
new file mode 100755
index 00000000..043759ac
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_search_dark.png
deleted file mode 100644
index 3549f84d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_search_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search_light.png b/app/src/main/res/drawable-xhdpi/ic_action_search_light.png
deleted file mode 100644
index 804420ae..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_search_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_barcode.png b/app/src/main/res/drawable-xxhdpi/ic_action_barcode.png
new file mode 100644
index 00000000..cb6189e2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_barcode.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_file.png b/app/src/main/res/drawable-xxhdpi/ic_action_file.png
new file mode 100755
index 00000000..58b208df
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_file.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_link.png b/app/src/main/res/drawable-xxhdpi/ic_action_link.png
new file mode 100755
index 00000000..8e96c356
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_link.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxhdpi/ic_action_search.png
new file mode 100755
index 00000000..0bbeab15
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_search.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_barcode.png b/app/src/main/res/drawable-xxxhdpi/ic_action_barcode.png
new file mode 100644
index 00000000..7bc409c6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_barcode.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_file.png b/app/src/main/res/drawable-xxxhdpi/ic_action_file.png
new file mode 100755
index 00000000..fd24777d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_file.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_link.png b/app/src/main/res/drawable-xxxhdpi/ic_action_link.png
new file mode 100755
index 00000000..df2faf36
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_link.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxxhdpi/ic_action_search.png
new file mode 100755
index 00000000..70c21baf
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_search.png differ
diff --git a/app/src/main/res/layout/fragment_torrents.xml b/app/src/main/res/layout/fragment_torrents.xml
index 8e7ead12..533304c5 100644
--- a/app/src/main/res/layout/fragment_torrents.xml
+++ b/app/src/main/res/layout/fragment_torrents.xml
@@ -16,15 +16,19 @@
along with Transdroid. If not, see .
-->
+ android:layout_height="match_parent">
+ android:visibility="gone"
+ tools:visibility="visible"
+ tools:listitem="@layout/list_item_torrent"/>
+ android:visibility="visible"
+ tools:visibility="gone" />