diff --git a/core/res/layout-w600dp/activity_search.xml b/core/res/layout-w600dp/activity_search.xml index 34ad19e5..ecb3dc79 100644 --- a/core/res/layout-w600dp/activity_search.xml +++ b/core/res/layout-w600dp/activity_search.xml @@ -35,7 +35,7 @@ android:id="@+id/searchresults_list" android:layout_width="0dip" android:layout_height="match_parent" - android:layout_weight="3" + android:layout_weight="2" class="org.transdroid.core.gui.search.SearchResultsFragment_" tools:layout="@layout/fragment_searchresults" /> diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml index 92becb3c..22c2a5cb 100644 --- a/core/res/values/strings.xml +++ b/core/res/values/strings.xml @@ -158,6 +158,7 @@ Maximum transfer speeds set Torrent search + \'%1$s\' on %2$s Search for torrents No results for your query S: %1$s diff --git a/core/src/org/transdroid/core/gui/search/SearchActivity.java b/core/src/org/transdroid/core/gui/search/SearchActivity.java index d47797eb..d1d2897b 100644 --- a/core/src/org/transdroid/core/gui/search/SearchActivity.java +++ b/core/src/org/transdroid/core/gui/search/SearchActivity.java @@ -186,7 +186,6 @@ public class SearchActivity extends SherlockFragmentActivity implements OnNaviga private void handleIntent(Intent intent) { lastUsedQuery = parseQuery(intent); - getSupportActionBar().setTitle(NavigationHelper.buildCondensedFontString(lastUsedQuery)); // Is this actually a full HTTP URL? Then redirect this request to add the URL directly if (lastUsedQuery != null @@ -247,15 +246,23 @@ public class SearchActivity extends SherlockFragmentActivity implements OnNaviga @OptionsItem(resName = "action_refresh") protected void refreshSearch() { if (lastUsedSite instanceof WebsearchSetting) { + // Start a browser page directly to the requested search results WebsearchSetting websearch = (WebsearchSetting) lastUsedSite; startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(websearch.getBaseUrl(), lastUsedQuery)))); + } else if (lastUsedSite instanceof SearchSite) { + + // Update the activity title (only shown on large devices) + getSupportActionBar().setTitle( + NavigationHelper.buildCondensedFontString(getString(R.string.search_queryonsite, lastUsedQuery, + lastUsedSite.getName()))); // Save the search site currently used to search for future usage applicationSettings.setLastUsedSearchSite((SearchSite) lastUsedSite); // Ask the results fragment to start a search for the specified query fragmentResults.startSearch(lastUsedQuery, (SearchSite) lastUsedSite); + } } diff --git a/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java b/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java index f6f6d447..a1446e79 100644 --- a/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java +++ b/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java @@ -32,6 +32,8 @@ import org.transdroid.core.app.search.SearchHelper; import org.transdroid.core.app.search.SearchHelper.SearchSortOrder; import org.transdroid.core.app.search.SearchResult; import org.transdroid.core.app.search.SearchSite; +import org.transdroid.core.app.settings.SystemSettings_; +import org.transdroid.core.gui.navigation.NavigationHelper_; import org.transdroid.core.gui.navigation.SelectionManagerMode; import android.content.Intent; @@ -73,6 +75,16 @@ public class SearchResultsFragment extends SherlockFragment { @AfterViews protected void init() { + // On large screens where this fragment is shown next to the sites list; we show a continues grey vertical line + // to separate the lists visually + if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) { + if (SystemSettings_.getInstance_(getActivity()).useDarkTheme()) { + resultsList.setBackgroundResource(R.drawable.details_list_background_dark); + } else { + resultsList.setBackgroundResource(R.drawable.details_list_background_light); + } + } + // Set up the list adapter, which allows multi-select resultsList.setAdapter(resultsAdapter); resultsList.setMultiChoiceModeListener(onItemsSelected); @@ -161,8 +173,8 @@ public class SearchResultsFragment extends SherlockFragment { SearchResult first = checked.get(0); // Open the torrent's web page in the browser if (checked.size() > 1) - Toast.makeText(getActivity(), getString(R.string.search_openingdetails, first), Toast.LENGTH_LONG) - .show(); + Toast.makeText(getActivity(), getString(R.string.search_openingdetails, first.getName()), + Toast.LENGTH_LONG).show(); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(first.getDetailsUrl()))); return true; } else {