From 8a15540c6134adf6fa6f0244f432adbf9abc1acf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 31 Oct 2014 13:42:19 +0300
Subject: fix assorted crap reported by code analysis

---
 org.fox.ttrss/src/main/res/layout/article_fragment.xml    |  2 +-
 .../src/main/res/layout/article_fragment_compat.xml       |  2 +-
 org.fox.ttrss/src/main/res/layout/feeds.xml               | 15 ---------------
 org.fox.ttrss/src/main/res/layout/feeds_row.xml           |  2 +-
 org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml  |  2 +-
 org.fox.ttrss/src/main/res/layout/headlines_articles.xml  |  7 +++----
 org.fox.ttrss/src/main/res/layout/share.xml               |  1 +
 7 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/layout/feeds.xml

(limited to 'org.fox.ttrss/src/main/res/layout')

diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/article_fragment.xml
index 56d42d89..e956e9b0 100644
--- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_fragment.xml
@@ -92,7 +92,7 @@
                 android:text="[Article note]" />
 
             <org.fox.ttrss.util.LessBrokenWebView
-                android:id="@+id/content"
+                android:id="@+id/article_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment_compat.xml b/org.fox.ttrss/src/main/res/layout/article_fragment_compat.xml
index 01264703..1a9c74ed 100644
--- a/org.fox.ttrss/src/main/res/layout/article_fragment_compat.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_fragment_compat.xml
@@ -7,7 +7,7 @@
     android:padding="5sp" >
 
     <org.fox.ttrss.util.TitleWebView
-        android:id="@+id/content"
+        android:id="@+id/article_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1">
diff --git a/org.fox.ttrss/src/main/res/layout/feeds.xml b/org.fox.ttrss/src/main/res/layout/feeds.xml
deleted file mode 100644
index 34efccec..00000000
--- a/org.fox.ttrss/src/main/res/layout/feeds.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <FrameLayout
-        android:id="@+id/feeds_fragment"
-        android:background="?smallScreenBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
index 22673bf5..f2fc286c 100644
--- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
@@ -31,7 +31,7 @@
         android:singleLine="true"
         android:text="{FEED}"
         android:textColor="?feedlistTextColor"
-        android:textSize="18dip" />
+        android:textSize="18sp" />
 
     <TextView
         android:id="@+id/unread_counter"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
index c5b2f0b3..6cf43666 100644
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
@@ -32,7 +32,7 @@
         android:singleLine="true"
         android:text="{FEED}"
         android:textColor="?feedlistSelectedTextColor"
-        android:textSize="18dip" />
+        android:textSize="18sp" />
 
     <TextView
         android:id="@+id/unread_counter"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
index 6b54759b..f49214cd 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
@@ -1,9 +1,8 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/headlines"
     android:fitsSystemWindows="true"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent">
 
     <LinearLayout
         android:id="@+id/fragment_container"
@@ -29,4 +28,4 @@
         </FrameLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/share.xml b/org.fox.ttrss/src/main/res/layout/share.xml
index dfd09003..b2ae8d12 100644
--- a/org.fox.ttrss/src/main/res/layout/share.xml
+++ b/org.fox.ttrss/src/main/res/layout/share.xml
@@ -17,6 +17,7 @@
 
     <EditText
         android:id="@+id/url"
+        android:inputType="textUri"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/title"
-- 
cgit v1.2.3-54-g00ecf