From de4f72bc02a11c90a30622e6f0f1997afe35427b Mon Sep 17 00:00:00 2001
From: twig <twig.nguyen@gmail.com>
Date: Wed, 1 Jun 2016 10:31:00 +1000
Subject: [PATCH] - disabled all the fancy stuff in RemoteRssActivity.java
 (FAB, refresh button, drag to refresh, bottom toolbar)

---
 .../core/gui/remoterss/RemoteRssActivity.java |  3 +-
 .../main/res/layout/activity_remoterss.xml    | 35 +------------------
 .../main/res/layout/fragment_remoterss.xml    |  8 -----
 .../res/layout/list_item_remoterssitem.xml    | 31 ++++++++--------
 4 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java b/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java
index 7b1daed2..f5ae9917 100644
--- a/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java
+++ b/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java
@@ -31,7 +31,6 @@ import org.androidannotations.annotations.FragmentById;
 import org.androidannotations.annotations.InstanceState;
 import org.androidannotations.annotations.ItemClick;
 import org.androidannotations.annotations.OptionsItem;
-import org.androidannotations.annotations.OptionsMenu;
 import org.androidannotations.annotations.ViewById;
 import org.transdroid.R;
 import org.transdroid.core.app.settings.SystemSettings_;
@@ -49,7 +48,7 @@ import java.util.ArrayList;
  * @author Eric Kok
  */
 @EActivity(R.layout.activity_remoterss)
-@OptionsMenu(R.menu.activity_details)
+//@OptionsMenu(R.menu.activity_details)
 public class RemoteRssActivity extends AppCompatActivity {
 	@Extra
 	@InstanceState
diff --git a/app/src/main/res/layout/activity_remoterss.xml b/app/src/main/res/layout/activity_remoterss.xml
index 71cf63f6..2f0be10f 100644
--- a/app/src/main/res/layout/activity_remoterss.xml
+++ b/app/src/main/res/layout/activity_remoterss.xml
@@ -38,32 +38,11 @@
 			android:layout_height="wrap_content"
 			android:minHeight="?attr/actionBarSize" />
 
-		<android.support.v7.widget.Toolbar
-			android:id="@+id/actions_toolbar"
-			style="@style/SplitToolbar"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:minHeight="?attr/actionBarSize"
-			android:paddingEnd="@dimen/ui_actions_padding"
-			android:paddingRight="@dimen/ui_actions_padding" />
-
-		<android.support.v7.widget.ActionMenuView
-			android:id="@+id/contextual_menu"
-			style="@style/SplitToolbar"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:minHeight="?attr/actionBarSize"
-			android:visibility="gone"
-			tools:visibility="visible"/>
-
 		<fragment
 			android:id="@+id/remoterss_fragment"
 			class="org.transdroid.core.gui.remoterss.RemoteRssFragment_"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:layout_above="@id/actions_toolbar"
 			android:layout_below="@id/torrents_toolbar"
 			tools:layout="@layout/fragment_torrents" />
 
@@ -73,19 +52,7 @@
 
 		<View
 			style="@style/SplitToolbarShadow"
-			android:layout_above="@id/actions_toolbar" />
-
-		<include
-			layout="@layout/actionbar_addbutton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:layout_alignParentEnd="true"
-			android:layout_alignParentRight="true"
-			android:layout_gravity="bottom|end"
-			android:layout_marginBottom="16dp"
-			android:layout_marginEnd="10dp"
-			android:layout_marginRight="10dp" />
+			/>
 
 	</RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_remoterss.xml b/app/src/main/res/layout/fragment_remoterss.xml
index 434b61e6..7ac56e14 100644
--- a/app/src/main/res/layout/fragment_remoterss.xml
+++ b/app/src/main/res/layout/fragment_remoterss.xml
@@ -20,21 +20,13 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
         <ListView
             android:id="@+id/torrents_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:choiceMode="multipleChoiceModal"
             android:clipToPadding="false"
-            android:paddingBottom="35dp"
             tools:listitem="@layout/list_item_rssitem"
             tools:visibility="visible"/>
 
-    </android.support.v4.widget.SwipeRefreshLayout>
-
 </FrameLayout>
diff --git a/app/src/main/res/layout/list_item_remoterssitem.xml b/app/src/main/res/layout/list_item_remoterssitem.xml
index a3ad30d2..21b3f8f5 100644
--- a/app/src/main/res/layout/list_item_remoterssitem.xml
+++ b/app/src/main/res/layout/list_item_remoterssitem.xml
@@ -15,7 +15,7 @@
   You should have received a copy of the GNU General Public License
   along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<org.transdroid.core.gui.rss.RssitemStatusLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
@@ -25,6 +25,15 @@
 	android:paddingRight="@dimen/margin_default"
 	android:paddingTop="@dimen/margin_default">
 
+	<TextView
+			android:id="@+id/label_text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="4dip"
+			android:textIsSelectable="false"
+			android:textSize="@dimen/text_small"
+			tools:text="Source channel name"/>
+
 	<TextView
 		android:id="@+id/name_text"
 		android:layout_width="match_parent"
@@ -33,26 +42,18 @@
 		android:textColor="?attr/text_bright"
 		android:textIsSelectable="false"
 		android:textSize="@dimen/text_enlarged"
-		tools:text="Test RSS Item Text Here"/>
+		tools:text="Title for torrent"
+		android:layout_below="@+id/label_text"/>
 
 	<TextView
 		android:id="@+id/date_text"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_below="@id/name_text"
+		android:layout_below="@+id/name_text"
 		android:layout_marginTop="4dip"
 		android:textIsSelectable="false"
 		android:textSize="@dimen/text_small"
-		tools:text="25-12-2015"/>
-
-	<TextView
-			android:id="@+id/label_text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/date_text"
-			android:layout_marginTop="4dip"
-			android:textIsSelectable="false"
-			android:textSize="@dimen/text_small"
-			tools:text="Label of torrent"/>
+		tools:text="25-12-2015"
+		/>
 
-</org.transdroid.core.gui.rss.RssitemStatusLayout>
+</RelativeLayout>