r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Cleaning up dialogs throughout the app

Browse Source
This commit is contained in:
anthony restaino 2017-05-27 11:46:19 -04:00
parent c1e8943a7f
commit 06069770cb
7 changed files with 176 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java
View File

@ -30,12 +30,14 @@ import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.constant.Constants; import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.dialog.BrowserDialog;
import acr.browser.lightning.preference.PreferenceManager; import acr.browser.lightning.preference.PreferenceManager;
import com.anthonycr.bonsai.Schedulers; import com.anthonycr.bonsai.Schedulers;
import com.anthonycr.bonsai.Single; import com.anthonycr.bonsai.Single;
import com.anthonycr.bonsai.SingleAction; import com.anthonycr.bonsai.SingleAction;
import com.anthonycr.bonsai.SingleOnSubscribe; import com.anthonycr.bonsai.SingleOnSubscribe;
import com.anthonycr.bonsai.SingleSubscriber; import com.anthonycr.bonsai.SingleSubscriber;
import com.anthonycr.bonsai.Subscription; import com.anthonycr.bonsai.Subscription;
import acr.browser.lightning.reading.HtmlFetcher; import acr.browser.lightning.reading.HtmlFetcher;
import acr.browser.lightning.reading.JResult; import acr.browser.lightning.reading.JResult;
import acr.browser.lightning.utils.ThemeUtils; import acr.browser.lightning.utils.ThemeUtils;
@ -148,45 +150,45 @@ public class ReadingActivity extends AppCompatActivity {
if (getSupportActionBar() != null) if (getSupportActionBar() != null)
getSupportActionBar().setTitle(Utils.getDomainName(mUrl)); getSupportActionBar().setTitle(Utils.getDomainName(mUrl));
mPageLoaderSubscription = loadPage(mUrl).subscribeOn(Schedulers.worker()) mPageLoaderSubscription = loadPage(mUrl).subscribeOn(Schedulers.worker())
.observeOn(Schedulers.main()) .observeOn(Schedulers.main())
.subscribe(new SingleOnSubscribe<ReaderInfo>() { .subscribe(new SingleOnSubscribe<ReaderInfo>() {
@Override @Override
public void onStart() { public void onStart() {
mProgressDialog = new ProgressDialog(ReadingActivity.this); mProgressDialog = new ProgressDialog(ReadingActivity.this);
mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
mProgressDialog.setCancelable(false); mProgressDialog.setCancelable(false);
mProgressDialog.setIndeterminate(true); mProgressDialog.setIndeterminate(true);
mProgressDialog.setMessage(getString(R.string.loading)); mProgressDialog.setMessage(getString(R.string.loading));
mProgressDialog.show(); mProgressDialog.show();
BrowserDialog.setDialogSize(ReadingActivity.this, mProgressDialog); BrowserDialog.setDialogSize(ReadingActivity.this, mProgressDialog);
} }
@Override @Override
public void onItem(@Nullable ReaderInfo item) { public void onItem(@Nullable ReaderInfo item) {
if (item == null || item.getTitle().isEmpty() || item.getBody().isEmpty()) { if (item == null || item.getTitle().isEmpty() || item.getBody().isEmpty()) {
setText(getString(R.string.untitled), getString(R.string.loading_failed));
} else {
setText(item.getTitle(), item.getBody());
}
}
@Override
public void onError(@NonNull Throwable throwable) {
setText(getString(R.string.untitled), getString(R.string.loading_failed)); setText(getString(R.string.untitled), getString(R.string.loading_failed));
if (mProgressDialog != null && mProgressDialog.isShowing()) { } else {
mProgressDialog.dismiss(); setText(item.getTitle(), item.getBody());
mProgressDialog = null;
}
} }
}
@Override @Override
public void onComplete() { public void onError(@NonNull Throwable throwable) {
if (mProgressDialog != null && mProgressDialog.isShowing()) { setText(getString(R.string.untitled), getString(R.string.loading_failed));
mProgressDialog.dismiss(); if (mProgressDialog != null && mProgressDialog.isShowing()) {
mProgressDialog = null; mProgressDialog.dismiss();
} mProgressDialog = null;
} }
}); }
@Override
public void onComplete() {
if (mProgressDialog != null && mProgressDialog.isShowing()) {
mProgressDialog.dismiss();
mProgressDialog = null;
}
}
});
return true; return true;
} }
@ -287,9 +289,8 @@ public class ReadingActivity extends AppCompatActivity {
finish(); finish();
break; break;
case R.id.text_size_item: case R.id.text_size_item:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
LayoutInflater inflater = this.getLayoutInflater(); View view = LayoutInflater.from(this).inflate(R.layout.seek_layout, null);
View view = inflater.inflate(R.layout.seek_layout, null);
final SeekBar bar = (SeekBar) view.findViewById(R.id.text_size_seekbar); final SeekBar bar = (SeekBar) view.findViewById(R.id.text_size_seekbar);
bar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() { bar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
@ -309,18 +310,20 @@ public class ReadingActivity extends AppCompatActivity {
}); });
bar.setMax(5); bar.setMax(5);
bar.setProgress(mTextSize); bar.setProgress(mTextSize);
builder.setView(view);
builder.setTitle(R.string.size);
builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
@Override AlertDialog.Builder builder = new AlertDialog.Builder(this)
public void onClick(DialogInterface arg0, int arg1) { .setView(view)
mTextSize = bar.getProgress(); .setTitle(R.string.size)
mBody.setTextSize(getTextSize(mTextSize)); .setPositiveButton(android.R.string.ok, new OnClickListener() {
mPreferences.setReadingTextSize(bar.getProgress());
}
}); @Override
public void onClick(DialogInterface dialog, int arg1) {
mTextSize = bar.getProgress();
mBody.setTextSize(getTextSize(mTextSize));
mPreferences.setReadingTextSize(bar.getProgress());
}
});
Dialog dialog = builder.show(); Dialog dialog = builder.show();
BrowserDialog.setDialogSize(this, dialog); BrowserDialog.setDialogSize(this, dialog);
break; break;

