From 038139b5b42ab54786c75f6745ca6c2ed148c511 Mon Sep 17 00:00:00 2001
From: Kevin Meyer <meyer.kevin@mytum.de>
Date: Tue, 16 Dec 2014 19:33:11 +0100
Subject: [PATCH] articleView: moving MarkAsRead-button to actionBar (see issue
 #53)

---
 .../fr/gaulupeau/apps/Poche/ReadArticle.java  | 40 +++++++++++-------
 app/src/main/res/layout/article.xml           | 42 ++-----------------
 app/src/main/res/menu/option_article.xml      |  4 ++
 3 files changed, 33 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/res/menu/option_article.xml

diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ReadArticle.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ReadArticle.java
index 1983aee..061b445 100644
--- a/app/src/main/java/fr/gaulupeau/apps/Poche/ReadArticle.java
+++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ReadArticle.java
@@ -4,6 +4,9 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.webkit.WebView;
@@ -25,7 +28,6 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.MY_ID;
 
 public class ReadArticle extends BaseActionBarActivity {
 	WebView webViewContent;
-	Button btnMarkRead;
 	SQLiteDatabase database;
 	String id = "";
 	ScrollView view;
@@ -86,22 +88,30 @@ public class ReadArticle extends BaseActionBarActivity {
 		webViewContent = (WebView) findViewById(R.id.webViewContent);
 		webViewContent.loadDataWithBaseURL("file:///android_asset/", htmlHeader + htmlContent + htmlFooter, "text/html", "utf-8", null);
 
-		btnMarkRead = (Button) findViewById(R.id.btnMarkRead);
-		btnMarkRead.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				ContentValues values = new ContentValues();
-				values.put(ARCHIVE, 1);
-				database.update(ARTICLE_TABLE, values, MY_ID + "=" + id, null);
-				finish();
-			}
-		});
-
-
 	}
 
-	@Override
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.option_article, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menuArticleMarkAsRead:
+                ContentValues values = new ContentValues();
+                values.put(ARCHIVE, 1);
+                database.update(ARTICLE_TABLE, values, MY_ID + "=" + id, null);
+                finish();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
 	protected void onStop() {
 		// TODO Auto-generated method stub
 
diff --git a/app/src/main/res/layout/article.xml b/app/src/main/res/layout/article.xml
index 479575b..222b2a2 100644
--- a/app/src/main/res/layout/article.xml
+++ b/app/src/main/res/layout/article.xml
@@ -7,43 +7,9 @@
     android:id="@+id/scroll"
     tools:context="fr.gaulupeau.apps.Poche.ReadArticle" >
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        tools:ignore="WebViewLayout" >
-
-        <WebView
-            android:id="@+id/webViewContent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="15sp"
-            android:paddingRight="15sp" >
-
-            <View
-                android:id="@+id/view1"
-                android:layout_width="fill_parent"
-                android:layout_height="1dip"
-                android:layout_marginBottom="5sp"
-                android:layout_marginTop="5sp"
-                android:background="#000000" />
-
-            <Button
-                android:id="@+id/btnMarkRead"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
-                android:text="@string/btnMarkRead" />
-
-        </LinearLayout>
-
-
-    </LinearLayout>
-    
+    <WebView
+        android:id="@+id/webViewContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
 </ScrollView>
diff --git a/app/src/main/res/menu/option_article.xml b/app/src/main/res/menu/option_article.xml
new file mode 100644
index 0000000..4ed1615
--- /dev/null
+++ b/app/src/main/res/menu/option_article.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menuArticleMarkAsRead" android:title="@string/btnMarkRead" />
+</menu>
\ No newline at end of file