.

FleetAdmiralJakob · Nov 12, 2022 · 974c105 · 974c105
1 parent 2fef672
commit 974c105
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/.idea/codestream.xml b/.idea/codestream.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdk 30
         targetSdk 33
         versionCode 1
-        versionName "1.0"
+        versionName "1.6.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/release/app-1.5.0-release.apk → app/release/app-1.6.0-release.apk b/app/release/app-1.5.0-release.apk → app/release/app-1.6.0-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "1.0",
+      "versionName": "1.6.0",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/jakob/tippy/MainActivity.kt b/app/src/main/java/com/jakob/tippy/MainActivity.kt
@@ -82,6 +82,10 @@ class MainActivity : AppCompatActivity() {
         updateTipDescription(INITIAL_TIP_PERCENT)
         getCurrencyTypeFromSharedPreferences()
 
+        etPeopleAmount.setText("1")
+
+        updateTvPerPerson()
+
         ivGitHub.setOnClickListener(View.OnClickListener {
             // This is the link to my GitHub
             val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/FleetAdmiralJakob/Tippy"))
@@ -138,16 +142,27 @@ class MainActivity : AppCompatActivity() {
         })
 
         etPeopleAmount.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
 
             override fun afterTextChanged(s: Editable?) {
                 computeTipAndTotal()
+                // If the text equals 1, then tvperperson should display nothing
+                updateTvPerPerson()
             }
         })
     }
 
+    private fun updateTvPerPerson() {
+        if (etPeopleAmount.text.toString() == "1") {
+            tvPerPerson.text = ""
+        } else {
+            updateLanguage()
+        }
+    }
+
     private fun updateLanguage() {
         // Every string of a language is located in a own string.xml file so I call the right language based on the selected position of my country spinner.
         when (countrySpinner.selectedItemPosition) {
@@ -213,6 +228,7 @@ class MainActivity : AppCompatActivity() {
                 // RU
             }
         }
+        updateTvPerPerson()
     }
 
     private fun updateCurrencySpinner() {