I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 53610265 authored by str4d's avatar str4d
Browse files

TextField* -> SingleTextField* for accuracy

parent 6754f6b5
No related branches found
No related tags found
No related merge requests found
......@@ -7,7 +7,7 @@ import net.i2p.android.wizard.model.MultipleFixedChoicePage;
import net.i2p.android.wizard.model.PageList;
import net.i2p.android.wizard.model.SingleFixedBooleanPage;
import net.i2p.android.wizard.model.SingleFixedChoicePage;
import net.i2p.android.wizard.model.TextFieldPage;
import net.i2p.android.wizard.model.SingleTextFieldPage;
public class TunnelWizardModel extends AbstractWizardModel {
public TunnelWizardModel(Context context) {
......@@ -27,10 +27,10 @@ public class TunnelWizardModel extends AbstractWizardModel {
.setChoices("Standard", "HTTP", "HTTP bidir", "IRC", "Streamr")
.setRequired(true))
.setRequired(true),
new TextFieldPage(this, "Name")
new SingleTextFieldPage(this, "Name")
.setDescription("The name of the tunnel, for identification in the tunnel list.")
.setRequired(true),
new TextFieldPage(this, "Description")
new SingleTextFieldPage(this, "Description")
.setDescription("A description of the tunnel. This is optional and purely informative."),
new SingleFixedBooleanPage(this, "Auto start")
.setDescription("Should the tunnel automatically start when the router starts?")
......
......@@ -16,7 +16,7 @@
package net.i2p.android.wizard.model;
import net.i2p.android.wizard.ui.TextFieldFragment;
import net.i2p.android.wizard.ui.SingleTextFieldFragment;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
......@@ -26,16 +26,16 @@ import java.util.ArrayList;
/**
* A page asking for a text field.
*/
public class TextFieldPage extends Page {
public class SingleTextFieldPage extends Page {
protected String mDesc = "";
public TextFieldPage(ModelCallbacks callbacks, String title) {
public SingleTextFieldPage(ModelCallbacks callbacks, String title) {
super(callbacks, title);
}
@Override
public Fragment createFragment() {
return TextFieldFragment.create(getKey());
return SingleTextFieldFragment.create(getKey());
}
@Override
......@@ -48,7 +48,7 @@ public class TextFieldPage extends Page {
return !TextUtils.isEmpty(mData.getString(SIMPLE_DATA_KEY));
}
public TextFieldPage setDescription(String desc) {
public SingleTextFieldPage setDescription(String desc) {
mDesc = desc;
return this;
}
......
......@@ -18,7 +18,7 @@ package net.i2p.android.wizard.ui;
import net.i2p.android.router.R;
import net.i2p.android.wizard.model.Page;
import net.i2p.android.wizard.model.TextFieldPage;
import net.i2p.android.wizard.model.SingleTextFieldPage;
import android.app.Activity;
import android.content.Context;
......@@ -32,24 +32,24 @@ import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.TextView;
public class TextFieldFragment extends Fragment {
public class SingleTextFieldFragment extends Fragment {
private static final String ARG_KEY = "key";
private PageFragmentCallbacks mCallbacks;
private String mKey;
private TextFieldPage mPage;
private SingleTextFieldPage mPage;
private TextView mFieldView;
public static TextFieldFragment create(String key) {
public static SingleTextFieldFragment create(String key) {
Bundle args = new Bundle();
args.putString(ARG_KEY, key);
TextFieldFragment fragment = new TextFieldFragment();
SingleTextFieldFragment fragment = new SingleTextFieldFragment();
fragment.setArguments(args);
return fragment;
}
public TextFieldFragment() {
public SingleTextFieldFragment() {
}
@Override
......@@ -58,13 +58,13 @@ public class TextFieldFragment extends Fragment {
Bundle args = getArguments();
mKey = args.getString(ARG_KEY);
mPage = (TextFieldPage) mCallbacks.onGetPage(mKey);
mPage = (SingleTextFieldPage) mCallbacks.onGetPage(mKey);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_wizard_page_text_field, container, false);
View rootView = inflater.inflate(R.layout.fragment_wizard_page_single_text_field, container, false);
((TextView) rootView.findViewById(android.R.id.title)).setText(mPage.getTitle());
((TextView) rootView.findViewById(R.id.wizard_text_field_desc)).setText(mPage.getDesc());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment