diff --git a/app/build.gradle b/app/build.gradle index a352d82c..a6c5f77a 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 25ea3346..e69de29b 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 75ca0b54..82b98a9f 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 ce5149c4..f3241176 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 3013af3b..1cc8e11d 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 87b60aa8..74284819 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 21991033..8f24bbf8 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 b56712f7..0b140063 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 a85045a0..3a35e1cf 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 744a40e3..7ab4a3b3 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 85bdd93e..e79e2896 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 b4786eb8..e9fe57a1 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 a8b73d73..44b472f8 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 8ec3084a..ff124fed 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 cd3765af..c4a40304 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 87cfe0b8..bd16a960 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 c36f37fd..00000000 Binary files a/app/src/main/res/mipmap-hdpi/facebook.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/gplus.png b/app/src/main/res/mipmap-hdpi/gplus.png deleted file mode 100644 index 897f103c..00000000 Binary files a/app/src/main/res/mipmap-hdpi/gplus.png and /dev/null differ 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 998649f5..00000000 Binary files a/app/src/main/res/mipmap-mdpi/facebook.png and /dev/null differ 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 54f1b83e..00000000 Binary files a/app/src/main/res/mipmap-mdpi/gplus.png and /dev/null differ 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 c22d4ed8..00000000 Binary files a/app/src/main/res/mipmap-mdpi/launcher.png and /dev/null differ 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 ac7e269f..00000000 Binary files a/app/src/main/res/mipmap-mdpi/widget_preview.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/facebook.png b/app/src/main/res/mipmap-xhdpi/facebook.png deleted file mode 100644 index ff957192..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/facebook.png and /dev/null differ 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 47bd6ef3..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/gplus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/facebook.png b/app/src/main/res/mipmap-xxhdpi/facebook.png deleted file mode 100644 index 7f23d905..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/facebook.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/gplus.png b/app/src/main/res/mipmap-xxhdpi/gplus.png deleted file mode 100644 index d580cd5f..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/gplus.png and /dev/null differ 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 7635bf3c..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/facebook.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/gplus.png b/app/src/main/res/mipmap-xxxhdpi/gplus.png deleted file mode 100644 index 932c51ae..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/gplus.png and /dev/null differ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 33a19dd7..95628522 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -14,4 +14,9 @@ Diese App ist nur eine von vielen unserer Apps. Du kannst alle anderen hier finden: http://www.simplemobiletools.com + + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7e8978cc..3728d72c 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 4ebf0e64..4984a4ec 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 1f586d78..714d4569 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 c011b4b4..72a2ce06 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 c7fad83c..b476aa60 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 556ebaa5..4090832d 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 009aef80..d59a0cf0 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 afb8359b..b46e22d8 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 0f9f23b7..2e33caaf 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 3f344e16..f2e797b8 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 d1e399b0..faa3555c 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 1be81aab..76c41114 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 3eac3f44..633d2030 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 acf8fb9f..cf8e2396 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