From df5be92141e7bc3b1a21825eb9e9a565a87fad5c Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Nov 2017 16:25:01 +0100 Subject: [PATCH] some rewrites and reorganization here and there --- app/build.gradle | 32 ++++++++---- app/proguard-rules.pro | 17 ------- app/src/main/AndroidManifest.xml | 18 +++---- .../calculator/activities/MainActivity.kt | 18 +++++-- .../activities/WidgetConfigureActivity.kt | 8 ++- .../calculator/{ => helpers}/Calculator.kt | 2 +- .../{ => helpers}/CalculatorImpl.kt | 46 +++++++++--------- .../calculator/{ => helpers}/Constants.kt | 9 +--- .../calculator/{ => helpers}/Formatter.kt | 6 +-- .../{ => helpers}/MyWidgetProvider.kt | 10 ++-- .../calculator/operation/MinusOperation.kt | 4 +- .../calculator/operation/MultiplyOperation.kt | 4 +- .../calculator/operation/OperationFactory.kt | 2 +- .../calculator/operation/PlusOperation.kt | 4 +- .../calculator/operation/RootOperation.kt | 4 +- .../img_widget_preview.png} | Bin .../img_widget_preview.png} | Bin .../img_widget_preview.png} | Bin .../img_widget_preview.png} | Bin app/src/main/res/layout/activity_main.xml | 6 +-- app/src/main/res/layout/activity_settings.xml | 2 +- app/src/main/res/mipmap-hdpi/facebook.png | Bin 2299 -> 0 bytes app/src/main/res/mipmap-hdpi/gplus.png | Bin 2094 -> 0 bytes app/src/main/res/mipmap-mdpi/facebook.png | Bin 1407 -> 0 bytes app/src/main/res/mipmap-mdpi/gplus.png | Bin 1379 -> 0 bytes app/src/main/res/mipmap-mdpi/launcher.png | Bin 621 -> 0 bytes .../main/res/mipmap-mdpi/widget_preview.png | Bin 4170 -> 0 bytes app/src/main/res/mipmap-xhdpi/facebook.png | Bin 3098 -> 0 bytes app/src/main/res/mipmap-xhdpi/gplus.png | Bin 2649 -> 0 bytes app/src/main/res/mipmap-xxhdpi/facebook.png | Bin 5144 -> 0 bytes app/src/main/res/mipmap-xxhdpi/gplus.png | Bin 4702 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/facebook.png | Bin 7029 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/gplus.png | Bin 5392 -> 0 bytes app/src/main/res/values-de/strings.xml | 5 ++ app/src/main/res/values-es/strings.xml | 6 ++- app/src/main/res/values-fr/strings.xml | 15 +++++- app/src/main/res/values-it/strings.xml | 7 ++- app/src/main/res/values-ja/strings.xml | 5 ++ app/src/main/res/values-pt/strings.xml | 5 ++ app/src/main/res/values-ru/strings.xml | 5 ++ app/src/main/res/values-sk/strings.xml | 7 ++- app/src/main/res/values-sv/strings.xml | 5 ++ app/src/main/res/values-tr/strings.xml | 43 +++------------- app/src/main/res/values-v21/styles.xml | 2 +- app/src/main/res/values/colors.xml | 3 -- app/src/main/res/values/strings.xml | 7 ++- app/src/main/res/values/styles.xml | 37 +------------- app/src/main/res/xml/widget_info.xml | 17 ++++--- .../calculator/MainActivityTest.kt | 1 + build.gradle | 8 +-- signing.properties_sample | 3 +- 51 files changed, 176 insertions(+), 197 deletions(-) rename app/src/main/java/com/simplemobiletools/calculator/{ => helpers}/Calculator.kt (72%) rename app/src/main/java/com/simplemobiletools/calculator/{ => helpers}/CalculatorImpl.kt (85%) rename app/src/main/java/com/simplemobiletools/calculator/{ => helpers}/Constants.kt (63%) rename app/src/main/java/com/simplemobiletools/calculator/{ => helpers}/Formatter.kt (77%) rename app/src/main/java/com/simplemobiletools/calculator/{ => helpers}/MyWidgetProvider.kt (94%) rename app/src/main/res/{mipmap-hdpi/widget_preview.png => drawable-hdpi/img_widget_preview.png} (100%) rename app/src/main/res/{mipmap-xhdpi/widget_preview.png => drawable-xhdpi/img_widget_preview.png} (100%) rename app/src/main/res/{mipmap-xxhdpi/widget_preview.png => drawable-xxhdpi/img_widget_preview.png} (100%) rename app/src/main/res/{mipmap-xxxhdpi/widget_preview.png => drawable-xxxhdpi/img_widget_preview.png} (100%) delete mode 100644 app/src/main/res/mipmap-hdpi/facebook.png delete mode 100644 app/src/main/res/mipmap-hdpi/gplus.png delete mode 100644 app/src/main/res/mipmap-mdpi/facebook.png delete mode 100644 app/src/main/res/mipmap-mdpi/gplus.png delete mode 100644 app/src/main/res/mipmap-mdpi/launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/widget_preview.png delete mode 100644 app/src/main/res/mipmap-xhdpi/facebook.png delete mode 100644 app/src/main/res/mipmap-xhdpi/gplus.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/facebook.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/gplus.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/facebook.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/gplus.png diff --git a/app/build.gradle b/app/build.gradle index a352d82..a6c5f77 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,11 +27,17 @@ android { signingConfig signingConfigs.release } } + + lintOptions { + checkReleaseBuilds false + abortOnError false + } } dependencies { - compile 'com.simplemobiletools:commons:2.35.4' + compile 'com.simplemobiletools:commons:2.35.5' compile 'me.grantland:autofittextview:0.2.1' + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" testCompile 'junit:junit:4.12' testCompile 'org.robolectric:robolectric:3.3.2' @@ -40,7 +46,18 @@ dependencies { androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test:rules:0.5' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" +} + +buildscript { + ext.kotlin_version = '1.1.51' + repositories { + mavenCentral() + } + + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" + } } def Properties props = new Properties() @@ -48,12 +65,11 @@ def propFile = new File('signing.properties') if (propFile.canRead()) { props.load(new FileInputStream(propFile)) - if (props != null && props.containsKey('STORE_FILE') && props.containsKey('STORE_PASSWORD') && - props.containsKey('KEY_ALIAS') && props.containsKey('KEY_PASSWORD')) { + if (props != null && props.containsKey('STORE_FILE') && props.containsKey('KEY_ALIAS') && props.containsKey('PASSWORD')) { android.signingConfigs.release.storeFile = file(props['STORE_FILE']) - android.signingConfigs.release.storePassword = props['STORE_PASSWORD'] + android.signingConfigs.release.storePassword = props['PASSWORD'] android.signingConfigs.release.keyAlias = props['KEY_ALIAS'] - android.signingConfigs.release.keyPassword = props['KEY_PASSWORD'] + android.signingConfigs.release.keyPassword = props['PASSWORD'] } else { println 'signing.properties found but some entries are missing' android.buildTypes.release.signingConfig = null @@ -62,7 +78,3 @@ if (propFile.canRead()) { println 'signing.properties not found' android.buildTypes.release.signingConfig = null } -repositories { - mavenCentral() - maven { url "https://jitpack.io" } -} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 25ea334..e69de29 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in $ANDROID_HOME/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 75ca0b5..82b98a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + package="com.simplemobiletools.calculator"> + + - - + android:name=".helpers.MyWidgetProvider" + android:icon="@drawable/img_widget_preview"> diff --git a/app/src/main/java/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/java/com/simplemobiletools/calculator/activities/MainActivity.kt index ce5149c..f324117 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/activities/MainActivity.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/activities/MainActivity.kt @@ -7,7 +7,9 @@ import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem -import com.simplemobiletools.calculator.* +import com.simplemobiletools.calculator.BuildConfig +import com.simplemobiletools.calculator.R +import com.simplemobiletools.calculator.helpers.* import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.commons.helpers.LICENSE_AUTOFITTEXTVIEW @@ -18,9 +20,7 @@ import kotlinx.android.synthetic.main.activity_main.* import me.grantland.widget.AutofitHelper class MainActivity : SimpleActivity(), Calculator { - companion object { - private lateinit var mCalc: CalculatorImpl } @@ -62,13 +62,21 @@ class MainActivity : SimpleActivity(), Calculator { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java)) - R.id.about -> startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_AUTOFITTEXTVIEW or LICENSE_ROBOLECTRIC or LICENSE_ESPRESSO, BuildConfig.VERSION_NAME) + R.id.settings -> launchSettings() + R.id.about -> launchAbout() else -> return super.onOptionsItemSelected(item) } return true } + private fun launchSettings() { + startActivity(Intent(applicationContext, SettingsActivity::class.java)) + } + + private fun launchAbout() { + startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_AUTOFITTEXTVIEW or LICENSE_ROBOLECTRIC or LICENSE_ESPRESSO, BuildConfig.VERSION_NAME) + } + private fun copyToClipboard(copyResult: Boolean): Boolean { var value = formula.value if (copyResult) { diff --git a/app/src/main/java/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt b/app/src/main/java/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt index 3013af3..1cc8e11 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt @@ -11,8 +11,12 @@ import android.view.View import android.widget.Button import android.widget.RemoteViews import android.widget.SeekBar -import com.simplemobiletools.calculator.* +import com.simplemobiletools.calculator.R +import com.simplemobiletools.calculator.helpers.MyWidgetProvider import com.simplemobiletools.commons.dialogs.ColorPickerDialog +import com.simplemobiletools.commons.helpers.PREFS_KEY +import com.simplemobiletools.commons.helpers.WIDGET_BG_COLOR +import com.simplemobiletools.commons.helpers.WIDGET_TEXT_COLOR import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.widget_config.* @@ -75,7 +79,7 @@ class WidgetConfigureActivity : AppCompatActivity() { config_bg_seekbar.progress = (mBgAlpha * 100).toInt() updateBackgroundColor() - mTextColor = prefs.getInt(WIDGET_TEXT_COLOR, resources.getColor(R.color.colorPrimary)) + mTextColor = prefs.getInt(WIDGET_TEXT_COLOR, resources.getColor(R.color.color_primary)) updateTextColor() formula.text = "15,937*5" diff --git a/app/src/main/java/com/simplemobiletools/calculator/Calculator.kt b/app/src/main/java/com/simplemobiletools/calculator/helpers/Calculator.kt similarity index 72% rename from app/src/main/java/com/simplemobiletools/calculator/Calculator.kt rename to app/src/main/java/com/simplemobiletools/calculator/helpers/Calculator.kt index 87b60aa..7428481 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/Calculator.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/helpers/Calculator.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calculator +package com.simplemobiletools.calculator.helpers interface Calculator { fun setValue(value: String) diff --git a/app/src/main/java/com/simplemobiletools/calculator/CalculatorImpl.kt b/app/src/main/java/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt similarity index 85% rename from app/src/main/java/com/simplemobiletools/calculator/CalculatorImpl.kt rename to app/src/main/java/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt index 2199103..8f24bbf 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/CalculatorImpl.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -1,5 +1,6 @@ -package com.simplemobiletools.calculator +package com.simplemobiletools.calculator.helpers +import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.operation.OperationFactory class CalculatorImpl { @@ -81,7 +82,7 @@ class CalculatorImpl { private fun formatString(str: String): String { // if the number contains a decimal, do not try removing the leading zero anymore, nor add group separator // it would prevent writing values like 1.02 - if (str.contains(".")) + if (str.contains("")) return str val doubleValue = Formatter.stringToDouble(str) @@ -93,13 +94,12 @@ class CalculatorImpl { mBaseValue = value } - val displayedNumberAsDouble: Double - get() = Formatter.stringToDouble(displayedNumber!!) + private fun getDisplayedNumberAsDouble() = Formatter.stringToDouble(displayedNumber!!) fun handleResult() { - mSecondValue = displayedNumberAsDouble + mSecondValue = getDisplayedNumberAsDouble() calculateResult() - mBaseValue = displayedNumberAsDouble + mBaseValue = getDisplayedNumberAsDouble() } fun calculateResult() { @@ -158,40 +158,40 @@ class CalculatorImpl { if (mLastKey != DIGIT) return - mSecondValue = displayedNumberAsDouble + mSecondValue = getDisplayedNumberAsDouble() calculateResult() mLastKey = EQUALS } - fun decimalClicked() { + private fun decimalClicked() { var value = displayedNumber - if (!value!!.contains(".")) - value += "." + if (!value!!.contains("")) + value += "" setValue(value) } - fun zeroClicked() { + private fun zeroClicked() { val value = displayedNumber if (value != "0") addDigit(0) } - private fun getSign(lastOperation: String?): String { - return when (lastOperation) { - PLUS -> "+" - MINUS -> "-" - MULTIPLY -> "*" - DIVIDE -> "/" - MODULO -> "%" - POWER -> "^" - ROOT -> "√" - else -> "" - } + private fun getSign(lastOperation: String?) = when (lastOperation) { + PLUS -> "+" + MINUS -> "-" + MULTIPLY -> "*" + DIVIDE -> "/" + MODULO -> "%" + POWER -> "^" + ROOT -> "√" + else -> "" } fun numpadClicked(id: Int) { - if (mLastKey == EQUALS) + if (mLastKey == EQUALS) { mLastOperation = EQUALS + } + mLastKey = DIGIT resetValueIfNeeded() diff --git a/app/src/main/java/com/simplemobiletools/calculator/Constants.kt b/app/src/main/java/com/simplemobiletools/calculator/helpers/Constants.kt similarity index 63% rename from app/src/main/java/com/simplemobiletools/calculator/Constants.kt rename to app/src/main/java/com/simplemobiletools/calculator/helpers/Constants.kt index b56712f..0b14006 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/Constants.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/helpers/Constants.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calculator +package com.simplemobiletools.calculator.helpers val DIGIT = "digit" val EQUALS = "equals" @@ -23,10 +23,3 @@ val SIX = "six" val SEVEN = "seven" val EIGHT = "eight" val NINE = "nine" - -// shared preferences -val PREFS_KEY = "Calculator" -val IS_FIRST_RUN = "is_first_run" -val IS_DARK_THEME = "is_dark_theme" -val WIDGET_BG_COLOR = "widget_bg_color" -val WIDGET_TEXT_COLOR = "widget_text_color" diff --git a/app/src/main/java/com/simplemobiletools/calculator/Formatter.kt b/app/src/main/java/com/simplemobiletools/calculator/helpers/Formatter.kt similarity index 77% rename from app/src/main/java/com/simplemobiletools/calculator/Formatter.kt rename to app/src/main/java/com/simplemobiletools/calculator/helpers/Formatter.kt index a85045a..3a35e1c 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/Formatter.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/helpers/Formatter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calculator +package com.simplemobiletools.calculator.helpers import java.text.DecimalFormat import java.text.DecimalFormatSymbols @@ -17,7 +17,5 @@ object Formatter { return formatter.format(d) } - fun stringToDouble(str: String): Double { - return str.replace(",".toRegex(), "").toDouble() - } + fun stringToDouble(str: String) = str.replace(",", "").toDouble() } diff --git a/app/src/main/java/com/simplemobiletools/calculator/MyWidgetProvider.kt b/app/src/main/java/com/simplemobiletools/calculator/helpers/MyWidgetProvider.kt similarity index 94% rename from app/src/main/java/com/simplemobiletools/calculator/MyWidgetProvider.kt rename to app/src/main/java/com/simplemobiletools/calculator/helpers/MyWidgetProvider.kt index 744a40e..7ab4a3b 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/MyWidgetProvider.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/helpers/MyWidgetProvider.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calculator +package com.simplemobiletools.calculator.helpers import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -10,8 +10,12 @@ import android.content.SharedPreferences import android.graphics.Color import android.view.View import android.widget.RemoteViews +import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.activities.MainActivity +import com.simplemobiletools.commons.helpers.PREFS_KEY +import com.simplemobiletools.commons.helpers.WIDGET_BG_COLOR +import com.simplemobiletools.commons.helpers.WIDGET_TEXT_COLOR class MyWidgetProvider : AppWidgetProvider(), Calculator { @@ -103,9 +107,7 @@ class MyWidgetProvider : AppWidgetProvider(), Calculator { } } - private fun initPrefs(context: Context?): SharedPreferences { - return context!!.getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE) - } + private fun initPrefs(context: Context?) = context!!.getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE) private fun updateTextColors(color: Int) { val viewIds = intArrayOf(R.id.formula, R.id.result, R.id.btn_0, R.id.btn_1, R.id.btn_2, R.id.btn_3, R.id.btn_4, R.id.btn_5, R.id.btn_6, R.id.btn_7, R.id.btn_8, R.id.btn_9, R.id.btn_modulo, R.id.btn_power, R.id.btn_root, R.id.btn_clear, R.id.btn_reset, R.id.btn_divide, R.id.btn_multiply, R.id.btn_minus, R.id.btn_plus, R.id.btn_decimal, R.id.btn_equals) diff --git a/app/src/main/java/com/simplemobiletools/calculator/operation/MinusOperation.kt b/app/src/main/java/com/simplemobiletools/calculator/operation/MinusOperation.kt index 85bdd93..e79e289 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/operation/MinusOperation.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/operation/MinusOperation.kt @@ -5,7 +5,5 @@ import com.simplemobiletools.calculator.operation.base.Operation class MinusOperation(baseValue: Double, secondValue: Double) : BinaryOperation(baseValue, secondValue), Operation { - override fun getResult(): Double { - return baseValue - secondValue - } + override fun getResult() = baseValue - secondValue } diff --git a/app/src/main/java/com/simplemobiletools/calculator/operation/MultiplyOperation.kt b/app/src/main/java/com/simplemobiletools/calculator/operation/MultiplyOperation.kt index b4786eb..e9fe57a 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/operation/MultiplyOperation.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/operation/MultiplyOperation.kt @@ -5,7 +5,5 @@ import com.simplemobiletools.calculator.operation.base.Operation class MultiplyOperation(baseValue: Double, secondValue: Double) : BinaryOperation(baseValue, secondValue), Operation { - override fun getResult(): Double { - return baseValue * secondValue - } + override fun getResult() = baseValue * secondValue } diff --git a/app/src/main/java/com/simplemobiletools/calculator/operation/OperationFactory.kt b/app/src/main/java/com/simplemobiletools/calculator/operation/OperationFactory.kt index a8b73d7..44b472f 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/operation/OperationFactory.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/operation/OperationFactory.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.calculator.operation -import com.simplemobiletools.calculator.* +import com.simplemobiletools.calculator.helpers.* import com.simplemobiletools.calculator.operation.base.Operation object OperationFactory { diff --git a/app/src/main/java/com/simplemobiletools/calculator/operation/PlusOperation.kt b/app/src/main/java/com/simplemobiletools/calculator/operation/PlusOperation.kt index 8ec3084..ff124fe 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/operation/PlusOperation.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/operation/PlusOperation.kt @@ -5,7 +5,5 @@ import com.simplemobiletools.calculator.operation.base.Operation class PlusOperation(baseValue: Double, secondValue: Double) : BinaryOperation(baseValue, secondValue), Operation { - override fun getResult(): Double { - return baseValue + secondValue - } + override fun getResult() = baseValue + secondValue } diff --git a/app/src/main/java/com/simplemobiletools/calculator/operation/RootOperation.kt b/app/src/main/java/com/simplemobiletools/calculator/operation/RootOperation.kt index cd3765a..c4a4030 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/operation/RootOperation.kt +++ b/app/src/main/java/com/simplemobiletools/calculator/operation/RootOperation.kt @@ -5,7 +5,5 @@ import com.simplemobiletools.calculator.operation.base.UnaryOperation class RootOperation(value: Double) : UnaryOperation(value), Operation { - override fun getResult(): Double { - return Math.sqrt(value) - } + override fun getResult() = Math.sqrt(value) } diff --git a/app/src/main/res/mipmap-hdpi/widget_preview.png b/app/src/main/res/drawable-hdpi/img_widget_preview.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/widget_preview.png rename to app/src/main/res/drawable-hdpi/img_widget_preview.png diff --git a/app/src/main/res/mipmap-xhdpi/widget_preview.png b/app/src/main/res/drawable-xhdpi/img_widget_preview.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/widget_preview.png rename to app/src/main/res/drawable-xhdpi/img_widget_preview.png diff --git a/app/src/main/res/mipmap-xxhdpi/widget_preview.png b/app/src/main/res/drawable-xxhdpi/img_widget_preview.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/widget_preview.png rename to app/src/main/res/drawable-xxhdpi/img_widget_preview.png diff --git a/app/src/main/res/mipmap-xxxhdpi/widget_preview.png b/app/src/main/res/drawable-xxxhdpi/img_widget_preview.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/widget_preview.png rename to app/src/main/res/drawable-xxxhdpi/img_widget_preview.png diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 87cfe0b..bd16a96 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,8 +1,8 @@ + android:textSize="@dimen/display_text_size" + tools:text="0"/> diff --git a/app/src/main/res/mipmap-hdpi/facebook.png b/app/src/main/res/mipmap-hdpi/facebook.png deleted file mode 100644 index c36f37fd41186fc3be25226e43bfcbc9f8683413..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2299 zcmVJNRCt{2TTP4{#TEWubRfVjFqAENd?_U0)8}J=1?xUDe&A8AQI-{>=2NSFgXWdVe)5NU(J5 zmBksT=b+>VAm;&uA|e1lWWe03+)HL8hws;1XF;Fo+EATs{tEf5z)){)eEdq21A&}l zgue}-pFeZz_zD0B06cp9)gyrZ10V|krDU+lqN0JHVS=(3NUTJRjxL`(aaxv+y|Or~ z!hecj(P*&g4vGeT)(Og7B(c)h`iPoQ>Nx-l>Gfn+{U5+WPl8`4As)$YtEwmZxk2XE zMIeNJG$b%D@F3>%M4(_^i6F4a*yu2ERmY(($0q+%C*Kw#2o+#O-8Gu( zRYrwf&VptHwnhhRht4W2;dLBv4;BOoC?%Mi?O|>aQM)danGUsxNUwncJJDWnO*>;1Ym5J)vbBsdo(KcMGf&=!C%*eN^g?T9;sojlB$F6kCMmVs$p_VuGhW0__^F4# zfggVF>j(m4;Pul=o!ppM7m<}9VKAnP8_Tg_GjPsgtz!1c;_J_XC)<#TGxv##I6eeH0Zk)xzTlaeD%j<5R z!?|xUhx@kqCtu$K0*hbSg)iJN>uMqZV0~i?%WwV{|9R_utbcqB%#{@a5rL+{=GHcb zrKrWUMp3LvX%lj)BUk!O9N7Owudx2c*|+hl7hc1q%Nw~S1+#yMLJ-a(=*>X|_4$-{ z6sxSST9Q+iAwZ2iH{alF*7kNEzxn;&@zIqnsGye+ly@-kN>UIN#@8KOoAVYk<~O#m z-vT7DbH|Kx^m=#o5?0sNp@JSng%D8yBwq>v5C}vmK!p&f5=X`RvD9KUH&7GyZ9b>| zBqA0HL-*~qy0(rWn1KprAVCO`V5D0{bBf52C`+$!h|srUaLI>Sk(10oI_-cVu5AyX zf?h&U0I66##TSzKIhr{Sw_41+zbe}iMm@FUq%x_S_J9bW0*F$hh?U%YHr*K&s3;p> z0q;C0o}}u%x-jl4Tfw>$1Ok3Qf4}u1UO&5POhU6JdpT(voVFARl6c_mc`QA2XIE1L0Pa}WlOf%XmtI}Q>u1l! ztF&f2wj#(is&V+6$u?l;4KP=IB=Nz;t44B)_tc0WpKzb^J_N`Jpl&j4C(xQWzjg&= z1d+6wH^+BB{IUZQw z*h-pZDKYk~>2;1mnxB3`LFJgTa~~Eb8$kep z!uhpzWSePqkncSG@>rf}nNvb*4L#^%Fu0Cra2<^L7$%T;Q4qv0fBrb0T)Nk3zCZut zP5k=B*M{Ru42gnLJp{eEctZTM8&;o6~ua7+9K$PAh)JkvcW__sW5K#>JZr{JrX4}wbQ9X3K4}Mn2C>jN}WXx zABs{TP$6T&Sc=v7T7?rBKFJVDsgZ($pCUC7^^>zLH;7VD;S7|D4-I9gHdP)U^N3Oz z|IJ*?4^IaQ^!{n04$$8ak@`_o4{|W@lKWFZn8QIlTRfvBnO&!hng=&zVP6*#-8I{9|^$`OZ79=A1L< zobe%if{y0piWFBivcOg%tOHXW2r?1TCu47Q*kl#NJkCid$A_3+BK ARrrdPr z=KC60!pi^}0U;6LwlgIi%%%pQm2`Z+zNM{w{Pzh1&TnpLf<$i%5_7YnFh?-iyb7J0 zm$kGX1#TGBx%s{ZQ^MZ~RB=02CAXMtUKKhv)wi^@Q%Cc1MN*Z&5{V7j7M4pen@4m- z{eqC<%0>W<*%p+0P@@!AHVPKl3J59Na&i!f1hxnwth`Mau=!- zAjsL4k+TqFk?+>iLqsI9Eh5*+8)QS?ARF=q*^oELhP**G)AAr zxbP8%4!nx!saAkJk(DtS8zc&gP~Q9m${yST2x0lOxPjS3G3LA}xgGZumH7eJa6u|uGO01DT97IU|L8*+6W^uaz{`S}lF zj10P!Wr;Mm5;UntH4_OK!vn5zxa!5^nnk#4_gfH(bvMq;h_#(Wc+YdLZjuTDD1Yo5 zh#Y?p$?i_a*V(b~rPtwKx_sg|da4zdU-+J@9L}F0B9uS+HIQsQL(9w-ZByC;6P;(!|JxT`o0ID}HmGRbMu9uwC1B}DqZho414oZm#f@*Q?568p2$%ZGvg63v*lCdE35Ea)O4^u zwK}t!#K>O`Koq1_o#Lj=kjno5MWGrFA#&nyN}Msxl&>R$jB7(+O#@jBF_fA`AX#?Y z4rPiF9i4K_Y7#>SerFjQT>0s#28FtD_4Pfj%5!9p)*pr$8-q|%pBAZNKKzT9A<=op zHV-Ef(E57qMO9RSq*Q6l41M6{PM|rfVq+svLl+^HrW!<&jN;EdJowCQrjUZlt59S}lJkA`~}mhFp8MeGI+qOd#TE9#>g(Ml}kA58_tYyVIPJxq&jLL9} zV}rE*%ZPk<^!j?11qJo1F#nrBvV0M9rbM9p%TGXAxWw`_n6e#$J}I7Eb^#s}b=Q{sBU3?xwY@Z%`^;#bqYkgB0>#Lk{} zo)f^pt1r2Vx5D@Iz12IN2Ag9efKNhT#cInNAtK0CwJ6^3AlNXWg+tR<2@>!xS%%7O zKSAjOk3meDo1P3aW8k%yk-TuusZ`H!y>Li@AZmX6O9WT0nKmxnq&>+Bq|yrb7u|#4 zs?Wf`xIXRj^z}T9_}SA4?fgzwRyk(0vMN{AqUO21wksQ6ppOh9wBuV)d%9+|oOH}+ zET)A+=-u@Uw7%Z7jkXsU(J_Qy*^xDKfD8t!TJI(FKL0cloo75ZiJ4)Hj^N7fXAx^V z>1l4aWHg%BF8>$3yPm=DJ8yyw!z)clUO11?Pq!g<`nYE~XG-pT{=y7>un)t3d=uCH zb}(nY6Y|U;0I45PRm=m))AUd`h8~ITPK>?(E}|bEgE2bnnH(?h)}YCWCx3!hRR^iG z3?%!nn-U#`J`hH-_afBLMHoZI(g+18P(F!KpPCidUhTqw_Em^Cu7U+4k# zFaYai(>oXjx9S1)@RSXf?)2TK#+kgqk^q4EmbP~2+-$O${eQ2?GUHoxjqhVN@gB6S zrTwVTv5DC{!ps`a=5j?Y!mKfyM}&?|b%707*qoM6N<$f+fN2fdBvi diff --git a/app/src/main/res/mipmap-mdpi/facebook.png b/app/src/main/res/mipmap-mdpi/facebook.png deleted file mode 100644 index 998649f5b59ec14da22de8902e37bb4ccba339d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1407 zcmV-_1%UdAP)Ruov~0p~ZfRk5kxrdCKOHE1LO>%YxTqlp_b(d| zFEDf47&D^+!aM;D{LhGpMid3}n%SHL$jgv9wEqq%KB`NtItTE+&=Wyl~YK` zW9Pn29-MR;)mA%7;%18g1`q^fHfmr1olc0qS{-cPY@@l|!shQcu(NAK z8QO<9tGg!yRREj)&div+a~!9iI*#dw@4>!XMnELTAv5F6cP`+Fh5pep+2l4WACs5OYRbRTFz-*As0+qG?c@bNbYbOWRUfGJh26qKsvZZGRKx=c`t!HhDeALBRBx~FSNXl=6z z6^uaX28dL`8xeK?mfcUT#0Ahk;5P6XVNU9V3>DN71hu57rf&eZ3}+A*foB0qdy3%W zwjs*n4kd)>V!yeeZlI5<9Lm3Lr#439s0Z0-v1NUa2SlqI*Fi*4nUK0sADr^Fpg({Of3I)=$4!!SdHDVD2PW7^m3R&OM9c_fLv)zFqkhZ@m3}h5=D=RvK5YwW0JVY}3O^ zbwC20Eo3)t?xNXjflVg^KI%qW?T%GutKGrnD}UrVP6mU58gy;c+KE;&z}M6f5tOb2 zq>$|k7=Q_PlQvl*A_ZL=0|gp{w6=g0l+x}XuHr$?v`Pe08i5Kjff0WvCy3biAgF_> zsKY%3@ZNxHELdEKpB~Bcn*cDEnnVy$+EypJy=>KjSlsD&(0kq@qWsv@val-G0h{#R zNkj=bnLXLDNfoy)HJ!FemFGngYxx>oHLIt?-72nB0(f?)HB7P&ck^Hz-+K1;3Ao#` zSDidoN~0NF^7;UQV42-|$)85Oiaq``UUHPx><~>c1Ox z2KL@vg^GUnz(Xwj>De;;(-w5@D1eqlfDW()Ay&}2$IdY9Vk|2YhI7o^F3-c>)6R}z zhE>Oy(FXIJT3VQ0G{(%Z!NsCG6~UGn1P}Yk%*;E?d=YGBmKJ6g{{|MrhsGuJ+fM)h N002ovPDHLkV1m=xjnV)B diff --git a/app/src/main/res/mipmap-mdpi/gplus.png b/app/src/main/res/mipmap-mdpi/gplus.png deleted file mode 100644 index 54f1b83e22c6f91b57aec66acfa08728156d67e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1379 zcmV-p1)TbcP)ky6Hp)V%eCJ zvRS7C+gUnWvK7{4Yt}Ano0sNtx##hZc5Sbh%Ui2ypdSe2`905FK0ls&?tae^f+_kP zY6$As{r>67yv#fmDWwg$uZA(N0K_PQ1p|=X zE==@YK;W-VFu!*pT_ZyJw%^ASIlx@G4!KV}3(LI^f>8YlWFZOOGbi9VdI+-HHE&Tp z;!c2=MC9*$8QELvqKeOjg(Qr$wP5u4*GWr8BQ6ta%|gk$2Vi$Ro{&5MP?L!4&D%jO z)}#bu5pxX?qY1@tG$W%ja=piuFytH8!2*5=*>)Im?ocHe_6)<-^deZmzi`&Gh?zj% zjy=ezTCa)AZWnHT{{?)Vr&Np8kXwMPOs&eMI9e?26F12*2sH1f5A}mn*e7~Ppo)`p?HSlah?~tE0Shdk-1@$TFN^HcS}=D z`TrB$1k9_eK~3sPd-TLHFyHupE|mznmyo!kTod!3Kcjo1+$VRzzO_ECANBp&0rzKb z0RXHIJdC1!AIx-;nd)9Ft3>&c-=^D&ZyW>9I8^7-O+c_O)5PTKgSt{g6d`10#kL1P z&6b(tDAmmL>^?H9j~h*zG5U)*p#md8IG@v0x5?Bj%#F`&15pxC#ypysv1ob3c%rai zVEVi7+^=xf*G#v?vP!J@@Gt;C8tB8|Ydfd=5=ub2;?%^f_tzr$Pj|%eL1!<(joa4!3^%D&n2UclIQFXHRP4 zIrYzJ5|A$UMU_ef-P0GFkh z2?%?tir&`iRK`3ItTs(0DwdYRR_g!@PC$0MRM#oBWWrYKK;gdkVJ@pw9mm6A41M}K zl<`~oMoaZqv>fJ@RWKEn=*o|Gw8L}s(EMy85Z7vCelM;z?!svM zci=3sLXI;9H;;XZq2@--18gBkVpG3%)}~(29mg3%psN!j-yDGC?47r$9tkIK8$(_J ztkpFTSFVCFuMor}f=LqykGK)MbP<8BPJ~C?3+<~R=>!%FY5!(!DS=e8lt8MXoOAt( zY>~q`4^jf&lWLJcifGv1bJk!0bFw^1tlTRG>E_lb)b&UrVL{jId3-6>Hiye*xQ lnEA7ZQ<{E@l&*ib`4_Ib_;Xl7?w0@n002ovPDHLkV1ha=irD}F diff --git a/app/src/main/res/mipmap-mdpi/launcher.png b/app/src/main/res/mipmap-mdpi/launcher.png deleted file mode 100644 index c22d4ed8f15633e5c9059f859d65857d3972c36e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmV-z0+RiSP)GS2_eWu@ik9+U?y}Nhs9S;cjg-K#(tyHl>SybNqZ$}9TXo+WxH6?XVs zEPx&t&$lf%0WOkE4Cf0;BJ^J3z1*YSuaO?R!EMV;(%hOf^8i4Spt%9+b!`PRkv<5} zSu0flF8Z-IKBT#}aH+T)9Ungdp*)FqJ_%V?qIwWORNjxBlfZLPH3=V?^q9mln}h(q z2?2Z)0{CXyNuxI(V(LnKRnq_X2EDgWPrt8IZxH~`7GMgOW19U|aM4xvU!f4dH%`Vt zZ|@aseK)45`PoHRZUU&jgMNL-Mbjgs4=|g@nfuQjSOK~(9sox_QeETZ38X`RsmCLI zfTN%2K3htCnJe5(WEZc)T$qn(w)q8eFfQCIC9dAVbm?wP>+QY7ZwCP~KM#ZezHu{= z{rV2u_%x!qz|B%(dmX*)br(&Kkoi|A1n^A=;F}P@H`xp@v`=}wLj$yYcsUV7J1U2^ zm~2&2`d=as80p=hj*47&e@jx$kEQXEba2>cZbZj}09=J7xFp#Reysf)Ne5GXdwc## zy%T98+p4t{%q+|mmtk0znD;)+EkJ`7t*VEO=Eku3z$EYoVK|?GD<^va00000NkvXX Hu0mjfO9Kih diff --git a/app/src/main/res/mipmap-mdpi/widget_preview.png b/app/src/main/res/mipmap-mdpi/widget_preview.png deleted file mode 100644 index ac7e269f3356b61fbad51e31aa58a2a404024fc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4170 zcmZ{ocQD-D_s2ho8a*LOSS{g+mV_Y6DjS`(c@W)-61@e%vszd!gdn;_5hjyne19{)Kfb>^bMBdY|G8)8p7VO2dt+fxO$ItHIsgC|w6&i6P4f1C zjE0Iddo86Jk=!*OHEkmr(g>olk0GsTy|m1H0D$rPA0tZ@W#k3`rY-F!szw1h+o(Vl zLlXjaP}f>UO@@yad54*u%@X#snhz7h&DPcMG|t$yW@>d@UaC}Td%~Qjv<137>h3ao zOU$JPXRB1v`kma=baA#b3=kkEGaZ*b`TPUFwql%V?KRh0j3 zFb(j8oYGl^Oy$IaT6Lde%997^Oo4^Jqt{_hR;5*YD59!Gb%&-W{~AB%x+hO-nf?pU zZ+Y)~7ktI$Lk;l-GUNk5SWAJ@cU_!Wr!Y-?WioXjP#rK)Bj|bJqvxe^*V$IIT5S3Geau- zxT#Bh&99!c7csqE)nt~Ko>3}uu&sP9nSp@SiNARR&skQ^b$d5nw0mE>Bb8 zXG3mpQEJM96V$}<1E~)lV-}l?{Rvr!hHAgT9E#&Ia=R^=xzZ%xA^rfE*slWHBB=hVGKl+O__~Gl=$$S0NV!TnYeiOF?!n?QGX|gLQXH z{i}OI#a*)6)Yfm7?27q`!5>?*J9g1pwG8gM0|3Wu9N5q4)e09-M+da#lgT=aG~@L( zTJzZ8wJlL%oOd!SexWx3K&38b*zo|LrgmO0%QVg&7c}IAJqx*=A03-P>uk}>#6;_O ze&!wKp^UW~o}{||p$0VX(i$(rJ+XzQ2_MRi5A%VkXFPwY1a zfM?v{k+hta0E`0Q17x_!^)$07BRZec05AQu%N#N~$L_8SK_u}U33}63egq&^9B zSo@tU7MX%N_LA&WKE12Yyb5G{UKz^|ohpC$BZv&@%#0|ib=*Z!P4;!;ql9gLSJh{Q zy$|VdzM9+EpC!JI*4+0pYZm9xc)76c(e`y`5r(=18M+74c?o$-ba5_ z_dK#3myHQN^`LkWl#lJrO*v2a#l1cvurSn-Fz2j9xd)q>vBhU8=Y45$_}=!_w@%J> za=o>XbgHM^*LinJ+O-eyHsDWi+*zd(q4Jb^7k(a+t7iV&dW&v`ZUTS4eY&Wof%?S5 zKxVFAQeWN^vkUu$i$2;W6Sr3Qa+1+Bi|D1$$GJi`y5QbeGk`FT0o8rDED(& zUpOya%TD;&3$p2lbkue5^k#^(kJ*Ox5KWZ^(rWXn(oLMasyKzEd+0!_`C)BPnzg8b z$1uZnC)Y~wMvH~@=u}F!n%aN;(~VnDyX6 z(}uV0dj?={iaC@M7<$8X9}+#$0NPEUix+WjqucbYD_pKeji|Av2%Id}Xf#P6JddJf zx$g@Ctw`RB6@Za=CR;mggleM?^J-y z+-)kzTG1C#sqS*j>I@nDKchBF1byu01l^cC1?I0X&;2y7XaM>{!mT|-zOD1tJbcFF z^jPiA*p9xkFYqpKq-~e%CcskejB8de)t@7%A2BBni%V|WN3kO9|2vheSfAh^v$#lc zgH#R2&Nv~feWG;oisc-xLRG0@Y5-&?^!(>7bw`v1$D>ar-XRJWNt*$RBFO%JIP+xe_J{Mc?XAHoqQ++deJ7LnKFReZIMISJtc#U~X>ulGd_xPr6$=7L&oQPT+P z&snD_2%7}1mwhU%Iw?lXkBCMfRf!Rk%X83VjTHuLfyAJ^B2H)Z5RDfyBGl0_6T$2oHHrBfRPsi-NxM{6(dv`mh*KVbne(n&{xQp!5r5{qtHk>mk{@<4l4BbK=GADQC; z;9kVhYZmHu8-Bf~wnZw_39bOZyDo+<@S4wOSHe&NL)o;blGhSoBMW+9VIVq)3$%*2 znp1-8C(CDzm!D^y1({4&nYw4h586{G>QxzRcCyW(A914nFh?tcBakIZH|fLnkLzOm z*}R8k%1HWqXxT9z7}C8=aP`Bw&r8tdV&3#9p%RMiQV@SpiX41bn#sZOFLQ;!vz76A z<7?$N;RU^CT6OU-lkh{TJNFiZ;OyuQJ^i;2lpy^;*&8*!=X&I} zvNw{~M+HFg$>%9w(IxIyMqJg)h~LC{Xc~RC>_p3ap-ab6PF}Si$^zV#NO4%rOWuB7=zyW#p~Fx>SeUq-=BX;S29Yc9C`!~6EF(vu z+L~s97Qa}CrY_7SEJ{F+-s#q4fE^42J#a<8XVSktlN+Y`)IhUsUnH@~Jp)tvi| zn3e4qU4sib5k6bE(bsyI-;bjqdEsMW{e$Gi9}BLYgbb|Xh=b%7=3H7P5lSYI(ab4I8*v-nd)OkLe~h1|t@_p9@4cySY8D{$Kj3bl3!vS$Rm zl@G*-b~Nfjo*Bd%czVW?0r|2P`mFE<0LYI<_E(wGCMxOs7C@sdx;#G1z0{rzsm0qH z`+F>cqkn3|za>c^32@&xcpq90tTqoBFfZ0Y2e@yeO10R$HUw_hnpG11N_@1j=ZM+Z zp*ty($8|HMPCZ>~Gen#$c|*0x zKVzb?WJEaU7HA&c6`peJYi-8;&F-Ixp<@kgP3>Ukh6Cd$2?Nz&cIp?AiHe3rrGA99 zk;0WFtaCC4S@d1DicIiM4()Zl_p7gKgI^a18LoC3E^oiLJSm|*Nh`p}<@@}p@7U+lB+eZPiuL%4 z;cy|U@F7XDgb;7+=uq3-9!caE!hXwz^A$5zZRW60v{I_RtXkpBL%GViK)&#X-e2t= z@7$!&=I(vzF}k74G#H25i(=x9mN?ziIp{24a6llaz0VkEpP&EJF(|4{mK4W`cN@y4 z=`-X0H|onM2ZqnId#lQ;7|GjO7%d>pr5C#_+EPDT^ip{SE5d~wzPl^qB>H}}DJbL7^Qj~!&=E;a&|d4RABIwGZ`d(I|*VBy)=y1|YF z_r62mPUj}!A};le+#v3`qk}o@SpkhhNSeg2+0leX>7Ge59KHyFaEubxd;@!C4~V{+ zHtrAhJn^PZ4|VY7h$%FGTXQ*M|GWE)QS|=lAaAiQQ+s}W zX7J{SAq&NP->Y|Z4K!fFIiL82ofS9{v+pq(+T)L=S^w!f~m~R zmUL#z@eC>Fr5|y#cJYMWu+g46325;(_#qq9Klw<>4TDn|)eUeuxv*R{nbUH1%ec*& z$K1skwuodTL#9=JRvaGz&vb6^zEqvGPDfd!M*LtYBbpEg%fr4Yl({6nowE!%@pYcw zkd313LUbhRg;5D%M5kqf3_HmrBA{rKL3!fpA4OWiz1Q;3Xlx-=5_dyX!4E7j#SKly zT_fEj)l(u>hy#JG+dI2|g#omqhI8$9yy4Ky@S^>l;g`S#aS(-?>BnN=Sq%Qg!4&kS z4|N>*U^Dw8V(XW^q=Bh-(0Aj}XVG_Y^})j1#TNq>;IX3KvoFp0n9S?KedaNaWiYRl<=wx@#SY3X&)p;FDoLFvqISk$O?u90Z-ATJUXeWltAJ=+)AZ# z|CxrVAZDEr_Gog;qmgWND*?pVC<6T3*QMILJ| zx{*(J-2N*hNJ{g;bgK3;^k?N4#$8JPAkC9dLHIZ3EN0=gClmm)3iDim3R@q9ljYKl zUFY8lRyNCAoKwxs+1(&n&!4pnFN2;c)O{O~%9IN-w7T>G8d-p_y>=Nx0PtZYc4&wM z?1z94y9)&=3@!9!N~JoQM#A~3v9pXH_^?;zgW0COM8z9eORpEm;9PM44c>ev~KW< ZjI!?#TO&SfP5KM~wAG|z74+<*xs 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 oOU9Wf;-jV!Z diff --git a/app/src/main/res/mipmap-xhdpi/gplus.png b/app/src/main/res/mipmap-xhdpi/gplus.png deleted file mode 100644 index 47bd6ef31f3e9e3372ac395c4faec0fb03a04ec3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2649 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 Kpei-& diff --git a/app/src/main/res/mipmap-xxxhdpi/facebook.png b/app/src/main/res/mipmap-xxxhdpi/facebook.png deleted file mode 100644 index 7635bf3c522ea9ad9cf96448fd54de89bc258fdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7029 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%0D^@46e>j$oab}* zgBTSVB;@BPJDRvZ1MddVY_ANxAVa4p{lpK?b?fsFyPVS>QhQ?xM+&fXZXH4hP#{1Q zASAp<6d)A`gsJ_C4@LR;oU-&ajeSwxXnaA2Hc62mbaDZ(O-_+?paxVm8MjK zR5AI}?$4NkugMraa8^=KX*6bEpv<+7$ZyvAr%xz2dS@8<+&qxbRFR*Hyt~U|c)u-5 zN7<3*EhDS)O^jD?}`-$}|bfR=+;^IXTNG{v)i8 zNL&BZJhcKF+UcuAq0`Ej=-sXm8M%(hucN$TDW4Mz0mVBc>l~6-w{>>O(K6G857Hxct-t77{mBp!RMN%;XVyo z<4Kv@u&RF9I>_%UiFEk>u7h7yyt_1L-K3C1t6!J=6XmC5xK;wETQM38eii)R6(S?U z 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 + + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7e8978c..3728d72 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -8,11 +8,15 @@ No hay conversión de unidades, usted puede copiar el resultado o la fórmula en el portapapeles con una pulsación prolongada. - El color del texto del widget puede ser personalizado, además del color y la transparencia del fondo. Presione el resultado o la fórmula en el widget para abrir la aplicación. No contiene anuncios ni permisos innecesarios. Es completamente OpenSource y además provee un tema oscuro. Esta aplicación es tan solo una pequeña parte de una serie de aplicaciones. Puede encontrar el resto en http://www.simplemobiletools.com + + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4ebf0e6..4984a4e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -5,5 +5,18 @@ Une calculette avec les fonctions de base et un widget customisable. - Pas de conversion d\'unité, restez appuyé sur le résultat d\'une formule pour le copier. La couleur du texte, du fond et la transparence peuvent être modifiés. Appuyez sur le résultat ou la formule du widget pour ouvrir l\'application. Pas de pub ou d\'autorisations inutiles. Complètement opensource et fournit un thème sombre. Cette application fait partie d\'une collection, disponibles sur http://www.simplemobiletools.com + + Pas de conversion d\'unité, restez appuyé sur le résultat d\'une formule pour le copier. + + La couleur du texte, du fond et la transparence peuvent être modifiés. Appuyez sur le résultat ou la formule du widget pour ouvrir l\'application. + + Pas de pub ou d\'autorisations inutiles. Complètement opensource et fournit un thème sombre. + + Cette application fait partie d\'une collection, disponibles sur http://www.simplemobiletools.com + + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1f586d7..714d456 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -10,8 +10,13 @@ The text color of the widget can be customized, as well as the color and the alpha of the background. Press the result or formula in the widget to open the app. - Contains no ads or unnecessary permissions. It is fully opensource, provides a Dark theme too. + Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors. This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com + + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c011b4b..72a2ce0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -14,4 +14,9 @@ このアプリは、大きな一連のアプリの一つです。 他のアプリ http://www.simplemobiletools.com で見つけることができます + + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c7fad83..b476aa6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -14,4 +14,9 @@ Esta aplicação é apenas parte de um conjunto mais vasto de aplicações. Saiba mais em http://www.simplemobiletools.com + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 556ebaa..4090832 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -14,4 +14,9 @@ Это только одно приложение из множества других в серии. Вы можете найти остальные на http://www.simplemobiletools.com + + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 009aef8..d59a0cf 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -10,8 +10,13 @@ Farbu textu widgetu možno prispôsobiť, rovnako ako farbu a priehľadnosť pozadia. Ak chcete aplikáciu otvoriť, stlačte výsledok alebo vzorec v miniaplikácii. - Neobsahuje žiadne reklamy a nepotrebné oprávnenia. Je plne opensource, poskytuje aj tmavú tému. + Neobsahuje žiadne reklamy a nepotrebné oprávnenia. Je opensource, poskytuje možnosť zmeny farieb. Táto aplikácia je iba jednou zo skupiny aplikácií. Ostatné viete nájsť na http://www.simplemobiletools.com + + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index afb8359..b46e22d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -14,4 +14,9 @@ Denna app är bara en del av en större serie appar. Du hittar resten av dem på http://www.simplemobiletools.com + + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 0f9f23b..2e33caa 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3,42 +3,6 @@ Hesap Makinesi Panoya kopyalanan değer - - Hakkında - Daha basit uygulamalar ve kaynak kodu:\nhttp://simplemobiletools.com - Görüşlerinizi veya önerilerinizi şu adrese gönderin: - hello@simplemobiletools.com - Üçüncü taraf lisansları - Arkadaşlarınızı davet edin - Hey, gel ve adresini ziyaret et %1$s de %2$s - aracılığıyla davet et - Play Store da oy verin - Bizi takip edin: - v %1$s\nTelif Hakkı © Simple Mobile Tools %2$d - - - Ayarlar - Koyu Tema - - - Bu uygulama hayatımı kolaylaştırmak için aşağıdaki üçüncü parti kitaplıklarını kullanıyor. Teşekkür ederim. - Üçüncü taraf lisansları - Butter Knife (görünüş enjektörü) - Telif Hakkı 2013 Jake Wharton\n\nApache Lisansı, Version 2.0 (\"Lisans\") kapsamında lisanslanmıştır; bu dosyayı Lisans\'a uygunluk dışında kullanamazsınız. Lisansın bir kopyasını aşağıdaki adresten edinebilirsiniz:\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nGeçerli yasalar tarafından talep edilmediği veya yazılı olarak kabul edilmedikçe, Lisans kapsamında dağıtılan yazılımlar, \"OLDUĞU GİBİ\" ESNASINDA, HİÇBİR GARANTİ VE KOŞULU HİÇBİR ZAMAN OLMAKSIZIN, \"açık ve kapalı\" olarak dağıtılır, izinleri ve sınırlamaları düzenleyen özel lisan için Lisans\'ı görüntüler. Lisans kapsamında. - https://github.com/JakeWharton/butterknife - AmbilWarna (renk seçici) - 2015 Yuku\n\nApache Lisansı, Version 2.0 (\"Lisans\") kapsamında lisanslanmıştır; bu dosyayı Lisans\'a uygunluğunuz dışında kullanamazsınız. Lisansın bir kopyasını aşağıdaki adresten edinebilirsiniz:\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nYürürlükteki kanunların gerektirmediği veya yazılı olarak kabul edilmediği sürece, Lisans kapsamında dağıtılan yazılımlar, açık veya zımni herhangi bir garanti veya koşul olmadan \"OLDUĞU GİBİ\" temelinde dağıtılır. Lisans altındaki izinler ve sınırlamalara tabi spesifik dil için Lisans\'a bakın. - https://github.com/yukuku/ambilwarna - AutoFitTextView (metin görüntüsünü otomatik küçültme) - Telif hakkı 2014 Grantland Çiğneme\n\nApache Lisansı, Version 2.0 (\"Lisans\") kapsamında lisanslanmıştır; bu dosyayı Lisans\'a uygunluğunuz dışında kullanamazsınız. Lisansın bir kopyasını aşağıdaki adresten edinebilirsiniz:\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nYürürlükteki kanunların gerektirmediği veya yazılı olarak kabul edilmediği sürece, Lisans kapsamında dağıtılan yazılımlar, açık veya zımni herhangi bir garanti veya koşul olmadan \"OLDUĞU GİBİ\" temelinde dağıtılır. Lisans altındaki izinler ve sınırlamalara tabi spesifik dil için Lisans\'a bakın. - https://github.com/grantland/android-autofittextview - Robolectric (birim test çerçevesi) - MIT Lisansı\n\nTelif Hakkı (c) 2010 Xtreme Labs and Pivotal Labs\n\nYazılımın herhangi bir kimliğini ve ilgili dokümantasyon dosyalarını (\"Yazılım\") temin eden herhangi bir şahsa, sınırlama olmaksızın Yazılım\'da uğraşmak için, bunlarla sınırlı olmaksızın, bunlarla sınırlı olmaksızın, bunlarla sınırlı olmaksızın, , yayınlamayı, dağıtmayı, alt lisans almayı ve / veya satmayı ve Yazılım\'ın verildiği kişileri aşağıdaki koşullara tabi olarak izin vermeyi kabul ve taahhüt eder:\n\nYukarıdaki telif hakkı bildirimi ve bu izin bildirimi tüm kopyalarının veya Yazılımın önemli kısımlarına dahil edilecektir.\n\nYAZILIM HERHANGİ BİR AÇIK YA DA KAPALI, DAHİL ANCAK TİCARİ BİR AMACA UYGUNLUK VE HAK İHLALİ GARANTİLER SINIRLI DEĞİLDİR GARANTİ OLMAKSIZIN, \"OLDUĞU GİBİ\" SAĞLANIR. YAZARLAR VE TELİF HAKKI SAHİPLERİ SÖZLEŞME İHLALİ, OUT OF, VEYA YAZILIM VEYA KULLANIM VEYA DİĞER İŞLERİNDEN KAYNAKLANAN, HAKSIZ VEYA BAŞKA HERHANGİ BİR İDDİA, HASAR VEYA DİĞER SORUMLULUK SORUMLU TUTULAMAZ YAZILIM. - https://github.com/robolectric/robolectric - Espresso (UI test çerçevesi) - Telif Hakkı 2014 Android Açık Kaynak Projesi\n\nApache Lisansı, Version 2.0 (\"Lisans\") kapsamında lisanslanmıştır; bu dosyayı Lisans\'a uygunluğunuz dışında kullanamazsınız. Lisansın bir kopyasını aşağıdaki adresten edinebilirsiniz:\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nYürürlükteki kanunların gerektirmediği veya yazılı olarak kabul edilmediği sürece, Lisans kapsamında dağıtılan yazılımlar, açık veya zımni herhangi bir garanti veya koşul olmadan \"OLDUĞU GİBİ\" temelinde dağıtılır. Lisans altındaki izinler ve sınırlamalara tabi spesifik dil için Lisans\'a bakın. - https://google.github.io/android-testing-support-library/docs/espresso/index.html - Temel fonksiyonları ve özelleştirilebilir bir araç\'lı bir hesap makinesi. @@ -46,8 +10,13 @@ The text color of the widget can be customized, as well as the color and the alpha of the background. Press the result or formula in the widget to open the app. - Contains no ads or unnecessary permissions. It is fully opensource, provides a Dark theme too. + Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors. This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com + + diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 3f344e1..f2e797b 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,7 +1,7 @@ - - - - + - - - - - diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml index d1e399b..faa3555 100644 --- a/app/src/main/res/xml/widget_info.xml +++ b/app/src/main/res/xml/widget_info.xml @@ -1,9 +1,10 @@ - + diff --git a/app/src/test/java/com/simplemobiletools/calculator/MainActivityTest.kt b/app/src/test/java/com/simplemobiletools/calculator/MainActivityTest.kt index 1be81aa..76c4111 100644 --- a/app/src/test/java/com/simplemobiletools/calculator/MainActivityTest.kt +++ b/app/src/test/java/com/simplemobiletools/calculator/MainActivityTest.kt @@ -1,6 +1,7 @@ package com.simplemobiletools.calculator import com.simplemobiletools.calculator.activities.MainActivity +import com.simplemobiletools.calculator.helpers.* import junit.framework.Assert.assertEquals import org.junit.Before import org.junit.Test diff --git a/build.gradle b/build.gradle index 3eac3f4..633d203 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1.51' repositories { jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -18,9 +15,8 @@ buildscript { allprojects { repositories { jcenter() - maven { - url "https://maven.google.com" - } + maven { url "https://jitpack.io" } + maven { url "https://maven.google.com" } } } diff --git a/signing.properties_sample b/signing.properties_sample index acf8fb9..cf8e239 100644 --- a/signing.properties_sample +++ b/signing.properties_sample @@ -1,4 +1,3 @@ STORE_FILE=/path/to/your.keystore -STORE_PASSWORD=yourkeypass KEY_ALIAS=projectkeyalias -KEY_PASSWORD=yourkeypass +PASSWORD=yourpass