Commit graph

1380 commits

Author SHA1 Message Date
theom
f9e4629938 cleaning code 2023-02-22 23:06:23 +01:00
Axel Labarre
790302184a Merge branch 'dev-axel-saveInstanceState' into fix_data_lost_during_rotation 2023-02-22 22:20:35 +01:00
Axel Labarre
0823b9ef6e Format code and clean build 2023-02-22 22:20:08 +01:00
Axel Labarre
ab5325c1a6 Merge branch 'fix_data_lost_during_rotation' into dev-axel-saveInstanceState 2023-02-22 21:58:09 +01:00
Axel Labarre
593649db7b update CalculatorImpl.kt 2023-02-22 21:54:17 +01:00
Axel Labarre
d0cac4ce7f Merge branch 'dev-axel-saveInstanceState' into fix_data_lost_during_rotation 2023-02-22 18:02:17 +01:00
Axel Labarre
d177eef0b2 test JSONobject method 2023-02-22 18:01:44 +01:00
Axel Labarre
f1a8e8c03d resolve merge conflicts 2023-02-22 17:07:59 +01:00
Axel Labarre
064e0bdb3b add setFromSaveInstanceState method 2023-02-22 16:58:08 +01:00
tmontaigu
7ee8d6a02a Use json to save instance state 2023-02-22 16:53:08 +01:00
Axel Labarre
709df3fa87 Merge branch 'fix_data_lost_during_rotation' into dev-axel-saveInstanceState 2023-02-22 15:50:06 +01:00
Josep M. Ferrer
bcfaf6e563
Translated using Weblate (Catalan)
Currently translated at 100.0% (7 of 7 strings)

Translation: Simple Mobile Tools/Simple Calculator metadata
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calculator-metadata/ca/
2023-02-19 12:43:01 +01:00
theom
fe4727ec30 merge master into fix_data branch and resolve conflicts 2023-02-18 19:44:04 +01:00
theom
9bd8786e2a Merge branch 'master' into fix_data_lost_during_rotation
# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
#	app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
2023-02-18 19:38:38 +01:00
Axel Labarre
cc5aa18b47 Merge branch 'dev-axel-saveInstanceState' into fix_data_lost_during_rotation 2023-02-18 18:50:08 +01:00
Axel Labarre
6c4c47a1f0 get SecondValue with new method getSecondValueV2() 2023-02-18 18:49:34 +01:00
Axel Labarre
f821d0976b fix calc constructor 2023-02-18 15:16:55 +01:00
Tibor Kaputa
a473e87447
Update CONTRIBUTING.md 2023-02-18 12:27:45 +01:00
tibbi
734eb5e674 adding contribution rules 2023-02-17 22:39:05 +01:00
Axel Labarre
678250812a Merge branch 'dev-axel-saveInstanceState' into fix_data_lost_during_rotation 2023-02-16 10:51:03 +01:00
Axel Labarre
93fb0125de Fix problem while adding operators with result after rotation 2023-02-16 10:50:23 +01:00
tibbi
427f006346 updating commons 2023-02-12 09:59:53 +01:00
tibbi
b159bfce37 updating commons 2023-02-12 09:54:06 +01:00
tibbi
402da52eae updating changelog 2023-02-10 19:32:49 +01:00
tibbi
61ebae8ff9 update version to 5.11.2 2023-02-10 19:32:43 +01:00
tibbi
5f66b6a8f0 updating Room 2023-02-10 19:29:34 +01:00
tibbi
71171d7c15 do not color the action bar 2023-02-10 19:12:02 +01:00
tibbi
f91137b770 catch and show an exception 2023-02-10 18:38:08 +01:00
tibbi
9285b8b3d3 do no show More Apps From Us at the top menu 2023-02-10 18:37:57 +01:00
Tibor Kaputa
9b1fc36a7f
Merge pull request #302 from weblate/weblate-simple-mobile-tools-simple-calculator
Translations update from Hosted Weblate
2023-02-10 18:32:17 +01:00
Tibor Kaputa
e2eef14b4e
Update strings.xml 2023-02-10 18:31:59 +01:00
Axel Labarre
c0c7d6da1d Merge branch 'dev-axel-saveInstanceState' into fix_data_lost_during_rotation 2023-02-08 18:36:07 +01:00
Axel Labarre
ab579c4737 New Bug while rotate -> BaseValue / SecondValue (Fix is comming) 2023-02-08 18:35:44 +01:00
Axel Labarre
6a0f3bd1bf Merge branch 'fix_data_lost_during_rotation' into dev-axel-saveInstanceState
Pull commits from 'fix_data' branch
2023-02-08 15:22:33 +01:00
theom
1311df6296 added saving of the last calculation during a rotation 2023-02-08 00:22:46 +01:00
Axel Labarre
d613d50e58 Merge branch 'dev-axel-saveInstanceState' into fix_data_lost_during_rotation 2023-02-07 01:41:09 +01:00
Axel Labarre
522b9d1d1e Override onSaveInstanceState Method
Add public member variable mResult into CalculatorImpl
Add private member savedRes into MainActivity
Update calc constructor
Getting Saved res from savedInstanceState
2023-02-07 01:40:35 +01:00
Moo
92a8b3cb1d
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/
2023-02-04 13:40:11 +01:00
Moo
540c809c87
Updating Lithuanian 2023-02-04 13:40:10 +01:00
MS-PC
0abfd4746b
Updating Spanish 2023-02-04 13:40:10 +01:00
Mateus
afad84c478
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/
2023-02-01 21:00:52 +01:00
Mateus
b72ce0ba58
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/
2023-02-01 04:50:49 +01:00
ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ زهير أمازيغ
9f4d6a7068
Updating Tamazight (Standard Moroccan) 2023-01-25 02:51:18 +01:00
Anonymous
7a18bafe1a
Updating Tamazight (Standard Moroccan) 2023-01-24 02:08:23 +01:00
ⵣⵓⵀⵉⵔ ⴰⵎⴰⵣⵉⵖ زهير أمازيغ
dca861186f
Added translation using Weblate (Tamazight (Standard Moroccan)) 2023-01-24 02:08:17 +01:00
solokot
d10ab08aa6
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/
2023-01-18 16:52:30 +01:00
tibbi
a962a72e0e correcting some language codes 2023-01-16 12:35:49 +01:00
tibbi
0475ccea8e removing video.txt files 2023-01-15 23:18:35 +01:00
Tibor Kaputa
591f80c3d8
Merge pull request #300 from weblate/weblate-simple-mobile-tools-simple-calculator
Translations update from Hosted Weblate
2023-01-14 19:47:52 +01:00
Linerly
ce2b8c7de5
Translated using Weblate (Indonesian)
Currently translated at 100.0% (7 of 7 strings)

Translation: Simple Mobile Tools/Simple Calculator metadata
Translate-URL: https://hosted.weblate.org/projects/simple-mobile-tools/simple-calculator-metadata/id/
2023-01-13 09:47:42 +01:00