From d10ab08aa6fc1a109be9d62bbb977db974beb219 Mon Sep 17 00:00:00 2001 From: solokot Date: Wed, 18 Jan 2023 15:50:29 +0000 Subject: [PATCH 01/21] Translated using Weblate (Russian) Currently translated at 100.0% (6 of 6 strings) Translation: Simple Mobile Tools/Simple Calculator metadata Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calculator-metadata/ru/ --- fastlane/metadata/android/ru-RU/full_description.txt | 8 ++++---- fastlane/metadata/android/ru-RU/short_description.txt | 2 +- fastlane/metadata/android/ru-RU/title.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt index f8ba3da4..46abfa12 100644 --- a/fastlane/metadata/android/ru-RU/full_description.txt +++ b/fastlane/metadata/android/ru-RU/full_description.txt @@ -25,11 +25,11 @@ Ознакомьтесь с полным набором простых инструментов здесь: https://www.simplemobiletools.com -Фейсбук: +Facebook: https://www.facebook.com/simplemobiletools -Реддит: +Reddit: https://www.reddit.com/r/SimpleMobileTools -Телеграмма: -https://t.me/SimpleMobileTools \ No newline at end of file +Telegram: +https://t.me/SimpleMobileTools diff --git a/fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt index 4147c4ae..865ad898 100644 --- a/fastlane/metadata/android/ru-RU/short_description.txt +++ b/fastlane/metadata/android/ru-RU/short_description.txt @@ -1 +1 @@ -калькулятор для быстрых простых вычислений с плавным пользовательским \ No newline at end of file +калькулятор для быстрых простых вычислений с плавным пользовательским diff --git a/fastlane/metadata/android/ru-RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt index 48ba8e50..595cdb8c 100644 --- a/fastlane/metadata/android/ru-RU/title.txt +++ b/fastlane/metadata/android/ru-RU/title.txt @@ -1 +1 @@ -Простой калькулятор \ No newline at end of file +Простой калькулятор From dca861186f4d512bd6009e5041be97e2e967d615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=B5=A3=E2=B5=93=E2=B5=80=E2=B5=89=E2=B5=94=20=E2=B4=B0?= =?UTF-8?q?=E2=B5=8E=E2=B4=B0=E2=B5=A3=E2=B5=89=E2=B5=96=20=D8=B2=D9=87?= =?UTF-8?q?=D9=8A=D8=B1=20=D8=A3=D9=85=D8=A7=D8=B2=D9=8A=D8=BA?= Date: Tue, 24 Jan 2023 02:08:17 +0100 Subject: [PATCH 02/21] Added translation using Weblate (Tamazight (Standard Moroccan)) --- app/src/main/res/values-zgh/strings.xml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/src/main/res/values-zgh/strings.xml diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml new file mode 100644 index 00000000..a6b3daec --- /dev/null +++ b/app/src/main/res/values-zgh/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From 7a18bafe1a81b8f35995509cdc74b682bcc4651f Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 24 Jan 2023 01:08:21 +0000 Subject: [PATCH 03/21] Updating Tamazight (Standard Moroccan) --- app/src/main/res/values-zgh/strings.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index a6b3daec..169c097d 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -1,2 +1,15 @@ - \ No newline at end of file + + Simple Calculator + Calculator + Scientific Calculator + Error: division by zero + History + History is empty + Clear + History has been cleared + Vibrate on button press + Use comma as a decimal mark + How does the C (Clear) button work\? + Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. + \ No newline at end of file From 9f4d6a7068be1fdcb86108b957a71ce96be550cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=B5=A3=E2=B5=93=E2=B5=80=E2=B5=89=E2=B5=94=20=E2=B4=B0?= =?UTF-8?q?=E2=B5=8E=E2=B4=B0=E2=B5=A3=E2=B5=89=E2=B5=96=20=D8=B2=D9=87?= =?UTF-8?q?=D9=8A=D8=B1=20=D8=A3=D9=85=D8=A7=D8=B2=D9=8A=D8=BA?= Date: Tue, 24 Jan 2023 01:22:29 +0000 Subject: [PATCH 04/21] Updating Tamazight (Standard Moroccan) --- app/src/main/res/values-zgh/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 169c097d..6245109b 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -1,15 +1,15 @@ - Simple Calculator - Calculator - Scientific Calculator - Error: division by zero - History - History is empty - Clear - History has been cleared - Vibrate on button press - Use comma as a decimal mark - How does the C (Clear) button work\? - Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. + ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⴼⵔⴰⵔⵜ + ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ + ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵎⴰⵙⵙⴰⵏⵜ + ⵜⴰⵣⴳⵍⵜ: ⴰⴱⵟⵟⵓ ⵅⴼ ⵓⵎⵢⴰ + ⴰⵎⵣⵔⵓⵢ + ⴰⵎⵣⵔⵓⵢ ⵢⵓⵔⴰ + ⴽⴽⵙ + ⵉⵜⵜⵡⴰⴽⴽⵙ ⵓⵎⵣⵔⵓⵢ + ⴰⵔⵎⵉⵎⵎⵉ ⴳ ⵡⴰⴱⴱⴰⵥ ⵅⴼ ⵜⴳⵎⵎⵓⵜⵉⵏ + ⵙⵎⵔⵙ ⵜⵉⵙⴽⵔⵜ ⴷ ⵜⴰⵎⴰⵜⴰⵔⵜ ⵜⴰⵎⵔⴰⵡⴰⵏⵜ + ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? + ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. \ No newline at end of file From b72ce0ba5822084e46e2c9af3851f2eeac334c1d Mon Sep 17 00:00:00 2001 From: Mateus Date: Wed, 1 Feb 2023 03:49:54 +0000 Subject: [PATCH 05/21] Translated using Weblate (Portuguese (Brazil)) Currently translated at 66.6% (4 of 6 strings) Translation: Simple Mobile Tools/Simple Calculator metadata Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calculator-metadata/pt_BR/ --- fastlane/metadata/android/pt-BR/title.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fastlane/metadata/android/pt-BR/title.txt diff --git a/fastlane/metadata/android/pt-BR/title.txt b/fastlane/metadata/android/pt-BR/title.txt new file mode 100644 index 00000000..43ef335b --- /dev/null +++ b/fastlane/metadata/android/pt-BR/title.txt @@ -0,0 +1 @@ +Calculadora Simples From afad84c47843b299e1e866b84825576d8531d056 Mon Sep 17 00:00:00 2001 From: Mateus Date: Wed, 1 Feb 2023 03:52:21 +0000 Subject: [PATCH 06/21] Translated using Weblate (Portuguese (Brazil)) Currently translated at 83.3% (5 of 6 strings) Translation: Simple Mobile Tools/Simple Calculator metadata Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calculator-metadata/pt_BR/ --- fastlane/metadata/android/pt-BR/short_description.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fastlane/metadata/android/pt-BR/short_description.txt diff --git a/fastlane/metadata/android/pt-BR/short_description.txt b/fastlane/metadata/android/pt-BR/short_description.txt new file mode 100644 index 00000000..c19d0cc9 --- /dev/null +++ b/fastlane/metadata/android/pt-BR/short_description.txt @@ -0,0 +1 @@ +Uma linda calculadora para calculos rápidos com uma interface de usuário suave From 0abfd4746bef937a97b137062292c7e419b11e73 Mon Sep 17 00:00:00 2001 From: MS-PC Date: Sat, 4 Feb 2023 03:08:19 +0000 Subject: [PATCH 07/21] Updating Spanish --- app/src/main/res/values-es/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index eff5c68a..c0192689 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2,22 +2,22 @@ Simple Calculator Calculadora - Calculadora Científica + Calculadora científica Error: división por cero Historial El historial está vacío - Vaciar - El historial ha sido vaciado + Borrar + El historial ha sido borrado Vibrar al presionar un botón - Usa una coma como marca decimal + Usar una coma como marca decimal - ¿Cómo funciona el botón C (Clear: Limpiar)? - Presionándolo una vez eliminará un solo caracter. Mantenerlo presionado reiniciará todos los campos. + ¿Cómo funciona el botón C (Borrar)\? + Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos. - + \ No newline at end of file From 540c809c87eff5e49b7b04af44a85110e7ce334b Mon Sep 17 00:00:00 2001 From: Moo Date: Fri, 3 Feb 2023 11:52:40 +0000 Subject: [PATCH 08/21] Updating Lithuanian --- app/src/main/res/values-lt/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 80011e49..46cfc9e1 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -7,7 +7,7 @@ Klaida: dalyba iš nulio Istorija - Istorija tuščia + Istorija yra tuščia Išvalyti Istorija išvalyta From 92a8b3cb1d44730309c764527f6854101786f34f Mon Sep 17 00:00:00 2001 From: Moo Date: Fri, 3 Feb 2023 11:57:20 +0000 Subject: [PATCH 09/21] Translated using Weblate (Lithuanian) Currently translated at 100.0% (6 of 6 strings) Translation: Simple Mobile Tools/Simple Calculator metadata Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calculator-metadata/lt/ --- fastlane/metadata/android/lt/full_description.txt | 2 +- fastlane/metadata/android/lt/short_description.txt | 2 +- fastlane/metadata/android/lt/title.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/metadata/android/lt/full_description.txt b/fastlane/metadata/android/lt/full_description.txt index f0117ed6..b69fbd22 100644 --- a/fastlane/metadata/android/lt/full_description.txt +++ b/fastlane/metadata/android/lt/full_description.txt @@ -32,4 +32,4 @@ Reddit: https://www.reddit.com/r/SimpleMobileTools Telegram: -https://t.me/SimpleMobileTools \ No newline at end of file +https://t.me/SimpleMobileTools diff --git a/fastlane/metadata/android/lt/short_description.txt b/fastlane/metadata/android/lt/short_description.txt index 29662045..a0658419 100644 --- a/fastlane/metadata/android/lt/short_description.txt +++ b/fastlane/metadata/android/lt/short_description.txt @@ -1 +1 @@ -Skaičiuotuvas su pagrindinėmis funkcijomis ir pritaikomu skydeliu. \ No newline at end of file +Skaičiuotuvas su pagrindinėmis funkcijomis ir derinama naudotojo sąsaja diff --git a/fastlane/metadata/android/lt/title.txt b/fastlane/metadata/android/lt/title.txt index d435da37..8a4e568f 100644 --- a/fastlane/metadata/android/lt/title.txt +++ b/fastlane/metadata/android/lt/title.txt @@ -1 +1 @@ -Paprastas skaičiuotuvas \ No newline at end of file +Paprastas skaičiuotuvas From e2eef14b4ef402e811d9f1fa7137d4351d3bcd79 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Fri, 10 Feb 2023 18:31:59 +0100 Subject: [PATCH 10/21] Update strings.xml --- app/src/main/res/values-zgh/strings.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 6245109b..e8a0fd2d 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -3,13 +3,17 @@ ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⴼⵔⴰⵔⵜ ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵎⴰⵙⵙⴰⵏⵜ + ⵜⴰⵣⴳⵍⵜ: ⴰⴱⵟⵟⵓ ⵅⴼ ⵓⵎⵢⴰ + ⴰⵎⵣⵔⵓⵢ ⴰⵎⵣⵔⵓⵢ ⵢⵓⵔⴰ ⴽⴽⵙ ⵉⵜⵜⵡⴰⴽⴽⵙ ⵓⵎⵣⵔⵓⵢ + ⴰⵔⵎⵉⵎⵎⵉ ⴳ ⵡⴰⴱⴱⴰⵥ ⵅⴼ ⵜⴳⵎⵎⵓⵜⵉⵏ ⵙⵎⵔⵙ ⵜⵉⵙⴽⵔⵜ ⴷ ⵜⴰⵎⴰⵜⴰⵔⵜ ⵜⴰⵎⵔⴰⵡⴰⵏⵜ + ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. - \ No newline at end of file + From 9285b8b3d3302f854b1712ed814030c24edf19b9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 10 Feb 2023 18:37:57 +0100 Subject: [PATCH 11/21] do no show More Apps From Us at the top menu --- app/build.gradle | 2 +- app/src/main/res/menu/menu.xml | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4f87f70e..abe49373 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:48be8434c3' + implementation 'com.github.SimpleMobileTools:Simple-Commons:8bcb4d3851' implementation 'me.grantland:autofittextview:0.2.1' implementation 'net.objecthunter:exp4j:0.4.8' diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index 638472c2..24183ca4 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -1,16 +1,13 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:ignore="AlwaysShowAction"> - + From f91137b770d04990f6a75d0bbf261fd455776be2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 10 Feb 2023 18:38:08 +0100 Subject: [PATCH 12/21] catch and show an exception --- .../simplemobiletools/calculator/helpers/CalculatorImpl.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt index 5ff4804e..8f72e4cb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -223,7 +223,12 @@ class CalculatorImpl( return } - baseValue = parts.first().toDouble() + try { + baseValue = parts.first().toDouble() + } catch (e: NumberFormatException) { + context.showErrorToast(e) + } + if (inputDisplayedFormula.startsWith("-")) { baseValue *= -1 } From 71171d7c1596f70d859ccca82c91d96fc851a929 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 10 Feb 2023 19:12:02 +0100 Subject: [PATCH 13/21] do not color the action bar --- .../calculator/activities/MainActivity.kt | 4 + .../main/res/layout-land/activity_main.xml | 420 +++++++++--------- app/src/main/res/layout/activity_main.xml | 14 +- 3 files changed, 229 insertions(+), 209 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt index 230efd7f..08850623 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt @@ -33,12 +33,16 @@ class MainActivity : SimpleActivity(), Calculator { private lateinit var calc: CalculatorImpl override fun onCreate(savedInstanceState: Bundle?) { + isMaterialActivity = true super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) appLaunched(BuildConfig.APPLICATION_ID) setupOptionsMenu() refreshMenuItems() + updateMaterialActivityViews(main_coordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) + setupMaterialScrollListener(main_nested_scrollview, main_toolbar) + calc = CalculatorImpl(this, applicationContext) btn_plus.setOnClickOperation(PLUS) diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index cc772edd..7f2412d0 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -16,239 +16,247 @@ app:menu="@menu/menu" app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> - - - - - + android:fillViewport="true" + android:scrollbars="none"> + android:hapticFeedbackEnabled="true" + android:layoutDirection="ltr" + android:orientation="vertical"> + android:layout_weight="2.1" + android:fontFamily="sans-serif-light" + android:gravity="end|bottom" + android:maxLines="1" + android:paddingLeft="@dimen/activity_margin" + android:paddingRight="@dimen/activity_margin" + android:textSize="@dimen/formula_text_size" /> + android:layout_weight="1.8" + android:fontFamily="sans-serif-light" + android:gravity="center_vertical|end" + android:maxLines="1" + android:paddingLeft="@dimen/activity_margin" + android:paddingRight="@dimen/activity_margin" + android:textSize="@dimen/display_text_size" + tools:text="0" /> - + android:layout_weight="2" + android:orientation="horizontal"> - + + + + + + + + + + + + + + + android:layout_weight="2" + android:orientation="horizontal"> - + + + + + + + + + + + + + android:layout_weight="2" + android:orientation="horizontal"> - + + + + + + + + + + + + + android:layout_weight="2" + android:orientation="horizontal"> + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8342d576..f769e7c3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,10 +16,18 @@ app:menu="@menu/menu" app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> - + android:layout_marginTop="?attr/actionBarSize" + android:fillViewport="true" + android:scrollbars="none"> + + + From 5f66b6a8f0390c2510fa5b989b7720f7641d1378 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 10 Feb 2023 19:29:34 +0100 Subject: [PATCH 14/21] updating Room --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index abe49373..96ff9678 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation 'me.grantland:autofittextview:0.2.1' implementation 'net.objecthunter:exp4j:0.4.8' - kapt 'androidx.room:room-compiler:2.4.3' - implementation 'androidx.room:room-runtime:2.4.3' - annotationProcessor 'androidx.room:room-compiler:2.4.3' + kapt 'androidx.room:room-compiler:2.5.0' + implementation 'androidx.room:room-runtime:2.5.0' + annotationProcessor 'androidx.room:room-compiler:2.5.0' } From 61ebae8ff9ebe3e3aed2cc75c71320fb677ea14e Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 10 Feb 2023 19:32:43 +0100 Subject: [PATCH 15/21] update version to 5.11.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 96ff9678..ab7e4381 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.simplemobiletools.calculator" minSdkVersion 23 targetSdkVersion 33 - versionCode 58 - versionName "5.11.1" + versionCode 59 + versionName "5.11.2" setProperty("archivesBaseName", "calculator") } From 402da52eae47d478395a2f004c92eb8eb9b17668 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 10 Feb 2023 19:32:49 +0100 Subject: [PATCH 16/21] updating changelog --- CHANGELOG.md | 5 +++++ fastlane/metadata/android/en-US/changelogs/59.txt | 1 + 2 files changed, 6 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/59.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 8beecf24..494572e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 5.11.2 *(2023-02-10)* +---------------------------- + + * Added some UI, translation and stability improvements + Version 5.11.1 *(2023-01-04)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/59.txt b/fastlane/metadata/android/en-US/changelogs/59.txt new file mode 100644 index 00000000..17b882fd --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/59.txt @@ -0,0 +1 @@ + * Added some UI, translation and stability improvements From b159bfce37f8fb68fe49ecc992a95e806b79c418 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 12 Feb 2023 09:54:06 +0100 Subject: [PATCH 17/21] updating commons --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ab7e4381..c4c00275 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:8bcb4d3851' + implementation 'com.github.SimpleMobileTools:Simple-Commons:18b83e0407' implementation 'me.grantland:autofittextview:0.2.1' implementation 'net.objecthunter:exp4j:0.4.8' From 427f00634605f26577e67a64cafa1505455f41d9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 12 Feb 2023 09:59:53 +0100 Subject: [PATCH 18/21] updating commons --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c4c00275..5fa02322 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:18b83e0407' + implementation 'com.github.SimpleMobileTools:Simple-Commons:c457573200' implementation 'me.grantland:autofittextview:0.2.1' implementation 'net.objecthunter:exp4j:0.4.8' From 734eb5e6742dcc62dbc31f81e14e5a49559bea08 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 17 Feb 2023 22:39:05 +0100 Subject: [PATCH 19/21] adding contribution rules --- CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..7512d676 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,8 @@ +### Reporting +Before you report a new issue, make sure you look at the existing ones first to avoid creating duplicates. You can use Search with some keywords too. + +### Contributing as a developer +Some instructions about code style and everything that has to be done to increase the change of your code getting accepted can be found at the [General Discussion](https://github.com/SimpleMobileTools/General-Discussion#contribution-rules-for-developers) section. + +### Contributing as a non developer +In case you just want to for example improve a translation, you can find the way of doing it [here](https://github.com/SimpleMobileTools/General-Discussion#how-can-i-suggest-an-edit-to-a-file). From a473e8744728b00c48d25879427f2ecbe2b74fcc Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Sat, 18 Feb 2023 12:27:45 +0100 Subject: [PATCH 20/21] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7512d676..0730468b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,5 @@ ### Reporting -Before you report a new issue, make sure you look at the existing ones first to avoid creating duplicates. You can use Search with some keywords too. +Before you report something, read the reporting rules [here](https://github.com/SimpleMobileTools/General-Discussion#how-do-i-suggest-an-improvement-ask-a-question-or-report-an-issue) please. ### Contributing as a developer Some instructions about code style and everything that has to be done to increase the change of your code getting accepted can be found at the [General Discussion](https://github.com/SimpleMobileTools/General-Discussion#contribution-rules-for-developers) section. From fe4727ec305e9986c789644c42b28f0017aadaca Mon Sep 17 00:00:00 2001 From: theom Date: Sat, 18 Feb 2023 19:44:04 +0100 Subject: [PATCH 21/21] merge master into fix_data branch and resolve conflicts --- .../com/simplemobiletools/calculator/activities/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt index 88c2cca7..73d1ae44 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt @@ -297,6 +297,6 @@ class MainActivity : SimpleActivity(), Calculator { bundle.putDouble("savedBaseValue", calc.baseValue) bundle.putDouble("savedSecondValue", calc.getSecondValueV2()) bundle.putString("savedInputDisplayedFormula", calc.inputDisplayedFormula) - + } //============================================================ }