46
app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.java
View File

@ -123,37 +123,39 @@ public class BrowserDialog {
}); });
} }
public static void showEditText(@NonNull Activity activity, @StringRes int title, public static void showEditText(@NonNull Activity activity,
@StringRes int hint, @StringRes int action, @StringRes int title,
@StringRes int hint,
@StringRes int action,
@NonNull final EditorListener listener) { @NonNull final EditorListener listener) {
showEditText(activity, title, hint, null, action, listener); showEditText(activity, title, hint, null, action, listener);
} }
public static void showEditText(@NonNull Activity activity, @StringRes int title, public static void showEditText(@NonNull Activity activity,
@StringRes int hint, @Nullable String currentText, @StringRes int title,
@StringRes int action, @NonNull final EditorListener listener) { @StringRes int hint,
final AlertDialog.Builder editorDialog = new AlertDialog.Builder(activity); @Nullable String currentText,
editorDialog.setTitle(title); @StringRes int action,
final EditText editText = new EditText(activity); @NonNull final EditorListener listener) {
View dialogView = LayoutInflater.from(activity).inflate(R.layout.dialog_edit_text, null);
final EditText editText = (EditText) dialogView.findViewById(R.id.dialog_edit_text);
editText.setHint(hint); editText.setHint(hint);
if (currentText != null) { if (currentText != null) {
editText.setText(currentText); editText.setText(currentText);
} }
editText.setSingleLine();
LinearLayout layout = new LinearLayout(activity);
layout.setOrientation(LinearLayout.VERTICAL);
int padding = Utils.dpToPx(10);
layout.setPadding(padding, padding, padding, padding);
layout.addView(editText);
editorDialog.setView(layout);
editorDialog.setPositiveButton(action,
new DialogInterface.OnClickListener() {
@Override final AlertDialog.Builder editorDialog = new AlertDialog.Builder(activity)
public void onClick(DialogInterface dialog, int which) { .setTitle(title)
listener.onClick(editText.getText().toString()); .setView(dialogView)
} .setPositiveButton(action,
}); new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
listener.onClick(editText.getText().toString());
}
});
Dialog dialog = editorDialog.show(); Dialog dialog = editorDialog.show();
setDialogSize(activity, dialog); setDialogSize(activity, dialog);

123
app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java
View File

