preferences layout: remove unnecessary dp height

add matching material overflow icon for headlines list

22 files changed, 20 insertions, 23 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index 66fe7283..7ab2ba2f 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -18,13 +18,11 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -487,7 +485,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 				tu.setVisibility((cat.unread > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
+			/*ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
 				ib.setOnClickListener(new OnClickListener() {					
@@ -496,7 +494,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 						getActivity().openContextMenu(v);
 					}
 				});								
-			}
+			} */
 
 			
 			return v;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index ebf1d692..2a3f571e 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -25,7 +25,6 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -679,7 +678,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
 				tu.setVisibility((feed.unread > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
+			/*ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
 				ib.setOnClickListener(new OnClickListener() {					
@@ -688,7 +687,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
 						getActivity().openContextMenu(v);
 					}
 				});								
-			}
+			}*/
 
 			return v;
 		}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
index 24c915cc..768cec82 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
@@ -17,12 +17,10 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -293,7 +291,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen
 				tu.setVisibility((cursor.getInt(cursor.getColumnIndex("unread")) > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
+			/*ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
 				ib.setOnClickListener(new OnClickListener() {					
@@ -302,7 +300,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen
 						getActivity().openContextMenu(v);
 					}
 				});								
-			}
+			} */
 
 
 			return v;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
index b3195596..825ffa03 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
@@ -20,7 +20,6 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -313,7 +312,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem
 				tu.setVisibility((cursor.getInt(cursor.getColumnIndex("unread")) > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 
-			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
+			/*ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
 				ib.setOnClickListener(new OnClickListener() {					
@@ -322,7 +321,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem
 						getActivity().openContextMenu(v);
 					}
 				});								
-			}
+			}*/
 
 			return v;
 		} 
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_overflow.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_overflow.png
deleted file mode 100644
index 540dc6d6..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_overflow.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png
new file mode 100644
index 00000000..391b72e5
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png
new file mode 100644
index 00000000..f4b0bf24
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_overflow.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_overflow.png
deleted file mode 100644
index 267d4627..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_overflow.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png
new file mode 100644
index 00000000..c18126d6
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png
new file mode 100644
index 00000000..71192997
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_overflow.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_overflow.png
deleted file mode 100644
index 4e9e854b..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_overflow.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png
new file mode 100644
index 00000000..9333e357
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png
new file mode 100644
index 00000000..12c0e9c3
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png
new file mode 100644
index 00000000..40c786c6
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png
new file mode 100644
index 00000000..c4997cfe
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png
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 b8fe5724..64491f2c 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
@@ -48,7 +48,7 @@
         android:textColor="?unreadCounterColor"
         android:textSize="14sp" />
 
-    <ImageButton
+    <!-- <ImageButton
         android:id="@+id/feed_menu_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -56,6 +56,6 @@
         android:background="@null"
         android:paddingLeft="8dp"
         android:visibility="gone"
-        android:src="@drawable/ic_action_overflow" />
+        android:src="?ic_dots_vertical" /> -->
 
 </LinearLayout>
\ No newline at end of file
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 601712fd..9e14e56e 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
@@ -50,7 +50,7 @@
         android:textColor="?unreadCounterColor"
         android:textSize="14sp" />
 
-    <ImageButton
+    <!-- <ImageButton
         android:id="@+id/feed_menu_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -58,6 +58,6 @@
         android:background="@null"
         android:paddingLeft="8dp"
         android:visibility="gone"
-        android:src="@drawable/ic_action_overflow" />
+        android:src="?ic_dots_vertical" /> -->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 5f18d42d..409fdd8a 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -178,11 +178,11 @@
                     android:id="@+id/article_menu_button"
                     android:background="@drawable/ripple"
                     android:layout_width="wrap_content"
-                    android:layout_height="16dp"
+                    android:layout_height="24dp"
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="@drawable/ic_action_overflow" />
+                    android:src="?ic_dots_vertical" />
             </LinearLayout>
         </TableRow>
     </TableLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index acfd6988..79e212c0 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -180,11 +180,11 @@
                     android:id="@+id/article_menu_button"
                     android:background="@drawable/ripple"
                     android:layout_width="wrap_content"
-                    android:layout_height="16dp"
+                    android:layout_height="24dp"
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="@drawable/ic_action_overflow" />
+                    android:src="?ic_dots_vertical" />
             </LinearLayout>
         </TableRow>
     </TableLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/preferences.xml b/org.fox.ttrss/src/main/res/layout/preferences.xml
index e030afb3..c742fc88 100755
--- a/org.fox.ttrss/src/main/res/layout/preferences.xml
+++ b/org.fox.ttrss/src/main/res/layout/preferences.xml
@@ -10,7 +10,7 @@
         android:background="?android:colorBackground"
         android:fitsSystemWindows="true"
         android:layout_width="match_parent"
-        android:layout_height="502dp"
+        android:layout_height="match_parent"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index ce85dcb7..4de4e098 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
     <attr name="ic_archive" format="reference" />
     <attr name="ic_coffee" format="reference" />
     <attr name="ic_folder_outline" format="reference" />
+    <attr name="ic_dots_vertical" format="reference" />
     <declare-styleable name="ScrimInsetsView">
         <attr format="reference|color" name="insetForeground">
         </attr></declare-styleable>
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index ad3869d7..a02ee887 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -56,6 +56,7 @@
         <item name="ic_archive">@drawable/ic_archive_dark</item>
         <item name="ic_coffee">@drawable/ic_coffee_dark</item>
         <item name="ic_folder_outline">@drawable/ic_folder_outline_dark</item>
+        <item name="ic_dots_vertical">@drawable/ic_dots_vertical_dark</item>
     </style>
 
     <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
@@ -113,6 +114,7 @@
         <item name="ic_archive">@drawable/ic_archive</item>
         <item name="ic_coffee">@drawable/ic_coffee</item>
         <item name="ic_folder_outline">@drawable/ic_folder_outline</item>
+        <item name="ic_dots_vertical">@drawable/ic_dots_vertical</item>
     </style>
 
     <style name="DarkDialogTheme" parent="android:Theme"></style>