diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-05-09 08:17:32 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-05-09 08:17:32 +0200 |
| commit | 7b1c980547211e9bc26f3f12e934d128b7da254f (patch) | |
| tree | 7bbe7635f1d27879314d571eeaafe4d3c7e569ac /main | |
| parent | db88f86e0756ea44414a4da9353af36e39d511dc (diff) | |
| download | cgeo-7b1c980547211e9bc26f3f12e934d128b7da254f.zip cgeo-7b1c980547211e9bc26f3f12e934d128b7da254f.tar.gz cgeo-7b1c980547211e9bc26f3f12e934d128b7da254f.tar.bz2 | |
refactoring: Lint cleanups
Diffstat (limited to 'main')
| -rw-r--r-- | main/lint.xml | 1 | ||||
| -rw-r--r-- | main/res/layout/editor.xml | 25 | ||||
| -rw-r--r-- | main/res/values-it/strings.xml | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/ui/EditNoteDialog.java | 13 |
5 files changed, 14 insertions, 29 deletions
diff --git a/main/lint.xml b/main/lint.xml index c5b2b18..b165280 100644 --- a/main/lint.xml +++ b/main/lint.xml @@ -2,6 +2,7 @@ <lint> <issue id="ContentDescription" severity="ignore" /> <issue id="ExportedContentProvider" severity="ignore" /> + <issue id="InvalidPackage" severity="ignore" /> <issue id="MissingTranslation" severity="ignore" /> <issue id="Registered" severity="ignore" /> </lint>
\ No newline at end of file diff --git a/main/res/layout/editor.xml b/main/res/layout/editor.xml deleted file mode 100644 index d556836..0000000 --- a/main/res/layout/editor.xml +++ /dev/null @@ -1,25 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/linearLayout1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <EditText - android:id="@+id/editorEditText" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:inputType="textMultiLine" - android:scrollbars="vertical" > - - <requestFocus /> - </EditText> - - <Button - android:id="@+id/editorSave" - style="@style/button_full" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/editor_save" /> - -</LinearLayout>
\ No newline at end of file diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index a36493d..b3af349 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -1005,7 +1005,7 @@ <string name="attribute_inside_no">Senza aree interne</string> <string name="attribute_in_water_yes">In acqua</string> <string name="attribute_in_water_no">Non in acqua</string> - <string name="attribute_no_gps_yes">Senza GPS (lettere, cistes, carta e bussola...)</string> + <string name="attribute_no_gps_yes">Senza GPS (lettere, cistes, carta e bussola…)</string> <string name="attribute_no_gps_no">Con GPS</string> <string name="attribute_overnight_yes">Necessario permanere di notte</string> <string name="attribute_overnight_no">Permanenza notturna non necessaria</string> diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index fe17c06..b0bee55 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1785,7 +1785,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB)); } }; final FragmentManager fm = getSupportFragmentManager(); - final EditNoteDialog dialog = new EditNoteDialog(cache.getPersonalNote()); + final EditNoteDialog dialog = EditNoteDialog.newInstance(cache.getPersonalNote()); dialog.show(fm, "fragment_edit_note"); } }); diff --git a/main/src/cgeo/geocaching/ui/EditNoteDialog.java b/main/src/cgeo/geocaching/ui/EditNoteDialog.java index 23e57f2..4d3ab6f 100644 --- a/main/src/cgeo/geocaching/ui/EditNoteDialog.java +++ b/main/src/cgeo/geocaching/ui/EditNoteDialog.java @@ -21,6 +21,8 @@ public class EditNoteDialog extends DialogFragment implements OnEditorActionList void onFinishEditNoteDialog(final String inputText); } + public static final String ARGUMENT_INITIAL_NOTE = "initialNote"; + private EditText mEditText; private String initialNote; @@ -28,8 +30,14 @@ public class EditNoteDialog extends DialogFragment implements OnEditorActionList // Empty constructor required for DialogFragment } - public EditNoteDialog(final String initialNote) { - this.initialNote = initialNote; + public static EditNoteDialog newInstance(final String initialNote) { + EditNoteDialog dialog = new EditNoteDialog(); + + Bundle arguments = new Bundle(); + arguments.putString(EditNoteDialog.ARGUMENT_INITIAL_NOTE, initialNote); + dialog.setArguments(arguments); + + return dialog; } @Override @@ -37,6 +45,7 @@ public class EditNoteDialog extends DialogFragment implements OnEditorActionList final Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_edit_note, container); mEditText = (EditText) view.findViewById(R.id.note); + initialNote = getArguments().getString(ARGUMENT_INITIAL_NOTE); if (initialNote != null) { mEditText.setText(initialNote); initialNote = null; |
