implement moving between articles

6 files changed, 211 insertions, 38 deletions

diff --git a/res/drawable-hdpi/ic_next_article.png b/res/drawable-hdpi/ic_next_article.png
new file mode 100644
index 00000000..ef7e7be3
--- /dev/null
+++ b/res/drawable-hdpi/ic_next_article.png
diff --git a/res/drawable-hdpi/ic_next_article_disabled.png b/res/drawable-hdpi/ic_next_article_disabled.png
new file mode 100644
index 00000000..7aeac8a4
--- /dev/null
+++ b/res/drawable-hdpi/ic_next_article_disabled.png
diff --git a/res/drawable-hdpi/ic_prev_article.png b/res/drawable-hdpi/ic_prev_article.png
new file mode 100644
index 00000000..0d5744de
--- /dev/null
+++ b/res/drawable-hdpi/ic_prev_article.png
diff --git a/res/drawable-hdpi/ic_prev_article_disabled.png b/res/drawable-hdpi/ic_prev_article_disabled.png
new file mode 100644
index 00000000..848cf464
--- /dev/null
+++ b/res/drawable-hdpi/ic_prev_article_disabled.png
diff --git a/res/drawable/s_prev_article.svg b/res/drawable/s_prev_article.svg
new file mode 100644
index 00000000..5c83a6b5
--- /dev/null
+++ b/res/drawable/s_prev_article.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32px"
+   height="32px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="s_prev_article.svg"
+   inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttrss\res\drawable-hdpi\s_prev_article.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.836083"
+     inkscape:cx="13.700373"
+     inkscape:cy="14.630233"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="1138"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#898989;fill-opacity:1;stroke:none"
+       d="m 23.5,1 -10,15 10,15 -5,0 -10,-15 10,-15 z"
+       id="path2999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 29334931..2a45daf3 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -1,38 +1,141 @@
-
-    <LinearLayout android:id="@+id/article_fragment" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal">
-        <ImageView android:layout_weight="0" android:background="?articleDivider" android:layout_width="wrap_content" android:paddingLeft="4dip" android:layout_height="match_parent"></ImageView>
-        <LinearLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
-            android:id="@+id/linerLayout2"
-            android:layout_width="match_parent"
-            android:layout_weight="1"
-            android:layout_height="match_parent" android:orientation="vertical">
-            <LinearLayout android:background="?articleHeader" android:layout_gravity="center_vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/article_header" android:padding="10dip" android:orientation="vertical">
-                <TextView android:singleLine="true" android:layout_weight="1" android:text="{Title}" android:layout_height="wrap_content" android:ellipsize="end" android:layout_width="match_parent" android:id="@+id/title" android:textSize="18dip"></TextView>
-                <LinearLayout
-                    android:id="@+id/linearLayout3"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1">
-                    <TextView android:text="{COMMENTS}" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="wrap_content" android:id="@+id/comments"></TextView>
-                    <TextView android:text="{DATE}" android:gravity="right" android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/date"></TextView>
-                </LinearLayout>
-                
-            </LinearLayout>
-            <ImageView android:background="?feedlistDivider" android:paddingTop="2dip" android:layout_weight="0" android:layout_height="wrap_content" android:layout_width="match_parent"></ImageView>
-            <WebView android:layout_weight="1" android:layout_width="match_parent" android:padding="3dip" android:layout_height="match_parent" android:id="@+id/content"></WebView>
-            
-           <!-- Ad Placeholder -->
-	    	<com.google.ads.AdView      
-		        android:id="@+id/ad"
-		        android:layout_weight="0"
-		        android:gravity="center"
-		        android:background="@android:color/transparent"
-		        android:layout_width="match_parent"
-		        android:layout_height="wrap_content"
-		        ads:adUnitId="a14ed24fe8c671c"
-		        ads:adSize="BANNER"
-		        ads:loadAdOnCreate="false" />
-        </LinearLayout>
-    </LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    android:id="@+id/article_fragment"

+    android:layout_width="fill_parent"

+    android:layout_height="fill_parent"

+    android:orientation="horizontal" >

+


+    <ImageView

+        android:id="@+id/splitter_vertical"

