Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/return-to-search-on-up' into 'master'

Browse Source 
Return to SearchResults on "Up" navigation from AppDetails

When arriving to the AppDetails screen from SearchResults, the Up navigation should return to SearchResults screen and not its actual parent.

Not only is this behavior intuitive, it is a commonly accepted UX paradigm on the platform.

See merge request !147
This commit is contained in:
Daniel Martí 2015-10-04 00:23:56 +00:00
commit d911aa2424
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
F-Droid/src/org/fdroid/fdroid/AppDetails.java
View File

@ -129,6 +129,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
public static final String EXTRA_APPID = "appid";
public static final String EXTRA_FROM = "from";
public static final String EXTRA_HINT_SEARCHING = "searching";
private FDroidApp fdroidApp;
private ApkListAdapter adapter;
@ -769,7 +770,11 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
switch (item.getItemId()) {
case android.R.id.home:
navigateUp();
if (getIntent().hasExtra(EXTRA_HINT_SEARCHING)) {
finish();
} else {
navigateUp();
}
return true;
case LAUNCH:

1
F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
View File

@ -111,6 +111,7 @@ public class SearchResultsFragment extends ListFragment implements LoaderManager
Intent intent = new Intent(getActivity(), AppDetails.class);
intent.putExtra(AppDetails.EXTRA_APPID, app.id);
intent.putExtra(AppDetails.EXTRA_HINT_SEARCHING, true);
startActivityForResult(intent, REQUEST_APPDETAILS);
super.onListItemClick(l, v, position, id);
}