fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SimpleMobileTools:master' into master

This commit is contained in:
FunkyMuse 2023-08-23 09:29:05 +02:00 committed by GitHub
parent 34fc95a189 222ecfa6b6
commit 0dcfb1eb8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
View File

@ -167,7 +167,7 @@ class MainActivity : SimpleActivity(), Calculator {
private fun showHistory() {
HistoryHelper(this).getHistory {
if (it.isEmpty()) {
toast(com.simplemobiletools.calculator.R.string.history_empty)
toast(R.string.history_empty)
} else {
HistoryDialog(this, it, calc)
}
@ -220,8 +220,8 @@ class MainActivity : SimpleActivity(), Calculator {
private fun checkWhatsNewDialog() {
arrayListOf<Release>().apply {
add(Release(18, com.simplemobiletools.calculator.R.string.release_18))
add(Release(28, com.simplemobiletools.calculator.R.string.release_28))
add(Release(18, R.string.release_18))
add(Release(28, R.string.release_28))
checkWhatsNew(this, BuildConfig.VERSION_CODE)
}
}

2
app/src/main/res/values-de/strings.xml
View File

@ -8,7 +8,7 @@
<!-- History -->
<string name="history">Verlauf</string>
<string name="history_empty">Verlauf ist leer</string>
<string name="clear_history">Löschen</string>
<string name="clear_history">Leeren</string>
<string name="history_cleared">Verlauf ist gelöscht worden</string>
<!-- Settings -->
<string name="vibrate_on_button_press">Bei Tastendruck vibrieren</string>

2
fastlane/metadata/android/sk/short_description.txt
View File

@ -1 +1 @@
Kalkulačka pre vaše rýchle výpočty s pekným užívateľským rozhraním a bez reklám.
Kalkulačka pre vaše rýchle výpočty s pekným užívateľským rozhraním a bez reklám

4
gradle/libs.versions.toml
View File

@ -20,12 +20,12 @@ exp4j = "0.4.8"
#Room
room = "2.5.2"
#Simple tools
simple-commons = "53ad279f5e"
simple-commons = "b80b717ad3"
#Gradle
gradlePlugins-agp = "8.1.0"
#build
app-build-compileSDKVersion = "34"
app-build-targetSDK = "33"
app-build-targetSDK = "34"
app-build-minimumSDK = "23"
app-build-javaVersion = "VERSION_17"
app-build-kotlinJVMTarget = "17"