fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-03-10 16:30:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Tibor Kaputa 2020-11-05 21:31:31 +01:00 committed by GitHub
commit 438219f6ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -57,7 +57,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:5.30.1' implementation 'com.simplemobiletools:commons:5.31.24'
implementation 'me.grantland:autofittextview:0.2.1' implementation 'me.grantland:autofittextview:0.2.1'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'

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

@ -12,6 +12,10 @@
android:name="android.permission.USE_FINGERPRINT" android:name="android.permission.USE_FINGERPRINT"
tools:node="remove"/> tools:node="remove"/>
<uses-feature
android:name="android.hardware.faketouch"
android:required="false"/>
<application <application
android:name=".App" android:name=".App"
android:allowBackup="true" android:allowBackup="true"

10
app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
View File

@ -1,7 +1,6 @@
package com.simplemobiletools.calculator.helpers package com.simplemobiletools.calculator.helpers
import android.content.Context import android.content.Context
import android.util.Log
import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.R
import com.simplemobiletools.calculator.operation.OperationFactory import com.simplemobiletools.calculator.operation.OperationFactory
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
@ -124,10 +123,13 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
if (update) updateFormula() if (update) updateFormula()
val operation = OperationFactory.forId(lastOperation!!, baseValue, secondValue) val operation = OperationFactory.forId(lastOperation!!, baseValue, secondValue)
Log.i("ANGELINA", "oper $lastOperation")
if (operation != null) { if (operation != null) {
updateResult(operation.getResult()) try {
inputDisplayedFormula = displayedNumber updateResult(operation.getResult())
inputDisplayedFormula = displayedNumber
} catch (e: Exception) {
context.toast(R.string.unknown_error_occurred)
}
} }
isFirstOperation = false isFirstOperation = false

2
app/src/main/res/layout/activity_main.xml
View File

@ -15,6 +15,7 @@
android:layout_weight="2.1" android:layout_weight="2.1"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:gravity="end|bottom" android:gravity="end|bottom"
android:maxLength="30"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
@ -27,6 +28,7 @@
android:layout_weight="1.8" android:layout_weight="1.8"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:gravity="center_vertical|end" android:gravity="center_vertical|end"
android:maxLength="20"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"

4
build.gradle
View File

@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.4.0' ext.kotlin_version = '1.4.10'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.1' classpath 'com.android.tools.build:gradle:4.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Aug 17 22:55:20 CEST 2020 #Thu Nov 05 21:17:11 CET 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip