fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-02-17 03:50:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing changes

Browse Source
This commit is contained in:
Sissy Dalampira 2018-10-07 22:32:47 +03:00
parent ce425b3087
commit e21ecfa96c
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/debug/res/values/strings.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_launcher_name">Calculator_debug</string> <string name="app_launcher_name">Calculator_debug</string>
<string name="scientific_name">Scientific_debug</string>
</resources> </resources>

2
app/src/main/AndroidManifest.xml
View File

@ -28,7 +28,7 @@
android:name=".activities.ScientificActivity" android:name=".activities.ScientificActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:parentActivityName=".activities.MainActivity" android:parentActivityName=".activities.MainActivity"
android:label="@string/scientific_name"/> android:label="@string/app_launcher_name"/>
<activity <activity
android:name=".activities.WidgetConfigureActivity" android:name=".activities.WidgetConfigureActivity"

5
app/src/main/kotlin/com/simplemobiletools/calculator/activities/ScientificActivity.kt
View File

@ -10,13 +10,10 @@ import com.simplemobiletools.commons.extensions.*
class ScientificActivity : SimpleActivity() { class ScientificActivity : SimpleActivity() {
override fun onCreate(savedInstanceState: Bundle?){
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.scientific_activity) setContentView(R.layout.scientific_activity)
appLaunched(BuildConfig.APPLICATION_ID) appLaunched(BuildConfig.APPLICATION_ID)
updateViewColors(calculator_holder, config.textColor) updateViewColors(calculator_holder, config.textColor)
} }
} }

11
app/src/main/kotlin/com/simplemobiletools/calculator/operation/FactorialOperation.kt
View File

@ -3,16 +3,15 @@ package com.simplemobiletools.calculator.operation
import com.simplemobiletools.calculator.operation.base.Operation import com.simplemobiletools.calculator.operation.base.Operation
import com.simplemobiletools.calculator.operation.base.UnaryOperation import com.simplemobiletools.calculator.operation.base.UnaryOperation
class ParOperation(value: Double) : UnaryOperation(value), Operation { class FactorialOperation(value: Double) : UnaryOperation(value), Operation {
override fun getResult(): Double { override fun getResult(): Double{
var result = 1.0 var result = 1.0
if (value==0.0 || value==1.0){ if (value==0.0 || value==1.0){
return result return result
} else { }else{
var base: Int = value.toInt() var base = value.toInt()
for (i in 1..base){ for(i in 1..base){
//Find Factorial of a number using for loop
result *= i result *= i
} }
} }

2
app/src/main/kotlin/com/simplemobiletools/calculator/operation/OperationFactory.kt
View File

@ -14,7 +14,7 @@ object OperationFactory {
PERCENT -> PercentOperation(baseValue, secondValue) PERCENT -> PercentOperation(baseValue, secondValue)
POWER -> PowerOperation(baseValue, secondValue) POWER -> PowerOperation(baseValue, secondValue)
ROOT -> RootOperation(baseValue) ROOT -> RootOperation(baseValue)
FACTORIAL -> ParOperation(baseValue) FACTORIAL -> FactorialOperation(baseValue)
else -> null else -> null
} }
} }