summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-05-18 13:19:16 +0400
committerAndrew Dolgov <[email protected]>2013-05-18 13:19:16 +0400
commitc1b41d9de8559240fa6c0b8f6cae8b4266830270 (patch)
treec77f95759044783e03a7bfed039ca83d846c566c /src
parent148e67b20065e7e58dcb75e646752d41d267b606 (diff)
add holo triangle back
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/CommonActivity.java7
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java9
-rw-r--r--src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java11
3 files changed, 20 insertions, 7 deletions
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index e1cacb02..78d1937c 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -166,6 +166,13 @@ public class CommonActivity extends SherlockFragmentActivity {
toast.show();
}
+ public boolean isDarkTheme() {
+ String defaultTheme = "THEME_DARK";
+
+ return (m_prefs.getString("theme", defaultTheme).equals("THEME_DARK")) ||
+ m_prefs.getString("theme", defaultTheme).equals("THEME_DARK_GRAY");
+ }
+
protected void setAppTheme(SharedPreferences prefs) {
String defaultTheme = "THEME_DARK";
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index f9cc51d8..0c5b09ec 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -41,6 +41,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
@@ -721,17 +722,19 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
});
}
- /* ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+ ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
if (ib != null) {
- ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE);
+ if (m_activity.isDarkTheme())
+ ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
+
ib.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
getActivity().openContextMenu(v);
}
});
- } */
+ }
return v;
}
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index e7e848d2..85588195 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -38,6 +38,7 @@ import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.CheckBox;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
@@ -576,18 +577,20 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
});
}
- /* ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+ ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
if (ib != null) {
- ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE);
+ if (m_activity.isDarkTheme())
+ ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
+
ib.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
getActivity().openContextMenu(v);
}
});
- } */
-
+ }
+
return v;
}