Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
@FleetAdmiralJakob
FleetAdmiralJakob committed Nov 25, 2022
1 parent 93b3a85 commit 2feaf83
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .idea/codestream.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file renamed app/release/app-1.9.0-release.apk → app/release/app-1.10.0-release.apk
View file
Binary file not shown.
134 changes: 110 additions & 24 deletions app/src/main/java/com/jakob/tippy/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ class MainActivity : AppCompatActivity() {
updateCurrencySpinner()
updateLanguage()
saveToSharedPrefCountry()
// Get variable progress
val progress = seekBarTip.progress
updateTipDescription(progress)
}

override fun onNothingSelected(parent: AdapterView<*>?) {}
Expand Down Expand Up @@ -209,16 +212,29 @@ class MainActivity : AppCompatActivity() {
// DE
tvBaseLabel.text = getString(R.string.base_de)
tvTipLabel.text = getString(R.string.tip_de)
tvTotalLabel.text = getString(R.string.total_de)
tvTotalLabel.text = getString(R.string.total)
tvPeopleLabel.text = getString(R.string.people_de)
tvServiceLabel.text = getString(R.string.service_de)
tvServiceLabel.text = getString(R.string.service)
tvCountryLabel.text = getString(R.string.country_de)
etBaseAmount.hint = getString(R.string.bill_amount_de)
tvFooter.text = getString(R.string.credit_de)
tvPerPerson.text = getString(R.string.per_person_de)
tvGitHub.text = getString(R.string.view_on_github_de)
}
1 -> {
// FR
tvBaseLabel.text = getString(R.string.base_fr)
tvTipLabel.text = getString(R.string.tip_fr)
tvTotalLabel.text = getString(R.string.total)
tvPeopleLabel.text = getString(R.string.people_fr)
tvServiceLabel.text = getString(R.string.service)
tvCountryLabel.text = getString(R.string.country_fr)
etBaseAmount.hint = getString(R.string.bill_amount_fr)
tvFooter.text = getString(R.string.credit_fr)
tvPerPerson.text = getString(R.string.per_person_fr)
tvGitHub.text = getString(R.string.view_on_github_fr)
}
2 -> {
// EN Normal (Default Value)
tvBaseLabel.text = getString(R.string.base)
tvTipLabel.text = getString(R.string.tip)
Expand All @@ -231,7 +247,7 @@ class MainActivity : AppCompatActivity() {
tvPerPerson.text = getString(R.string.per_person)
tvGitHub.text = getString(R.string.view_on_github)
}
2 -> {
3 -> {
// EN Normal (Default Value)
tvBaseLabel.text = getString(R.string.base)
tvTipLabel.text = getString(R.string.tip)
Expand All @@ -244,7 +260,7 @@ class MainActivity : AppCompatActivity() {
tvPerPerson.text = getString(R.string.per_person)
tvGitHub.text = getString(R.string.view_on_github)
}
3 -> {
4 -> {
// EN Normal (Default Value)
tvBaseLabel.text = getString(R.string.base)
tvTipLabel.text = getString(R.string.tip)
Expand All @@ -257,13 +273,15 @@ class MainActivity : AppCompatActivity() {
tvPerPerson.text = getString(R.string.per_person)
tvGitHub.text = getString(R.string.view_on_github)
}
4 -> {
5 -> {
// JP
tvBaseLabel.text = getString(R.string.base_jp)
tvCountryLabel.text = getString(R.string.country_jp)
}
5 -> {
6 -> {
// PL
}
6 -> {
7 -> {
// RU
}
}
Expand All @@ -277,16 +295,29 @@ class MainActivity : AppCompatActivity() {
// DE
tvBaseLabel.text = getString(R.string.base_de)
tvTipLabel.text = getString(R.string.tip_de)
tvTotalLabel.text = getString(R.string.total_de)
tvTotalLabel.text = getString(R.string.total)
tvPeopleLabel.text = getString(R.string.people_de)
tvServiceLabel.text = getString(R.string.service_de)
tvServiceLabel.text = getString(R.string.service)
tvCountryLabel.text = getString(R.string.country_de)
etBaseAmount.hint = getString(R.string.bill_amount_de)
tvFooter.text = getString(R.string.credit_de)
tvPerPerson.text = getString(R.string.per_person_de)
tvGitHub.text = getString(R.string.view_on_github_de)
}
1 -> {
// FR
tvBaseLabel.text = getString(R.string.base_fr)
tvTipLabel.text = getString(R.string.tip_fr)
tvTotalLabel.text = getString(R.string.total)
tvPeopleLabel.text = getString(R.string.people_fr)
tvServiceLabel.text = getString(R.string.service)
tvCountryLabel.text = getString(R.string.country_fr)
etBaseAmount.hint = getString(R.string.bill_amount_fr)
tvFooter.text = getString(R.string.credit_fr)
tvPerPerson.text = getString(R.string.per_person_fr)
tvGitHub.text = getString(R.string.view_on_github_fr)
}
2 -> {
// EN Normal (Default Value)
tvBaseLabel.text = getString(R.string.base)
tvTipLabel.text = getString(R.string.tip)
Expand All @@ -299,7 +330,7 @@ class MainActivity : AppCompatActivity() {
tvPerPerson.text = getString(R.string.per_person)
tvGitHub.text = getString(R.string.view_on_github)
}
2 -> {
3 -> {
// EN Normal (Default Value)
tvBaseLabel.text = getString(R.string.base)
tvTipLabel.text = getString(R.string.tip)
Expand All @@ -312,7 +343,7 @@ class MainActivity : AppCompatActivity() {
tvPerPerson.text = getString(R.string.per_person)
tvGitHub.text = getString(R.string.view_on_github)
}
3 -> {
4 -> {
// EN Normal (Default Value)
tvBaseLabel.text = getString(R.string.base)
tvTipLabel.text = getString(R.string.tip)
Expand All @@ -325,13 +356,15 @@ class MainActivity : AppCompatActivity() {
tvPerPerson.text = getString(R.string.per_person)
tvGitHub.text = getString(R.string.view_on_github)
}
4 -> {
5 -> {
// JP
tvBaseLabel.text = getString(R.string.base_jp)
tvCountryLabel.text = getString(R.string.country_jp)
}
5 -> {
6 -> {
// PL
}
6 -> {
7 -> {
// RU
}
}
Expand All @@ -345,11 +378,12 @@ class MainActivity : AppCompatActivity() {
val currency = when (countrySpinner.selectedItemPosition) {
0 -> 0
1 -> 0
2 -> 1
3 -> 2
4 -> 3
5 -> 4
6 -> 5
2 -> 0
3 -> 1
4 -> 2
5 -> 3
6 -> 4
7 -> 5
else -> 0
}
currenciesSpinner.setSelection(currency)
Expand All @@ -374,11 +408,63 @@ class MainActivity : AppCompatActivity() {

private fun updateTipDescription(tipPercent: Int) {
val tipDescription = when (tipPercent) {
in 0..9 -> "Poor 😕"
in 10..14 -> "Acceptable 😐"
in 15..19 -> "Good 😌"
in 20..24 -> "Great 😁"
else -> "Amazing 😍"
in 0..9 -> {
when (countrySpinner.selectedItemPosition) {
0 -> getString(R.string.poor_de)
1 -> getString(R.string.poor_fr)
2 -> getString(R.string.poor)
3 -> getString(R.string.poor)
4 -> getString(R.string.poor)
5 -> getString(R.string.poor)
6 -> getString(R.string.poor)
7 -> getString(R.string.poor)
else -> getString(R.string.poor)
}
}
in 10..14 -> when (countrySpinner.selectedItemPosition) {
0 -> getString(R.string.acceptable_de)
1 -> getString(R.string.acceptable_fr)
2 -> getString(R.string.acceptable)
3 -> getString(R.string.acceptable)
4 -> getString(R.string.acceptable)
5 -> getString(R.string.acceptable)
6 -> getString(R.string.acceptable)
7 -> getString(R.string.acceptable)
else -> getString(R.string.acceptable)
}
in 15..19 -> when (countrySpinner.selectedItemPosition) {
0 -> getString(R.string.good_de)
1 -> getString(R.string.good_fr)
2 -> getString(R.string.good)
3 -> getString(R.string.good)
4 -> getString(R.string.good)
5 -> getString(R.string.good)
6 -> getString(R.string.good)
7 -> getString(R.string.good)
else -> getString(R.string.good)
}
in 20..24 -> when (countrySpinner.selectedItemPosition) {
0 -> getString(R.string.great_de)
1 -> getString(R.string.great_fr)
2 -> getString(R.string.great)
3 -> getString(R.string.great)
4 -> getString(R.string.great)
5 -> getString(R.string.great)
6 -> getString(R.string.great)
7 -> getString(R.string.great)
else -> getString(R.string.great)
}
else -> when (countrySpinner.selectedItemPosition) {
0 -> getString(R.string.excellent_de)
1 -> getString(R.string.excellent_fr)
2 -> getString(R.string.excellent)
3 -> getString(R.string.excellent)
4 -> getString(R.string.excellent)
5 -> getString(R.string.excellent)
6 -> getString(R.string.excellent)
7 -> getString(R.string.excellent)
else -> getString(R.string.excellent)
}
}
tvTipDescription.text = tipDescription
val color = ArgbEvaluator().evaluate(
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/countries_array.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<resources>
<string-array name="countries_array">
<item>Germany 🇩🇪</item>
<item>France 🇫🇷</item>
<item>EU 🇪🇺</item>
<item>USA 🇺🇸</item>
<item>UK 🇬🇧</item>
Expand Down
32 changes: 30 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,59 @@

<string name="base">Base</string>
<string name="base_de">Rechnung</string>
<string name="base_fr">Facture</string>
<string name="base_jp">請求書</string>

<string name="tip">Tip</string>
<string name="tip_de">Trinkgeld</string>
<string name="tip_fr">Pourboire</string>

<string name="total">Total</string>
<string name="total_de">Total</string>

<string name="people">People</string>
<string name="people_de">Personen</string>
<string name="people_fr">Personnes</string>

<string name="service">Service</string>
<string name="service_de">Service</string>

<string name="country">Country</string>
<string name="country_de">Land</string>
<string name="country_fr">Pays</string>
<string name="country_jp">国</string>

<string name="bill_amount">Bill amount</string>
<string name="bill_amount_de">Rechnungsbetrag</string>
<string name="bill_amount_fr">Montant de la facture</string>

<string name="credit">Made with ️️❤️ by Jakob</string>
<string name="credit_de">Mit ❤ erstellt von Jakob</string>
<string name="credit_fr">Créé avec ❤ par Jakob</string>

<string name="per_person">per person</string>
<string name="per_person_de">pro Person</string>
<string name="per_person_fr">par personne</string>

<string name="view_on_github">View on GitHub</string>
<string name="view_on_github_de">Auf GitHub ansehen</string>
<string name="view_on_github_fr">Voir sur GitHub</string>

<string name="poor">Poor 😕</string>
<string name="poor_de">Schlecht 😕</string>
<string name="poor_fr">Mauvais 😕</string>

<string name="acceptable">Acceptable 😐</string>
<string name="acceptable_de">Akzeptabel 😐</string>
<string name="acceptable_fr">Acceptable 😐</string>

<string name="good">Good 🙂</string>
<string name="good_de">Gut 🙂</string>
<string name="good_fr">Bon 🙂</string>

<string name="great">Great 😃</string>
<string name="great_de">Großartig 😃</string>
<string name="great_fr">Génial 😃</string>

<string name="excellent">Excellent 😍</string>
<string name="excellent_de">Ausgezeichnet 😍</string>
<string name="excellent_fr">Excellent 😍</string>
</resources>

0 comments on commit 2feaf83

Please sign in to comment.