add headline drawable background

3 files changed, 43 insertions, 22 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 8604dc1a..e180fd68 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
@@ -216,17 +216,20 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 		list.setOnItemClickListener(this);
 		registerForContextMenu(list);
 
-        View layout = inflater.inflate(R.layout.drawer_header, list, false);
-        list.addHeaderView(layout, null, false);
-
-        TextView login = (TextView) view.findViewById(R.id.drawer_header_login);
-        TextView server = (TextView) view.findViewById(R.id.drawer_header_server);
-
-        login.setText(m_prefs.getString("login", ""));
-        try {
-            server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
-        } catch (MalformedURLException e) {
-            server.setText("");
+        // TODO: better check
+        if (m_activity.findViewById(R.id.headlines_drawer) != null) {
+            View layout = inflater.inflate(R.layout.drawer_header, list, false);
+            list.addHeaderView(layout, null, false);
+
+            TextView login = (TextView) view.findViewById(R.id.drawer_header_login);
+            TextView server = (TextView) view.findViewById(R.id.drawer_header_server);
+
+            login.setText(m_prefs.getString("login", ""));
+            try {
+                server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
+            } catch (MalformedURLException e) {
+                server.setText("");
+            }
         }
 
         View loadingBar = (View) view.findViewById(R.id.feeds_loading_bar);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
index ebd14bc9..abadb0be 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
@@ -64,6 +64,21 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
 
         if (m_drawerLayout != null) {
 
+            View drawerList = findViewById(R.id.feeds_fragment);
+
+
+            int minWidth = dpToPx(240);
+            int maxWidth = dpToPx(320);
+
+            int width = (int)((float)getResources().getDisplayMetrics().widthPixels * 0.7f);
+
+            if (width < minWidth) width = minWidth;
+            if (width > maxWidth) width = maxWidth;
+
+            DrawerLayout.LayoutParams params = (android.support.v4.widget.DrawerLayout.LayoutParams) drawerList.getLayoutParams();
+            params.width = width;
+            drawerList.setLayoutParams(params);
+
             m_drawerToggle = new ActionBarDrawerToggle(this, m_drawerLayout, R.string.blank, R.string.blank) {
                 @Override
                 public void onDrawerOpened(View drawerView) {
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 47ffa809..893571c7 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
@@ -297,17 +297,20 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 
             list.addHeaderView(layout, null, false);
         } else {
-            View layout = inflater.inflate(R.layout.drawer_header, list, false);
-            list.addHeaderView(layout, null, false);
-
-            TextView login = (TextView) view.findViewById(R.id.drawer_header_login);
-            TextView server = (TextView) view.findViewById(R.id.drawer_header_server);
-
-            login.setText(m_prefs.getString("login", ""));
-            try {
-                server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
-            } catch (MalformedURLException e) {
-                server.setText("");
+            // TODO: better check
+            if (m_activity.findViewById(R.id.headlines_drawer) != null) {
+                View layout = inflater.inflate(R.layout.drawer_header, list, false);
+                list.addHeaderView(layout, null, false);
+
+                TextView login = (TextView) view.findViewById(R.id.drawer_header_login);
+                TextView server = (TextView) view.findViewById(R.id.drawer_header_server);
+
+                login.setText(m_prefs.getString("login", ""));
+                try {
+                    server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
+                } catch (MalformedURLException e) {
+                    server.setText("");
+                }
             }
         }