From d92dc5df4d607758c63b5c98a11226e4d491a769 Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Fri, 28 Jun 2013 09:05:24 +0200 Subject: [PATCH] Fixed the vertical divider line to display correctly on light and dark themes and only on tablets. --- ...d.xml => details_list_background_dark.xml} | 4 ++-- .../details_list_background_light.xml | 5 +++++ core/res/drawable/details_list_line_dark.xml | 3 --- core/res/drawable/details_list_line_light.xml | 3 --- core/res/layout/fragment_details.xml | 3 +-- core/res/values/attrs.xml | 1 - core/res/values/colors_transdroid_dark.xml | 3 ++- core/res/values/colors_transdroid_light.xml | 2 +- core/res/values/styles.xml | 2 -- .../transdroid/core/gui/DetailsFragment.java | 12 ++++++++++++ .../transdroid/core/gui/TorrentsActivity.java | 19 +++++-------------- 11 files changed, 28 insertions(+), 29 deletions(-) rename core/res/drawable/{details_list_background.xml => details_list_background_dark.xml} (51%) create mode 100644 core/res/drawable/details_list_background_light.xml delete mode 100644 core/res/drawable/details_list_line_dark.xml delete mode 100644 core/res/drawable/details_list_line_light.xml diff --git a/core/res/drawable/details_list_background.xml b/core/res/drawable/details_list_background_dark.xml similarity index 51% rename from core/res/drawable/details_list_background.xml rename to core/res/drawable/details_list_background_dark.xml index fcb7e9bd..61cf9c13 100644 --- a/core/res/drawable/details_list_background.xml +++ b/core/res/drawable/details_list_background_dark.xml @@ -1,5 +1,5 @@ - - + + diff --git a/core/res/drawable/details_list_background_light.xml b/core/res/drawable/details_list_background_light.xml new file mode 100644 index 00000000..57af89ec --- /dev/null +++ b/core/res/drawable/details_list_background_light.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/core/res/drawable/details_list_line_dark.xml b/core/res/drawable/details_list_line_dark.xml deleted file mode 100644 index c5b3627a..00000000 --- a/core/res/drawable/details_list_line_dark.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/core/res/drawable/details_list_line_light.xml b/core/res/drawable/details_list_line_light.xml deleted file mode 100644 index c6b1a4e2..00000000 --- a/core/res/drawable/details_list_line_light.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/core/res/layout/fragment_details.xml b/core/res/layout/fragment_details.xml index 35984e95..e60c310b 100644 --- a/core/res/layout/fragment_details.xml +++ b/core/res/layout/fragment_details.xml @@ -11,8 +11,7 @@ android:divider="@null" android:dividerHeight="0dip" android:listSelector="?attr/selectable_background_transdroid" - android:background="@drawable/details_list_background" - android:visibility="visible" /> + android:visibility="gone" /> - \ No newline at end of file diff --git a/core/res/values/colors_transdroid_dark.xml b/core/res/values/colors_transdroid_dark.xml index cfd23116..d1f5380a 100644 --- a/core/res/values/colors_transdroid_dark.xml +++ b/core/res/values/colors_transdroid_dark.xml @@ -1,6 +1,7 @@ diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/core/src/org/transdroid/core/gui/DetailsFragment.java index c86f9b51..e4083d23 100644 --- a/core/src/org/transdroid/core/gui/DetailsFragment.java +++ b/core/src/org/transdroid/core/gui/DetailsFragment.java @@ -12,9 +12,11 @@ import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; import org.androidannotations.annotations.ViewById; import org.transdroid.core.R; +import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.gui.lists.DetailsAdapter; import org.transdroid.core.gui.lists.SimpleListItemAdapter; import org.transdroid.core.gui.navigation.NavigationHelper; +import org.transdroid.core.gui.navigation.NavigationHelper_; import org.transdroid.core.gui.navigation.SelectionManagerMode; import org.transdroid.daemon.Daemon; import org.transdroid.daemon.Priority; @@ -67,6 +69,16 @@ public class DetailsFragment extends SherlockFragment { @AfterViews protected void init() { + // On large screens where this fragment is shown next to the torrents list, we show a continues grey vertical + // line to separate the lists visually + if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) { + if (SystemSettings_.getInstance_(getActivity()).useDarkTheme()) { + detailsList.setBackgroundResource(R.drawable.details_list_background_dark); + } else { + detailsList.setBackgroundResource(R.drawable.details_list_background_light); + } + } + // Set up details adapter (itself containing the actual lists to show), which allows multi-select and fast // scrolling detailsList.setAdapter(new DetailsAdapter(getActivity())); diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java index 91afe10a..920156c0 100644 --- a/core/src/org/transdroid/core/gui/TorrentsActivity.java +++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java @@ -29,26 +29,17 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.cookie.BasicClientCookie; import org.transdroid.core.R; import org.transdroid.core.app.settings.ApplicationSettings; -import org.transdroid.core.app.settings.ServerSetting; -import org.transdroid.core.app.settings.SystemSettings_; +import org.transdroid.core.app.settings.*; import org.transdroid.core.app.settings.WebsearchSetting; import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.lists.SimpleListItem; -import org.transdroid.core.gui.log.Log; -import org.transdroid.core.gui.log.Log_; -import org.transdroid.core.gui.navigation.FilterListAdapter; -import org.transdroid.core.gui.navigation.FilterListAdapter_; -import org.transdroid.core.gui.navigation.FilterListDropDownAdapter; -import org.transdroid.core.gui.navigation.FilterListDropDownAdapter_; -import org.transdroid.core.gui.navigation.Label; -import org.transdroid.core.gui.navigation.NavigationFilter; -import org.transdroid.core.gui.navigation.NavigationHelper; -import org.transdroid.core.gui.navigation.StatusType; -import org.transdroid.core.gui.rss.RssfeedsActivity_; +import org.transdroid.core.gui.log.*; +import org.transdroid.core.gui.navigation.*; +import org.transdroid.core.gui.rss.*; import org.transdroid.core.gui.search.BarcodeHelper; import org.transdroid.core.gui.search.FilePickerHelper; import org.transdroid.core.gui.search.UrlEntryDialog; -import org.transdroid.core.gui.settings.MainSettingsActivity_; +import org.transdroid.core.gui.settings.*; import org.transdroid.daemon.Daemon; import org.transdroid.daemon.IDaemonAdapter; import org.transdroid.daemon.Priority;