@ -17,10 +17,9 @@ import android.support.v7.app.AlertDialog;
import android.text.Editable; import android.text.Editable;
import android.text.InputFilter; import android.text.InputFilter;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout;
import acr.browser.lightning.BuildConfig; import acr.browser.lightning.BuildConfig;
import acr.browser.lightning.R; import acr.browser.lightning.R;
@ -31,7 +30,7 @@ import acr.browser.lightning.utils.ProxyUtils;
import acr.browser.lightning.utils.ThemeUtils; import acr.browser.lightning.utils.ThemeUtils;
import acr.browser.lightning.utils.Utils; import acr.browser.lightning.utils.Utils;
import static acr.browser.lightning.preference.PreferenceManager.*; import static acr.browser.lightning.preference.PreferenceManager.Suggestion;
public class GeneralSettingsFragment extends LightningPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener { public class GeneralSettingsFragment extends LightningPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
@ -163,24 +162,20 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme
} }
private void searchUrlPicker() { private void searchUrlPicker() {
final AlertDialog.Builder urlPicker = new AlertDialog.Builder(mActivity);
urlPicker.setTitle(getResources().getString(R.string.custom_url)); BrowserDialog.showEditText(mActivity,
final EditText getSearchUrl = new EditText(mActivity); R.string.custom_url,
String mSearchUrl = mPreferenceManager.getSearchUrl(); R.string.custom_url,
getSearchUrl.setText(mSearchUrl); mPreferenceManager.getSearchUrl(),
urlPicker.setView(getSearchUrl); R.string.action_ok,
urlPicker.setPositiveButton(getResources().getString(R.string.action_ok), new BrowserDialog.EditorListener() {
new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(String text) {
String text = getSearchUrl.getText().toString();
mPreferenceManager.setSearchUrl(text); mPreferenceManager.setSearchUrl(text);
searchengine.setSummary(getResources().getString(R.string.custom_url) + ": " searchengine.setSummary(mActivity.getString(R.string.custom_url) + ": " + text);
+ text);
} }
}); });
Dialog dialog = urlPicker.show();
BrowserDialog.setDialogSize(mActivity, dialog);
} }
private void getFlashChoice() { private void getFlashChoice() {
@ -217,7 +212,7 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme
private void proxyChoicePicker() { private void proxyChoicePicker() {
AlertDialog.Builder picker = new AlertDialog.Builder(mActivity); AlertDialog.Builder picker = new AlertDialog.Builder(mActivity);
picker.setTitle(getResources().getString(R.string.http_proxy)); picker.setTitle(R.string.http_proxy);
picker.setSingleChoiceItems(mProxyChoices, mPreferenceManager.getProxyChoice(), picker.setSingleChoiceItems(mProxyChoices, mPreferenceManager.getProxyChoice(),
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@ -226,7 +221,7 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme
setProxyChoice(which); setProxyChoice(which);
} }
}); });
picker.setPositiveButton(getResources().getString(R.string.action_ok), null); picker.setPositiveButton(R.string.action_ok, null);
Dialog dialog = picker.show(); Dialog dialog = picker.show();
BrowserDialog.setDialogSize(mActivity, dialog); BrowserDialog.setDialogSize(mActivity, dialog);
} }
@ -252,7 +247,7 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme
} }
private void manualProxyPicker() { private void manualProxyPicker() {
View v = mActivity.getLayoutInflater().inflate(R.layout.picker_manual_proxy, null); View v = mActivity.getLayoutInflater().inflate(R.layout.dialog_manual_proxy, null);
final EditText eProxyHost = (EditText) v.findViewById(R.id.proxyHost); final EditText eProxyHost = (EditText) v.findViewById(R.id.proxyHost);
final EditText eProxyPort = (EditText) v.findViewById(R.id.proxyPort); final EditText eProxyPort = (EditText) v.findViewById(R.id.proxyPort);
@ -405,28 +400,26 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme
} }
private void homePicker() { private void homePicker() {
final AlertDialog.Builder homePicker = new AlertDialog.Builder(mActivity); String currentHomepage;
homePicker.setTitle(getResources().getString(R.string.title_custom_homepage));
final EditText getHome = new EditText(mActivity);
mHomepage = mPreferenceManager.getHomepage(); mHomepage = mPreferenceManager.getHomepage();
if (!mHomepage.startsWith(Constants.ABOUT)) { if (!mHomepage.startsWith(Constants.ABOUT)) {
getHome.setText(mHomepage); currentHomepage = mHomepage;
} else { } else {
String defaultUrl = "https://www.google.com"; currentHomepage = "https://www.google.com";
getHome.setText(defaultUrl);
} }
homePicker.setView(getHome);
homePicker.setPositiveButton(getResources().getString(R.string.action_ok), BrowserDialog.showEditText(mActivity,
new DialogInterface.OnClickListener() { R.string.title_custom_homepage,
R.string.title_custom_homepage,
currentHomepage,
R.string.action_ok,
new BrowserDialog.EditorListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(String text) {
String text = getHome.getText().toString();
mPreferenceManager.setHomepage(text); mPreferenceManager.setHomepage(text);
home.setSummary(text); home.setSummary(text);
} }
}); });
Dialog dialog = homePicker.show();
BrowserDialog.setDialogSize(mActivity, dialog);
} }
private void downloadLocDialog() { private void downloadLocDialog() {
@ -492,49 +485,45 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme
} }
private void agentPicker() { private void agentPicker() {
final AlertDialog.Builder agentStringPicker = new AlertDialog.Builder(mActivity);
agentStringPicker.setTitle(getResources().getString(R.string.title_user_agent)); BrowserDialog.showEditText(mActivity,
final EditText getAgent = new EditText(mActivity); R.string.title_user_agent,
agentStringPicker.setView(getAgent); R.string.title_user_agent,
agentStringPicker.setPositiveButton(getResources().getString(R.string.action_ok), mPreferenceManager.getUserAgentString(""),
new DialogInterface.OnClickListener() { R.string.action_ok,
new BrowserDialog.EditorListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(String text) {
String text = getAgent.getText().toString();
mPreferenceManager.setUserAgentString(text); mPreferenceManager.setUserAgentString(text);
useragent.setSummary(getResources().getString(R.string.agent_custom)); useragent.setSummary(mActivity.getString(R.string.agent_custom));
} }
}); });
Dialog dialog = agentStringPicker.show();
BrowserDialog.setDialogSize(mActivity, dialog);
} }
private void downPicker() { private void downPicker() {
final AlertDialog.Builder downLocationPicker = new AlertDialog.Builder(mActivity);
LinearLayout layout = new LinearLayout(mActivity); View dialogView = LayoutInflater.from(mActivity).inflate(R.layout.dialog_edit_text, null);
downLocationPicker.setTitle(getResources().getString(R.string.title_download_location)); final EditText getDownload = (EditText) dialogView.findViewById(R.id.dialog_edit_text);
final EditText getDownload = new EditText(mActivity);
getDownload.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, final int errorColor = ContextCompat.getColor(mActivity, R.color.error_red);
ViewGroup.LayoutParams.WRAP_CONTENT)); final int regularColor = ThemeUtils.getTextColor(mActivity);
getDownload.setText(mPreferenceManager.getDownloadDirectory());
final int errorColor = ContextCompat.getColor(getActivity(), R.color.error_red);
final int regularColor = ThemeUtils.getTextColor(getActivity());
getDownload.setTextColor(regularColor); getDownload.setTextColor(regularColor);
getDownload.addTextChangedListener(new DownloadLocationTextWatcher(getDownload, errorColor, regularColor)); getDownload.addTextChangedListener(new DownloadLocationTextWatcher(getDownload, errorColor, regularColor));
getDownload.setText(mPreferenceManager.getDownloadDirectory()); getDownload.setText(mPreferenceManager.getDownloadDirectory());
layout.addView(getDownload); AlertDialog.Builder downLocationPicker = new AlertDialog.Builder(mActivity)
downLocationPicker.setView(layout); .setTitle(R.string.title_download_location)
downLocationPicker.setPositiveButton(getResources().getString(R.string.action_ok), .setView(dialogView)
new DialogInterface.OnClickListener() { .setPositiveButton(R.string.action_ok,
@Override new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { @Override
String text = getDownload.getText().toString(); public void onClick(DialogInterface dialog, int which) {
text = DownloadHandler.addNecessarySlashes(text); String text = getDownload.getText().toString();
mPreferenceManager.setDownloadDirectory(text); text = DownloadHandler.addNecessarySlashes(text);
downloadloc.setSummary(text); mPreferenceManager.setDownloadDirectory(text);
} downloadloc.setSummary(text);
}); }
});
Dialog dialog = downLocationPicker.show(); Dialog dialog = downLocationPicker.show();
BrowserDialog.setDialogSize(mActivity, dialog); BrowserDialog.setDialogSize(mActivity, dialog);
} }
@ -640,11 +629,11 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme
} }
private static class DownloadLocationTextWatcher implements TextWatcher { private static class DownloadLocationTextWatcher implements TextWatcher {
private final EditText getDownload; @NonNull private final EditText getDownload;
private final int errorColor; private final int errorColor;
private final int regularColor; private final int regularColor;
public DownloadLocationTextWatcher(EditText getDownload, int errorColor, int regularColor) { public DownloadLocationTextWatcher(@NonNull EditText getDownload, int errorColor, int regularColor) {
this.getDownload = getDownload; this.getDownload = getDownload;
this.errorColor = errorColor; this.errorColor = errorColor;
this.regularColor = regularColor; this.regularColor = regularColor;

6
app/src/main/java/acr/browser/lightning/view/LightningWebClient.java
View File

@ -141,9 +141,9 @@ public class LightningWebClient extends WebViewClient {
realmLabel.setText(mActivity.getString(R.string.label_realm, realm)); realmLabel.setText(mActivity.getString(R.string.label_realm, realm));
builder.setView(dialogView) builder.setView(dialogView)
.setTitle(mActivity.getString(R.string.title_sign_in)) .setTitle(R.string.title_sign_in)
.setCancelable(true) .setCancelable(true)
.setPositiveButton(mActivity.getString(R.string.title_sign_in), .setPositiveButton(R.string.title_sign_in,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@ -153,7 +153,7 @@ public class LightningWebClient extends WebViewClient {
Log.d(TAG, "Attempting HTTP Authentication"); Log.d(TAG, "Attempting HTTP Authentication");
} }
}) })
.setNegativeButton(mActivity.getString(R.string.action_cancel), .setNegativeButton(R.string.action_cancel,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {

32
app/src/main/res/layout/dialog_edit_bookmark.xml
View File

@ -1,29 +1,33 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="10dp"> android:orientation="vertical"
android:padding="@dimen/dialog_padding">
<EditText <EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/bookmark_title" android:id="@+id/bookmark_title"
android:singleLine="true"
android:hint="@string/hint_title"/>
<EditText
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/hint_title"
android:maxLines="1"
android:singleLine="true"/>
<EditText
android:id="@+id/bookmark_url" android:id="@+id/bookmark_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hint_url" android:hint="@string/hint_url"
android:singleLine="true" android:inputType="textUri"
android:inputType="textUri"/> android:maxLines="1"
android:singleLine="true"/>
<AutoCompleteTextView <AutoCompleteTextView
android:id="@+id/bookmark_folder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/bookmark_folder"
android:hint="@string/folder" android:hint="@string/folder"
android:maxLines="1"
android:singleLine="true"/> android:singleLine="true"/>
</LinearLayout> </LinearLayout>

16
app/src/main/res/layout/dialog_edit_text.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="@dimen/dialog_padding">
<EditText
android:id="@+id/dialog_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
android:maxLines="1"/>
</LinearLayout>

18
app/src/main/res/layout/picker_manual_proxy.xml → app/src/main/res/layout/dialog_manual_proxy.xml
View File

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="4dp" android:padding="@dimen/dialog_padding">
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingStart="4dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -15,14 +13,15 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/host" /> android:layout_marginRight="@dimen/default_padding"
android:text="@string/host"/>
<EditText <EditText
android:id="@+id/proxyHost" android:id="@+id/proxyHost"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:inputType="text" /> android:inputType="text"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -32,14 +31,15 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/port" /> android:layout_marginRight="@dimen/default_padding"
android:text="@string/port"/>
<EditText <EditText
android:id="@+id/proxyPort" android:id="@+id/proxyPort"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:inputType="number" /> android:inputType="number"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>