+        android:layout_width="wrap_content"

+        android:layout_height="match_parent"

+        android:layout_weight="0"

+        android:background="?articleDivider"

+        android:clickable="true"

+        android:paddingLeft="4dip" >

+

+    </ImageView>

+

+    <LinearLayout

+        xmlns:android="http://schemas.android.com/apk/res/android"

+        xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"

+        android:id="@+id/linerLayout2"

+        android:layout_width="match_parent"

+        android:layout_height="match_parent"

+        android:layout_weight="1"

+        android:orientation="vertical" >
+


+        <ImageView

+            android:id="@+id/splitter_horizontal"

+            android:layout_width="match_parent"

+            android:layout_height="wrap_content"

+            android:layout_weight="0"

+            android:background="?articleDivider"

+            android:clickable="true"

+            android:paddingTop="4dip" />

+

+        <LinearLayout

+            android:id="@+id/linearLayout5"

+            android:padding="5dp"        

+            android:layout_width="match_parent"

+            android:layout_height="wrap_content"

+            android:gravity="center_vertical"

+            android:layout_weight="0"

+            android:layout_gravity="center_vertical" >
+


+            <ImageView

+                android:id="@+id/prev_article"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_weight="0"

+                android:src="@drawable/ic_prev_article" />

+

+            <LinearLayout

+                android:paddingLeft="5dp"

+                android:paddingRight="5dp"                

+                android:id="@+id/article_header"

+                android:layout_width="0dp"

+                android:layout_height="wrap_content"

+                android:layout_weight="1"

+                android:background="?articleHeader"

+                android:orientation="vertical"

+                 >

+

+                <TextView

+                    android:id="@+id/title"

+                    android:layout_width="match_parent"

+                    android:layout_height="wrap_content"

+                    android:layout_weight="1"

+                    android:ellipsize="end"

+                    android:singleLine="true"

+                    android:text="{Title}"

+                     />

+

+                <LinearLayout

+                    android:id="@+id/linearLayout3"

+                    android:layout_width="match_parent"

+                    android:layout_height="wrap_content"

+                    android:layout_weight="1" >

+

+                    <TextView

+                        android:id="@+id/tags"

+                        android:layout_width="0dp"

+                        android:layout_height="wrap_content"

+                        android:layout_weight="1"

+                        android:singleLine="true"

+                        android:ellipsize="end"

+                        android:text="{TAGS}"

+                        android:textSize="10sp" />

+

+                    <TextView

+                        android:id="@+id/date"

+                        android:layout_width="0dp"

+                        android:layout_height="wrap_content"

+                        android:gravity="right"

+                        android:layout_weight="1"

+                        android:text="{DATE}"

+                        android:textSize="10sp"

+                        android:textAppearance="?android:attr/textAppearanceSmall" />

+                </LinearLayout>

+            </LinearLayout>

+



+            <ImageView

+                android:id="@+id/next_article"

+                android:layout_width="wrap_content"

+                android:clickable="true"

+                android:layout_height="wrap_content"

+                android:layout_weight="0"

+                android:src="@drawable/ic_next_article" />

+

+        </LinearLayout>

+

+        <ImageView

+            android:layout_width="match_parent"

+            android:layout_height="wrap_content"

+            android:layout_weight="0"

+            android:background="?feedlistDivider"

+            android:paddingTop="2dip" >

+        </ImageView>

+

+        <WebView

+            android:id="@+id/content"

+            android:layout_width="match_parent"

+            android:layout_height="match_parent"

+            android:layout_weight="1"

+            android:padding="3dip" >

+        </WebView>

+

+        <!-- Ad Placeholder -->

+

+        <com.google.ads.AdView

+            android:id="@+id/ad"

+            android:layout_width="match_parent"

+            android:layout_height="wrap_content"

+            android:layout_weight="0"

+            ads:adSize="BANNER"

+            ads:adUnitId="a14ed24fe8c671c"

+            android:background="@android:color/transparent"

+            android:gravity="center"

+            ads:loadAdOnCreate="false" />

+    </LinearLayout>

+

+</LinearLayout>
\ No newline at end of file