From b600226787227883b62ef0fecb2a56d82ba58e0b Mon Sep 17 00:00:00 2001 From: root Date: Sat, 8 Mar 2014 18:34:54 +0530 Subject: Remove 'Top padding' string from ConfigurationWizard (Bug #5260) --- res/values/strings.xml | 1 - src/se/leap/bitmaskclient/ConfigurationWizard.java | 4 ++-- src/se/leap/bitmaskclient/ProviderListFragment.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index d4e84d3a..9a603d68 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -94,7 +94,6 @@ Connection secure using your own certificate. Encrypted Internet Select a service provider - Top padding Add new Provider Add a new service provider Save diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java index e5ad5b3d..1c5f6048 100644 --- a/src/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java @@ -137,9 +137,9 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD public void refreshProviderList(int top_padding) { ProviderListFragment new_provider_list_fragment = new ProviderListFragment(); Bundle top_padding_bundle = new Bundle(); - top_padding_bundle.putInt(getResources().getString(R.string.top_padding), top_padding); + top_padding_bundle.putInt(ProviderListFragment.TOP_PADDING, top_padding); new_provider_list_fragment.setArguments(top_padding_bundle); - + FragmentManager fragmentManager = getFragmentManager(); fragmentManager.beginTransaction() .replace(R.id.configuration_wizard_layout, new_provider_list_fragment, ProviderListFragment.TAG) diff --git a/src/se/leap/bitmaskclient/ProviderListFragment.java b/src/se/leap/bitmaskclient/ProviderListFragment.java index 45047982..df39b86d 100644 --- a/src/se/leap/bitmaskclient/ProviderListFragment.java +++ b/src/se/leap/bitmaskclient/ProviderListFragment.java @@ -39,7 +39,7 @@ public class ProviderListFragment extends ListFragment { public static String TAG = "provider_list_fragment"; public static String SHOW_ALL_PROVIDERS = "show_all_providers"; - + public static String TOP_PADDING = "top padding"; private ProviderListAdapter content_adapter; /** @@ -120,7 +120,7 @@ public class ProviderListFragment extends ListFragment { && savedInstanceState.containsKey(STATE_ACTIVATED_POSITION)) { setActivatedPosition(savedInstanceState.getInt(STATE_ACTIVATED_POSITION)); } - String top_padding_key = getResources().getString(R.string.top_padding); + String top_padding_key = TOP_PADDING; if(getArguments() != null && getArguments().containsKey(top_padding_key)) { int topPadding = getArguments().getInt(top_padding_key); View current_view = getView(); -- cgit v1.2.3 From c9918258ffd14ea3c3b9a936ba8a01add946920c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 10 Mar 2014 20:01:47 +0100 Subject: A bit more clean and concise. I've added "from providerlistfragment" just in case there is any other "top padding" string suitable in other class in the future. I've removed the auxiliar variable in the block of code from ProviderListFragment, there is no need of if now we have a constant in that class. --- src/se/leap/bitmaskclient/ProviderListFragment.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/se/leap/bitmaskclient/ProviderListFragment.java b/src/se/leap/bitmaskclient/ProviderListFragment.java index df39b86d..f35cf739 100644 --- a/src/se/leap/bitmaskclient/ProviderListFragment.java +++ b/src/se/leap/bitmaskclient/ProviderListFragment.java @@ -39,7 +39,7 @@ public class ProviderListFragment extends ListFragment { public static String TAG = "provider_list_fragment"; public static String SHOW_ALL_PROVIDERS = "show_all_providers"; - public static String TOP_PADDING = "top padding"; + public static String TOP_PADDING = "top padding from providerlistfragment"; private ProviderListAdapter content_adapter; /** @@ -120,9 +120,8 @@ public class ProviderListFragment extends ListFragment { && savedInstanceState.containsKey(STATE_ACTIVATED_POSITION)) { setActivatedPosition(savedInstanceState.getInt(STATE_ACTIVATED_POSITION)); } - String top_padding_key = TOP_PADDING; - if(getArguments() != null && getArguments().containsKey(top_padding_key)) { - int topPadding = getArguments().getInt(top_padding_key); + if(getArguments() != null && getArguments().containsKey(TOP_PADDING)) { + int topPadding = getArguments().getInt(TOP_PADDING); View current_view = getView(); getView().setPadding(current_view.getPaddingLeft(), topPadding, current_view.getPaddingRight(), current_view.getPaddingBottom()); } -- cgit v1.2.3