X-Git-Url: http://git.pk910.de/?p=DHBWCampusApp.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2Ffragments%2FSettings.java;h=e34eb72cf9203fdda130a42fe21c0656e169077d;hp=f59d2237469d7b54b03f8cc887bb35d0a7d082e5;hb=17d3a2ce93fd3ba1ec692dea601f246ef8e068b2;hpb=48e758721a39298a85c69ecc7267f3daf6993e78
diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/Settings.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/Settings.java
index f59d223..e34eb72 100644
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/Settings.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/Settings.java
@@ -14,22 +14,30 @@
* along with this program. If not, see .
*/
package de.dhbwloe.campusapp.fragments;
+import android.content.Context;
import android.os.Bundle;
import android.support.v4.app.Fragment;
+import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
import android.widget.EditText;
import android.widget.Spinner;
+import android.widget.TextView;
import de.dhbwloe.campusapp.CampusAppFragment;
import de.dhbwloe.campusapp.R;
+import de.dhbwloe.campusapp.coursenames.CourseName;
/**
* A simple {@link Fragment} subclass.
*/
public class Settings extends CampusAppFragment {
- private EditText courseNameInput;
+ private AutoCompleteTextView courseNameInput;
private Spinner mensaRoleInput;
public Settings() {
@@ -42,9 +50,36 @@ public class Settings extends CampusAppFragment {
Bundle savedInstanceState) {
oFragmentView = inflater.inflate(R.layout.fragment_settings, container, false);
- courseNameInput = (EditText) oFragmentView.findViewById(R.id.courseNameInput);
+ courseNameInput = (AutoCompleteTextView) oFragmentView.findViewById(R.id.courseNameInput);
mensaRoleInput = (Spinner) oFragmentView.findViewById(R.id.mensaRoleInput);
+ courseNameInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
+ courseNameInput.setOnEditorActionListener(
+ new EditText.OnEditorActionListener() {
+ @Override
+ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+ if (actionId == EditorInfo.IME_ACTION_SEARCH ||
+ actionId == EditorInfo.IME_ACTION_DONE ||
+ event.getAction() == KeyEvent.ACTION_DOWN &&
+ event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+
+ InputMethodManager imm = (InputMethodManager)AppContext.getMainActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+ return true;
+ }
+ return false;
+ }
+ });
+
+ CourseName names[] = AppContext.getDatabaseManager().getCourseNames();
+ String courseNames[] = new String[names.length];
+ for(int i = 0; i < names.length; i++) {
+ courseNames[i] = names[i].getName();
+ }
+
+ ArrayAdapter adapter = new ArrayAdapter(AppContext.getMainActivity(), android.R.layout.simple_list_item_1, courseNames);
+ courseNameInput.setAdapter(adapter);
+
return oFragmentView;
}
@@ -82,7 +117,7 @@ public class Settings extends CampusAppFragment {
String mensaRoleName = AppContext.getDatabaseManager().getRuntimeCache("MensaRole");
if (mensaRoleName == null || mensaRoleName.isEmpty())
- mensaRoleName = "";
+ mensaRoleName = "0";
String newMensaRoleName = Integer.toString(mensaRoleInput.getSelectedItemPosition());
if(!mensaRoleName.equalsIgnoreCase(newMensaRoleName)) {
AppContext.getDatabaseManager().setRuntimeCache("MensaRole", newMensaRoleName);
@@ -91,7 +126,6 @@ public class Settings extends CampusAppFragment {
if(overrideNavigation) {
AppContext.getNavigationManager().navigatePage("Splashscreen", null, false);
-
}
}
}