From 7e869e08376ab5b6aa6c41ad7dbaf26f4e0bb492 Mon Sep 17 00:00:00 2001
From: BGbaderguet <48762010+BGbaderguet@users.noreply.github.com>
Date: Mon, 9 Nov 2020 20:01:15 +0100
Subject: [PATCH] Just cleaning the code and adding some function (like reset
 the form)

---
 .idea/gradle.xml                              |  1 +
 .../fr/romanet/vj/apps/myweather/AddCity.java | 42 ++++++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 23a89bb..b617266 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="PLATFORM" />
+        <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
diff --git a/app/src/main/java/fr/romanet/vj/apps/myweather/AddCity.java b/app/src/main/java/fr/romanet/vj/apps/myweather/AddCity.java
index f9e7fcc..90f942e 100644
--- a/app/src/main/java/fr/romanet/vj/apps/myweather/AddCity.java
+++ b/app/src/main/java/fr/romanet/vj/apps/myweather/AddCity.java
@@ -2,41 +2,55 @@ package fr.romanet.vj.apps.myweather;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import fr.romanet.vj.apps.myweather.bo.City;
+import fr.romanet.vj.apps.myweather.repository.CityRepository;
 
 public class AddCity extends AppCompatActivity {
 
+    private EditText cityName;
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.add_city_page);
+
         Toolbar toolbarAddCity = (Toolbar) findViewById(R.id.toolbarAddCity);
         setSupportActionBar(toolbarAddCity);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setDisplayShowHomeEnabled(true);
+
         Button button = (Button) findViewById(R.id.btnSaveCity);
-        button.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                EditText editTextnewCity =  (EditText) findViewById(R.id.editTextNewCity);
-                String newCity = (String) editTextnewCity.getText().toString();
-                if(editTextnewCity.length() == 0)
+        button.setOnClickListener(new View.OnClickListener()
+        {
+            public void onClick(View v)
+            {
+                cityName =  (EditText) findViewById(R.id.editTextNewCity);
+                final String newCityString = cityName.getEditableText().toString();
+                if(newCityString.length() == 0)
                 {
-                    editTextnewCity.setError("Please, enter a city name");
+                    cityName.setError("Please, enter a city name");
                 }
                 else
-                    System.out.println(newCity);
-                    //Ajoute la ville a une base de données
-                //Prélève le texte avec le get
-                    //S'il est vide on l'alert et on fais rien
-                        //Sinon écran d'accueil qui change
+                    saveCity(newCityString);
+                    resetForm();
             }
         });
     }
+
+    private void resetForm()
+    {
+        cityName.setText(null);
+    }
+
+    private void saveCity(String cityName)
+    {
+        CityRepository.getInstance(this).addCity(new City(cityName));
+    }
+
 }
\ No newline at end of file