From 91aa4610a18553e58944a33a35af6257c4dc3b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 9 Jul 2013 23:25:21 +0200 Subject: [PATCH 1/9] Align summary with app name on compact layout. --- src/org/fdroid/fdroid/views/AppListAdapter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/fdroid/fdroid/views/AppListAdapter.java b/src/org/fdroid/fdroid/views/AppListAdapter.java index ea5ff7173..4dfc0079d 100644 --- a/src/org/fdroid/fdroid/views/AppListAdapter.java +++ b/src/org/fdroid/fdroid/views/AppListAdapter.java @@ -115,6 +115,7 @@ abstract public class AppListAdapter extends BaseAdapter { else summaryLayout.addRule(RelativeLayout.RIGHT_OF, R.id.icon); summary.setLayoutParams(summaryLayout); + summary.setPadding ((int)(mContext.getResources().getDisplayMetrics().density + 0.5f),0,0,0); } } From ed54b028a95ba80df964f94fe79efadf2a7cac16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 9 Jul 2013 23:33:05 +0200 Subject: [PATCH 2/9] Make the icon spacing a lot easier --- res/layout/applistitem.xml | 6 +++--- src/org/fdroid/fdroid/views/AppListAdapter.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml index 0165ad12f..295f996b5 100644 --- a/res/layout/applistitem.xml +++ b/res/layout/applistitem.xml @@ -14,6 +14,8 @@ android:scaleType="fitCenter" android:layout_width="50dp" android:layout_height="50dp" + android:layout_marginRight="2dp" + android:layout_marginEnd="2dp" android:padding="4dp"/> + android:paddingBottom="2dp" /> Date: Wed, 10 Jul 2013 12:59:47 +0200 Subject: [PATCH 3/9] Disable scrollbars on AppDetails --- res/layout-land/appdetails.xml | 6 ++++-- res/layout/appdetails.xml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/res/layout-land/appdetails.xml b/res/layout-land/appdetails.xml index 6015c2f4e..bb59f6b54 100644 --- a/res/layout-land/appdetails.xml +++ b/res/layout-land/appdetails.xml @@ -7,7 +7,8 @@ + android:layout_weight="0.5" + android:scrollbars="none" > + android:layout_weight="0.5" + android:scrollbars="none" /> diff --git a/res/layout/appdetails.xml b/res/layout/appdetails.xml index c2f39dc4f..2d6cdd7dd 100644 --- a/res/layout/appdetails.xml +++ b/res/layout/appdetails.xml @@ -62,6 +62,7 @@ + android:layout_height="fill_parent" + android:scrollbars="none" /> From 78e7810c14e27748462ce4098af6e8160efa4f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 10 Jul 2013 14:19:58 +0200 Subject: [PATCH 4/9] Recover description scrollbar only when in portrait --- res/layout-land/appdetails.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/layout-land/appdetails.xml b/res/layout-land/appdetails.xml index bb59f6b54..54f6d6a02 100644 --- a/res/layout-land/appdetails.xml +++ b/res/layout-land/appdetails.xml @@ -7,8 +7,7 @@ + android:layout_weight="0.5" > Date: Wed, 10 Jul 2013 14:23:51 +0200 Subject: [PATCH 5/9] Move the "Uninstall" button to the Action Bar --- src/org/fdroid/fdroid/AppDetails.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java index 88ac8d0fe..3104d1f61 100644 --- a/src/org/fdroid/fdroid/AppDetails.java +++ b/src/org/fdroid/fdroid/AppDetails.java @@ -546,8 +546,8 @@ public class AppDetails extends ListActivity { toShow.add(menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon( android.R.drawable.ic_menu_add)); } else { - menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon( - android.R.drawable.ic_menu_delete); + toShow.add(menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon( + android.R.drawable.ic_menu_delete)); if (mPm.getLaunchIntentForPackage(app.id) != null) { toShow.add(menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch ).setIcon( From efb37e459f0cf2d567c21b7910ab1962f79f68f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 10 Jul 2013 14:52:15 +0200 Subject: [PATCH 6/9] Remove unnecessary padding. On 3.0+, the scrollbar padding already leaves some space. --- res/layout/applistitem.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml index 295f996b5..3137b5ab9 100644 --- a/res/layout/applistitem.xml +++ b/res/layout/applistitem.xml @@ -7,8 +7,8 @@ android:paddingBottom="4dp" android:paddingLeft="6dp" android:paddingStart="6dp" - android:paddingRight="10dp" - android:paddingEnd="10dp"> + android:paddingRight="4dp" + android:paddingEnd="4dp"> + android:paddingLeft="4dp" + android:paddingStart="4dp"/> From 2b4147ed9fee4557723804df093e5a3bd838cfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 10 Jul 2013 15:51:58 +0200 Subject: [PATCH 7/9] Hide ActionBar title on AppDetails to make space --- src/org/fdroid/fdroid/AppDetails.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java index 3104d1f61..e09f6e0bc 100644 --- a/src/org/fdroid/fdroid/AppDetails.java +++ b/src/org/fdroid/fdroid/AppDetails.java @@ -181,8 +181,10 @@ public class AppDetails extends ListActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (Utils.hasApi(11)) + if (Utils.hasApi(11)) { + getActionBar().setDisplayShowTitleEnabled(false); getActionBar().setDisplayHomeAsUpEnabled(true); + } setContentView(R.layout.appdetails); From a46b8e8663a5a285f80b7741fabe9b2d6ab83660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 11 Jul 2013 12:45:13 +0200 Subject: [PATCH 8/9] Revert all the fast scroll always enabled changes --- res/layout/applistitem.xml | 8 ++++---- src/org/fdroid/fdroid/SearchResults.java | 7 +------ .../fdroid/fdroid/views/fragments/AppListFragment.java | 7 +------ 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml index 3137b5ab9..295f996b5 100644 --- a/res/layout/applistitem.xml +++ b/res/layout/applistitem.xml @@ -7,8 +7,8 @@ android:paddingBottom="4dp" android:paddingLeft="6dp" android:paddingStart="6dp" - android:paddingRight="4dp" - android:paddingEnd="4dp"> + android:paddingRight="10dp" + android:paddingEnd="10dp"> + android:paddingLeft="6dp" + android:paddingStart="6dp"/> diff --git a/src/org/fdroid/fdroid/SearchResults.java b/src/org/fdroid/fdroid/SearchResults.java index ef564f3d8..365181d06 100644 --- a/src/org/fdroid/fdroid/SearchResults.java +++ b/src/org/fdroid/fdroid/SearchResults.java @@ -131,12 +131,7 @@ public class SearchResults extends ListActivity { for (DB.App app : apps) { applist.addItem(app); } - if (Utils.hasApi(11)) { - getListView().setFastScrollAlwaysVisible(true); - getListView().setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET); - } else { - getListView().setFastScrollEnabled(true); - } + getListView().setFastScrollEnabled(true); applist.notifyDataSetChanged(); setListAdapter(applist); diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java index 135b2516f..249b2f438 100644 --- a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java +++ b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java @@ -49,12 +49,7 @@ abstract class AppListFragment extends Fragment implements AdapterView.OnItemCli protected ListView createAppListView() { ListView list = new ListView(getActivity()); - if (Utils.hasApi(11)) { - list.setFastScrollAlwaysVisible(true); - list.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET); - } else { - list.setFastScrollEnabled(true); - } + list.setFastScrollEnabled(true); list.setOnItemClickListener(this); list.setAdapter(getAppListAdapter()); return list; From c78ff5df303689341ea040847d5d2c53b56c9533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 11 Jul 2013 13:03:22 +0200 Subject: [PATCH 9/9] Disable scrollbars altogether on the three main tabs --- src/org/fdroid/fdroid/views/fragments/AppListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java index 249b2f438..6e73824a9 100644 --- a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java +++ b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java @@ -49,7 +49,7 @@ abstract class AppListFragment extends Fragment implements AdapterView.OnItemCli protected ListView createAppListView() { ListView list = new ListView(getActivity()); - list.setFastScrollEnabled(true); + list.setVerticalScrollBarEnabled(false); list.setOnItemClickListener(this); list.setAdapter(getAppListAdapter()); return list;