Merge pull request #57 from garvsgit/Enter_city_keyboard

Added Enter Key to submit for City name Issue #56
IEEE-VIT · Oct 20, 2021 · 91f98ef · 91f98ef
2 parents d093ed0 + 4c0adec
commit 91f98ef
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 20 deletions.
diff --git a/app/src/main/java/com/example/weather/StartActivity.java b/app/src/main/java/com/example/weather/StartActivity.java
@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
@@ -32,6 +33,28 @@ public class StartActivity extends AppCompatActivity implements TextWatcher {
 
     AutoCompleteTextView city;
     ArrayList<String> cities;
+    final String continents[] = {"ASIA","EUROPE", "AFRICA","AUSTRALIA","NORTH AMERICA","SOUTH AMERICA","ANTARCTICA"};
+
+    void submitCity(){
+        for (int i = 0; i < continents.length; i++) {
+            if (city.getText().toString().toUpperCase().equals(continents[i])) {
+                Toast toast = Toast.makeText(getApplicationContext(), "Weather not found!", Toast.LENGTH_LONG);
+                toast.show();
+                break;
+            }
+            else {
+                String inputCity = city.getText().toString().trim();
+                if (!inputCity.equals("")) {
+
+                    isValidCity(inputCity);
+                    break;
+
+                } else {
+                    Toast.makeText(StartActivity.this, "Please enter a city's name!", Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+    }
 
     void isValidCity(final String city)
     {
@@ -96,32 +119,24 @@ protected void onCreate(Bundle savedInstanceState) {
 
         city.addTextChangedListener(this);
         city.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, cities));
+        city.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View view, int i, KeyEvent keyEvent) {
+                if(view.getId() == R.id.city_name){
+                    if(i == KeyEvent.KEYCODE_ENTER && keyEvent.getAction() == KeyEvent.ACTION_DOWN){
+                        submitCity();
+                    }
+                }
+                return false;
+            }
+        });
 
 
-
-        final String continents[] = {"ASIA","EUROPE", "AFRICA","AUSTRALIA","NORTH AMERICA","SOUTH AMERICA","ANTARCTICA"};
         Button go=findViewById(R.id.go);
         go.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                for (int i = 0; i < continents.length; i++) {
-                    if (city.getText().toString().toUpperCase().equals(continents[i])) {
-                        Toast toast = Toast.makeText(getApplicationContext(), "Weather not found!", Toast.LENGTH_LONG);
-                        toast.show();
-                        break;
-                    }
-                    else {
-                        String inputCity = city.getText().toString().trim();
-                        if (!inputCity.equals("")) {
-
-                            isValidCity(inputCity);
-                            break;
-
-                        } else {
-                            Toast.makeText(StartActivity.this, "Please enter a city's name!", Toast.LENGTH_SHORT).show();
-                        }
-                    }
-                }
+                submitCity();
             }
         });
     }

diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
@@ -33,6 +33,7 @@
 
     <AutoCompleteTextView
         android:id="@+id/city_name"
+        android:inputType="textAutoComplete"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@drawable/my_edittext_background"