From ecdef5d29428c78454badfaa5eb1eb593f404b7e Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 8 Jun 2014 18:39:03 +0300 Subject: [PATCH 1/2] Add array resources --- res/values/arrays.xml | 29 +++++++++++++++++++ .../lightning/AdvancedSettingsActivity.java | 8 +---- .../browser/lightning/SettingsActivity.java | 19 ++---------- 3 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 res/values/arrays.xml diff --git a/res/values/arrays.xml b/res/values/arrays.xml new file mode 100644 index 0000000..966d0f6 --- /dev/null +++ b/res/values/arrays.xml @@ -0,0 +1,29 @@ + + + + @string/agent_default + @string/agent_desktop + @string/agent_mobile + @string/agent_custom + + + + @string/agent_default + @string/agent_custom + + + + @string/action_homepage + @string/action_blank + @string/action_bookmarks + @string/action_webpage + + + + @string/size_largest + @string/size_large + @string/size_normal + @string/size_small + @string/size_smallest + + diff --git a/src/acr/browser/lightning/AdvancedSettingsActivity.java b/src/acr/browser/lightning/AdvancedSettingsActivity.java index 3489f26..a2d1d6d 100644 --- a/src/acr/browser/lightning/AdvancedSettingsActivity.java +++ b/src/acr/browser/lightning/AdvancedSettingsActivity.java @@ -712,16 +712,10 @@ public class AdvancedSettingsActivity extends Activity { AdvancedSettingsActivity.this); picker.setTitle(getResources().getString( R.string.title_text_size)); - CharSequence[] chars = { - getResources().getString(R.string.size_largest), - getResources().getString(R.string.size_large), - getResources().getString(R.string.size_normal), - getResources().getString(R.string.size_small), - getResources().getString(R.string.size_smallest) }; int n = mPreferences.getInt(PreferenceConstants.TEXT_SIZE, 3); - picker.setSingleChoiceItems(chars, n - 1, + picker.setSingleChoiceItems(R.array.text_size, n - 1, new DialogInterface.OnClickListener() { @Override diff --git a/src/acr/browser/lightning/SettingsActivity.java b/src/acr/browser/lightning/SettingsActivity.java index 1d91e54..3c1363e 100644 --- a/src/acr/browser/lightning/SettingsActivity.java +++ b/src/acr/browser/lightning/SettingsActivity.java @@ -593,13 +593,8 @@ public class SettingsActivity extends Activity { mActivity); agentPicker.setTitle(getResources().getString( R.string.title_user_agent)); - CharSequence[] chars = { - getResources().getString(R.string.agent_default), - getResources().getString(R.string.agent_desktop), - getResources().getString(R.string.agent_mobile), - getResources().getString(R.string.agent_custom) }; mAgentChoice = mPreferences.getInt(PreferenceConstants.USER_AGENT, 1); - agentPicker.setSingleChoiceItems(chars, mAgentChoice - 1, + agentPicker.setSingleChoiceItems(R.array.user_agent, mAgentChoice - 1, new DialogInterface.OnClickListener() { @Override @@ -689,9 +684,6 @@ public class SettingsActivity extends Activity { AlertDialog.Builder picker = new AlertDialog.Builder(mActivity); picker.setTitle(getResources().getString( R.string.title_download_location)); - CharSequence[] chars = { - getResources().getString(R.string.agent_default), - getResources().getString(R.string.agent_custom) }; mDownloadLocation = mPreferences.getString(PreferenceConstants.DOWNLOAD_DIRECTORY, Environment.DIRECTORY_DOWNLOADS); int n = -1; @@ -701,7 +693,7 @@ public class SettingsActivity extends Activity { n = 2; } - picker.setSingleChoiceItems(chars, n - 1, + picker.setSingleChoiceItems(R.array.download_folder, n - 1, new DialogInterface.OnClickListener() { @Override @@ -828,11 +820,6 @@ public class SettingsActivity extends Activity { public void onClick(View v) { AlertDialog.Builder picker = new AlertDialog.Builder(mActivity); picker.setTitle(getResources().getString(R.string.home)); - CharSequence[] chars = { - getResources().getString(R.string.action_homepage), - getResources().getString(R.string.action_blank), - getResources().getString(R.string.action_bookmarks), - getResources().getString(R.string.action_webpage) }; mHomepage = mPreferences.getString(PreferenceConstants.HOMEPAGE, Constants.HOMEPAGE); int n = -1; if (mHomepage.contains("about:home")) { @@ -845,7 +832,7 @@ public class SettingsActivity extends Activity { n = 4; } - picker.setSingleChoiceItems(chars, n - 1, + picker.setSingleChoiceItems(R.array.homepage, n - 1, new DialogInterface.OnClickListener() { @Override From d68ab94bbb4ac5a4ccdca5771b5c12603773b125 Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 8 Jun 2014 16:44:02 +0300 Subject: [PATCH 2/2] Optimize LicenseActivity --- .../browser/lightning/LicenseActivity.java | 62 +++++++------------ 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/src/acr/browser/lightning/LicenseActivity.java b/src/acr/browser/lightning/LicenseActivity.java index 8541c0a..693a076 100644 --- a/src/acr/browser/lightning/LicenseActivity.java +++ b/src/acr/browser/lightning/LicenseActivity.java @@ -9,15 +9,13 @@ import android.net.Uri; import android.os.Bundle; import android.view.MenuItem; import android.view.View; -import android.view.View.OnClickListener; -import android.widget.LinearLayout; /* *NOTE: This activity must not be removed in order to comply with the Mozilla Public License v. 2.0 *under which this code is licensed. Unless you plan on providing other attribution in the app to *the original source in another visible way, it is advised against the removal of this Activity. */ -public class LicenseActivity extends Activity { +public class LicenseActivity extends Activity implements View.OnClickListener { @Override protected void onCreate(Bundle savedInstanceState) { @@ -25,41 +23,29 @@ public class LicenseActivity extends Activity { setContentView(R.layout.license_activity); getActionBar().setHomeButtonEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true); - LinearLayout thunder = (LinearLayout) findViewById(R.id.browserLicense); - LinearLayout aosp = (LinearLayout) findViewById(R.id.licenseAOSP); - LinearLayout hosts = (LinearLayout) findViewById(R.id.licenseHosts); - thunder.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri - .parse("http://www.mozilla.org/MPL/2.0/"))); - finish(); - } - - }); - aosp.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri - .parse("http://www.apache.org/licenses/LICENSE-2.0"))); - finish(); - } - - }); - - hosts.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri - .parse("http://hosts-file.net/"))); - finish(); - } - - }); - + findViewById(R.id.browserLicense).setOnClickListener(this); + findViewById(R.id.licenseAOSP).setOnClickListener(this); + findViewById(R.id.licenseHosts).setOnClickListener(this); + } + + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.browserLicense: + actionView("http://www.mozilla.org/MPL/2.0/"); + break; + case R.id.licenseAOSP: + actionView("http://www.apache.org/licenses/LICENSE-2.0"); + break; + case R.id.licenseHosts: + actionView("http://hosts-file.net/"); + break; + } + } + + private void actionView(String url) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + finish(); } @Override