diff --git a/app/build.gradle b/app/build.gradle index bbc60f0e..d8c95fb6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' def keystorePropertiesFile = rootProject.file("keystore.properties") def keystoreProperties = new Properties() @@ -64,4 +65,8 @@ dependencies { implementation 'com.github.SimpleMobileTools:Simple-Commons:02b48c0b4d' implementation 'me.grantland:autofittextview:0.2.1' implementation 'net.objecthunter:exp4j:0.4.8' + + kapt 'androidx.room:room-compiler:2.3.0' + implementation 'androidx.room:room-runtime:2.3.0' + annotationProcessor 'androidx.room:room-compiler:2.3.0' } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt index 4904020b..5ee1b60e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt @@ -9,6 +9,8 @@ import android.view.View import android.view.WindowManager import com.simplemobiletools.calculator.BuildConfig import com.simplemobiletools.calculator.R +import com.simplemobiletools.calculator.databases.CalculatorDatabase +import com.simplemobiletools.calculator.dialogs.HistoryDialog import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.extensions.updateViewColors import com.simplemobiletools.calculator.helpers.* @@ -89,6 +91,13 @@ class MainActivity : SimpleActivity(), Calculator { } } + override fun onDestroy() { + super.onDestroy() + if (!isChangingConfigurations) { + CalculatorDatabase.destroyInstance() + } + } + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu, menu) updateMenuItemColors(menu) @@ -97,6 +106,7 @@ class MainActivity : SimpleActivity(), Calculator { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { + R.id.history -> showHistory() R.id.settings -> launchSettings() R.id.about -> launchAbout() else -> return super.onOptionsItemSelected(item) @@ -116,6 +126,16 @@ class MainActivity : SimpleActivity(), Calculator { } } + private fun showHistory() { + HistoryHelper(this).getHistory { + if (it.isEmpty()) { + toast(R.string.history_empty) + } else { + HistoryDialog(this, it, calc) + } + } + } + private fun launchSettings() { startActivity(Intent(applicationContext, SettingsActivity::class.java)) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/HistoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/HistoryAdapter.kt new file mode 100644 index 00000000..8b2d46f6 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/HistoryAdapter.kt @@ -0,0 +1,53 @@ +package com.simplemobiletools.calculator.adapters + +import android.app.Dialog +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.simplemobiletools.calculator.R +import com.simplemobiletools.calculator.activities.SimpleActivity +import com.simplemobiletools.calculator.helpers.CalculatorImpl +import com.simplemobiletools.calculator.models.History +import com.simplemobiletools.commons.extensions.copyToClipboard +import kotlinx.android.synthetic.main.history_view.view.* + +class HistoryAdapter(val activity: SimpleActivity, val items: List, val calc: CalculatorImpl) : + RecyclerView.Adapter() { + + private lateinit var dialog: Dialog + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val view = activity.layoutInflater.inflate(R.layout.history_view, parent, false) + return ViewHolder(view) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val item = items[position] + holder.bindView(item) + } + + override fun getItemCount() = items.size + + fun setDialog(dialog: Dialog) { + this.dialog = dialog + } + + inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { + fun bindView(item: History): View { + itemView.apply { + item_formula.text = item.formula + item_result.text = "= ${item.result}" + setOnClickListener { + calc.addNumberToFormula(item.result) + dialog.dismiss() + } + setOnLongClickListener { + activity.baseContext.copyToClipboard(item.result) + true + } + } + + return itemView + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/databases/CalculatorDatabase.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/databases/CalculatorDatabase.kt new file mode 100644 index 00000000..f15a8976 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/databases/CalculatorDatabase.kt @@ -0,0 +1,35 @@ +package com.simplemobiletools.calculator.databases + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import com.simplemobiletools.calculator.interfaces.CalculatorDao +import com.simplemobiletools.calculator.models.History + +@Database(entities = [History::class], version = 1) +abstract class CalculatorDatabase : RoomDatabase() { + + abstract fun CalculatorDao(): CalculatorDao + + companion object { + private var db: CalculatorDatabase? = null + + fun getInstance(context: Context): CalculatorDatabase { + if (db == null) { + synchronized(CalculatorDatabase::class) { + if (db == null) { + db = Room.databaseBuilder(context.applicationContext, CalculatorDatabase::class.java, "calculator.db") + .build() + db!!.openHelper.setWriteAheadLoggingEnabled(true) + } + } + } + return db!! + } + + fun destroyInstance() { + db = null + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/dialogs/HistoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/dialogs/HistoryDialog.kt new file mode 100644 index 00000000..6cd97acf --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/dialogs/HistoryDialog.kt @@ -0,0 +1,33 @@ +package com.simplemobiletools.calculator.dialogs + +import androidx.appcompat.app.AlertDialog +import com.simplemobiletools.calculator.R +import com.simplemobiletools.calculator.activities.SimpleActivity +import com.simplemobiletools.calculator.adapters.HistoryAdapter +import com.simplemobiletools.calculator.extensions.calculatorDB +import com.simplemobiletools.calculator.helpers.CalculatorImpl +import com.simplemobiletools.calculator.models.History +import com.simplemobiletools.commons.extensions.setupDialogStuff +import com.simplemobiletools.commons.extensions.toast +import com.simplemobiletools.commons.helpers.ensureBackgroundThread +import kotlinx.android.synthetic.main.dialog_history.view.* + +class HistoryDialog() { + constructor(activity: SimpleActivity, items: List, calculator: CalculatorImpl) : this() { + val view = activity.layoutInflater.inflate(R.layout.dialog_history, null) + view.history_list.adapter = HistoryAdapter(activity, items, calculator) + + AlertDialog.Builder(activity) + .setPositiveButton(R.string.ok, null) + .setNeutralButton(R.string.clear_history) { _, _ -> + ensureBackgroundThread { + activity.applicationContext.calculatorDB.deleteHistory() + activity.toast(R.string.history_cleared) + } + } + .create().apply { + activity.setupDialogStuff(view, this, R.string.history) + (view.history_list.adapter as HistoryAdapter).setDialog(this) + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt index 8ce61e14..a3b2b266 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt @@ -5,9 +5,13 @@ import android.view.ViewGroup import android.widget.Button import android.widget.TextView import com.simplemobiletools.calculator.helpers.Config +import com.simplemobiletools.calculator.interfaces.CalculatorDao +import com.simplemobiletools.calculator.databases.CalculatorDatabase val Context.config: Config get() = Config.newInstance(applicationContext) +val Context.calculatorDB: CalculatorDao get() = CalculatorDatabase.getInstance(applicationContext).CalculatorDao() + // we are reusing the same layout in the app and widget, but cannot use MyTextView etc in a widget, so color regular view types like this fun Context.updateViewColors(viewGroup: ViewGroup, textColor: Int) { val cnt = viewGroup.childCount diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt index dd88488b..c2606856 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -2,6 +2,7 @@ package com.simplemobiletools.calculator.helpers import android.content.Context import com.simplemobiletools.calculator.R +import com.simplemobiletools.calculator.models.History import com.simplemobiletools.commons.extensions.toast import net.objecthunter.exp4j.ExpressionBuilder @@ -242,8 +243,10 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { showNewResult(result.format()) baseValue = result + val newFormula = expression.replace("sqrt", "√").replace("*", "×").replace("/", "÷") + HistoryHelper(context).insertOrUpdateHistoryEntry(History(null, newFormula, result.format(), System.currentTimeMillis())) inputDisplayedFormula = result.format() - showNewFormula(expression.replace("sqrt", "√").replace("*", "×").replace("/", "÷")) + showNewFormula(newFormula) } catch (e: Exception) { context.toast(R.string.unknown_error_occurred) } @@ -345,4 +348,11 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { R.id.btn_9 -> addDigit(9) } } + + fun addNumberToFormula(number: String) { + lastKey = DIGIT + inputDisplayedFormula += number + addThousandsDelimiter() + showNewResult(inputDisplayedFormula) + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/HistoryHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/HistoryHelper.kt new file mode 100644 index 00000000..18a6f8ac --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/HistoryHelper.kt @@ -0,0 +1,26 @@ +package com.simplemobiletools.calculator.helpers + +import android.content.Context +import android.os.Handler +import android.os.Looper +import com.simplemobiletools.calculator.extensions.calculatorDB +import com.simplemobiletools.calculator.models.History +import com.simplemobiletools.commons.helpers.ensureBackgroundThread + +class HistoryHelper(val context: Context) { + fun getHistory(callback: (calculations: ArrayList) -> Unit) { + ensureBackgroundThread { + val notes = context.calculatorDB.getHistory() as ArrayList + + Handler(Looper.getMainLooper()).post { + callback(notes) + } + } + } + + fun insertOrUpdateHistoryEntry(entry: History) { + ensureBackgroundThread { + context.calculatorDB.insertOrUpdate(entry) + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/interfaces/CalculatorDao.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/interfaces/CalculatorDao.kt new file mode 100644 index 00000000..0095bcd7 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/interfaces/CalculatorDao.kt @@ -0,0 +1,16 @@ +package com.simplemobiletools.calculator.interfaces + +import androidx.room.* +import com.simplemobiletools.calculator.models.History + +@Dao +interface CalculatorDao { + @Query("SELECT * FROM history ORDER BY timestamp DESC LIMIT :limit") + fun getHistory(limit: Int = 10): List + + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun insertOrUpdate(history: History): Long + + @Query("DELETE FROM history") + fun deleteHistory() +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/models/History.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/models/History.kt new file mode 100644 index 00000000..11cf789c --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/models/History.kt @@ -0,0 +1,14 @@ +package com.simplemobiletools.calculator.models + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Index +import androidx.room.PrimaryKey + +@Entity(tableName = "history", indices = [(Index(value = ["id"], unique = true))]) +data class History( + @PrimaryKey(autoGenerate = true) var id: Long?, + @ColumnInfo(name = "formula") var formula: String, + @ColumnInfo(name = "result") var result: String, + @ColumnInfo(name = "timestamp") var timestamp: Long +) diff --git a/app/src/main/res/layout/dialog_history.xml b/app/src/main/res/layout/dialog_history.xml new file mode 100644 index 00000000..b32753a9 --- /dev/null +++ b/app/src/main/res/layout/dialog_history.xml @@ -0,0 +1,10 @@ + + diff --git a/app/src/main/res/layout/history_view.xml b/app/src/main/res/layout/history_view.xml new file mode 100644 index 00000000..519a7f31 --- /dev/null +++ b/app/src/main/res/layout/history_view.xml @@ -0,0 +1,33 @@ + + + + + + + + diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index 1b13619a..d7d1fce8 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -1,6 +1,11 @@ + الحاسبة العلمية خطأ: القسمة على صفر + + History + History is empty + Clear + History has been cleared الاهتزاز عند الضغط على الازرار @@ -20,4 +25,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 207d52dd..b0d08b4e 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -6,6 +6,12 @@ Səhv: sıfıra bölünmə + + History + History is empty + Clear + History has been cleared + Düyməyə basdıqda titrə diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 52fb5703..8cb8d1f1 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -5,6 +5,11 @@ Calculadora científica Error: divisió per zero + + History + History is empty + Clear + History has been cleared Vibra en prémer el botó diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 959740a0..002b0ba9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -6,6 +6,12 @@ Chyba: dělení nulou + + History + History is empty + Clear + History has been cleared + Vibrovat při stisku tlačítka diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index b4057e9e..d1ccef34 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -6,6 +6,12 @@ Gwall: rhannu â sero + + History + History is empty + Clear + History has been cleared + Dirgrynu wrth wasgu botymau diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4a849eff..70e81a3f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -5,6 +5,11 @@ Wissenschaftlicher Rechner Fehler: Division durch Null + + History + History is empty + Clear + History has been cleared Bei Tastendruck vibrieren @@ -20,4 +25,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index a3b5123e..c577177d 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -6,6 +6,12 @@ Σφάλμα: διαίρεση με μηδέν + + History + History is empty + Clear + History has been cleared + Δόνηση στο πάτημα πλήκτρου diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index c6beced0..5d7a3824 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -5,6 +5,11 @@ Sciena kalkulilo Eraro: divido per nul + + History + History is empty + Clear + History has been cleared Vibrigi je butonpremo diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f250cc60..63e57450 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -6,6 +6,12 @@ Error: división por cero + + History + History is empty + Clear + History has been cleared + Vibrar al presionar un botón diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 56a7ad15..2a7b05d3 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -5,6 +5,11 @@ Teadusrežiim Viga: nulliga jagamine + + History + History is empty + Clear + History has been cleared Nupuvajutusel vibreeri @@ -20,4 +25,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 174c514a..8d06d78c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -5,6 +5,11 @@ Tieteellinen laskin Virhe: jakaminen nollalla + + History + History is empty + Clear + History has been cleared Värinä painikkeen painalluksella @@ -43,4 +48,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9c0fa517..9379f4e9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -5,6 +5,11 @@ Calculatrice scientifique Erreur : division par zéro + + History + History is empty + Clear + History has been cleared Vibrer lors de l\'appui sur les boutons @@ -20,4 +25,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 2c609f44..8afe20ef 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -6,6 +6,12 @@ Erro: división por cero + + History + History is empty + Clear + History has been cleared + Vibrar ao tocar nos botóns diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 7a0468bf..f597faf3 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -6,6 +6,12 @@ Pogreška: podjela prema nuli + + History + History is empty + Clear + History has been cleared + Vibriraj prilikom pritiska na gumb diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3d478726..a03739ef 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -5,6 +5,11 @@ Tudományos számológép Hiba: nullával való osztás + + History + History is empty + Clear + History has been cleared Rezgés gombnyomáskor diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 32267811..21d4ef95 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -6,6 +6,12 @@ Kesalahan: pembagian dengan nol + + History + History is empty + Clear + History has been cleared + Getar saat tombol ditekan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 595afb05..93281c0a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -5,6 +5,11 @@ Calcolatrice scientifica Errore: divisione per zero + + History + History is empty + Clear + History has been cleared Vibra alla pressione di un tasto @@ -20,4 +25,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0231629e..70b292ac 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -6,6 +6,12 @@ エラー:ゼロによる除算 + + History + History is empty + Clear + History has been cleared + ボタンのタップ時に振動する diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 0a1bb710..f505118b 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -6,6 +6,12 @@ 에러: 공으로 나눌 할수 없어요 + + History + History is empty + Clear + History has been cleared + 버튼 탭시 진동 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 4aba9896..d767c76a 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -5,6 +5,11 @@ Mokslinis skaičiuotuvas Klaida: dalyba iš nulio + + History + History is empty + Clear + History has been cleared Vibruoti, kai paspaudžiami mygtukai @@ -20,4 +25,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index bcf49c5c..d2f9f7d7 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -6,6 +6,12 @@ പിശക്: 0 കൊണ്ട് ഹരിക്കാനാവില്ല + + History + History is empty + Clear + History has been cleared + ബട്ടൺ പ്രസ്സിൽ വൈബ്രേറ്റുചെയ്യുക diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 9d2d9586..ff99bca4 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -6,6 +6,12 @@ Amaran: pembahagian dengan sifar + + History + History is empty + Clear + History has been cleared + Getar semasa butang ditekan diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index b8b03839..b707f152 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -5,6 +5,11 @@ Vitenskapelig kalkulator FeiL: Deling på null + + History + History is empty + Clear + History has been cleared Vibrer ved knappetrykk Hvordan fungerer C (Clear)-knappen\? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 44860565..2a3c2926 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -6,6 +6,12 @@ Fout: delen door nul + + History + History is empty + Clear + History has been cleared + Trillen bij toetsaanslagen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 94c7783e..c7b8a43a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -5,6 +5,11 @@ Kalkulator naukowy Błąd: dzielenie przez zero + + Historia + Historia jest pusta + Wyczyść + Historia została wyczyszczona Wibracja przy naciśnięciu przycisku @@ -20,4 +25,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 532567df..9212cb95 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -5,6 +5,11 @@ Calculadora Científica Erro: divisão por zero + + History + History is empty + Clear + History has been cleared Vibrar ao pressionar um botão diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 122e8d9e..e718e8de 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -6,6 +6,12 @@ Erro: divisão por zero + + History + History is empty + Clear + History has been cleared + Vibrar ao tocar nos botões diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4fd34be2..2b0067f4 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -6,6 +6,12 @@ Eroare: împărțire la zero + + History + History is empty + Clear + History has been cleared + Vibrează la apăsarea butoanelor diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a3f50bcb..b2e2206a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -5,6 +5,11 @@ Научный калькулятор Ошибка: деление на ноль + + History + History is empty + Clear + History has been cleared Вибрация при нажатии кнопок @@ -43,4 +48,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index bcd23164..ee7aae31 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -5,6 +5,11 @@ Vedecká kalkulačka Chyba: delenie nulou + + História + História je prázdna + Vymazať + História bola vymazaná Vibrovať pri stlačení tlačidla @@ -20,4 +25,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5c3ebd2a..838caaea 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -6,6 +6,12 @@ Fel: delning med noll + + History + History is empty + Clear + History has been cleared + Vibrera när jag trycker på knapparna diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3ad3158b..1c689431 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -6,6 +6,12 @@ Hata: sıfıra bölme + + History + History is empty + Clear + History has been cleared + Düğmeye basıldığında titret diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index aa8b0705..2f0540d4 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -6,6 +6,12 @@ Помилка: ділення на нуль + + History + History is empty + Clear + History has been cleared + Вібрувати з натиском кнопок diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c501b8f9..c024be53 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -5,6 +5,11 @@ 科学计算器 错误: 被零除 + + History + History is empty + Clear + History has been cleared 按下按键后震动 @@ -43,4 +48,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0a0ab80e..ec489be9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -6,6 +6,12 @@ 錯誤:被零除 + + History + History is empty + Clear + History has been cleared + 按下按鈕時震動 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 75e1b3d7..b8a0547f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,6 +6,12 @@ Error: division by zero + + History + History is empty + Clear + History has been cleared + Vibrate on button press