Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
==========

Version 1.0.3 *(2025-03-19)*
----------------------------

* Changed package name, re-installation is required
* Added more translations

Version 1.0.2 *(2024-10-20)*
----------------------------

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<img alt="Logo" src="graphics/icon.webp" width="120" />

<a href="https://f-droid.org/packages/org.fossify.calculator/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-en.svg" alt="Get it on F-Droid" height=80/></a> <a href="https://apt.izzysoft.de/fdroid/index/apk/org.fossify.calculator"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height=80/></a>
<a href="https://f-droid.org/packages/org.fossify.math/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-en.svg" alt="Get it on F-Droid" height=80/></a> <a href="https://apt.izzysoft.de/fdroid/index/apk/org.fossify.math"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height=80/></a>

Introducing Fossify Calculator – your versatile and efficient tool for all your calculation needs. Enjoy a stylish, modern design paired with powerful
functionality, perfect for both simple calculations and more complex tasks.
Expand Down
3 changes: 1 addition & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,11 @@ android {

bundle {
language {
@Suppress("UnstableApiUsage")
enableSplit = false
}
}

namespace = "com.fossify.calculator"
namespace = "org.fossify.math"
}

detekt {
Expand Down
4 changes: 2 additions & 2 deletions app/detekt-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@
<ID>TooManyFunctions:MainActivity.kt$MainActivity : SimpleActivityCalculator</ID>
<ID>TooManyFunctions:MyWidgetProvider.kt$MyWidgetProvider : AppWidgetProviderCalculator</ID>
<ID>UnusedPrivateMember:SettingsScreen.kt$@MyDevices @Composable private fun SettingsScreenPreview()</ID>
<ID>WildcardImport:ConverterView.kt$import org.fossify.calculator.helpers.*</ID>
<ID>WildcardImport:ConverterView.kt$import org.fossify.math.helpers.*</ID>
<ID>WildcardImport:ConverterView.kt$import org.fossify.commons.extensions.*</ID>
<ID>WildcardImport:MainActivity.kt$import org.fossify.calculator.helpers.*</ID>
<ID>WildcardImport:MainActivity.kt$import org.fossify.math.helpers.*</ID>
<ID>WildcardImport:MainActivity.kt$import org.fossify.commons.extensions.*</ID>
<ID>WildcardImport:SettingsActivity.kt$import org.fossify.commons.helpers.*</ID>
<ID>WildcardImport:UnitTypesAdapter.kt$import org.fossify.commons.extensions.*</ID>
Expand Down
24 changes: 12 additions & 12 deletions app/lint-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
errorLine1="class SplashActivity : BaseSplashActivity() {"
errorLine2=" ~~~~~~~~~~~~~~">
<location
file="src/main/kotlin/org/fossify/calculator/activities/SplashActivity.kt"
file="src/main/kotlin/org/fossify/math/activities/SplashActivity.kt"
line="6"
column="7"/>
</issue>
Expand Down Expand Up @@ -2028,7 +2028,7 @@
errorLine1=" private var calc: CalculatorImpl? = null"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/kotlin/org/fossify/calculator/helpers/MyWidgetProvider.kt"
file="src/main/kotlin/org/fossify/math/helpers/MyWidgetProvider.kt"
line="19"
column="9"/>
</issue>
Expand Down Expand Up @@ -2223,7 +2223,7 @@
<issue
id="UnusedResources"
message="The resource `R.string.package_name` appears to be unused"
errorLine1=" &lt;string name=&quot;package_name&quot;>org.fossify.calculator&lt;/string>"
errorLine1=" &lt;string name=&quot;package_name&quot;>org.fossify.math&lt;/string>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/donottranslate.xml"
Expand Down Expand Up @@ -2303,7 +2303,7 @@
errorLine1=" binding.topUnitText.text = &quot;0&quot;"
errorLine2=" ~~~">
<location
file="src/main/kotlin/org/fossify/calculator/views/ConverterView.kt"
file="src/main/kotlin/org/fossify/math/views/ConverterView.kt"
line="72"
column="36"/>
</issue>
Expand All @@ -2314,7 +2314,7 @@
errorLine1=" binding.topUnitText.text = &quot;0&quot;"
errorLine2=" ~~~">
<location
file="src/main/kotlin/org/fossify/calculator/views/ConverterView.kt"
file="src/main/kotlin/org/fossify/math/views/ConverterView.kt"
line="109"
column="36"/>
</issue>
Expand All @@ -2325,7 +2325,7 @@
errorLine1=" binding.bottomUnitText.text = &quot;0&quot;"
errorLine2=" ~~~">
<location
file="src/main/kotlin/org/fossify/calculator/views/ConverterView.kt"
file="src/main/kotlin/org/fossify/math/views/ConverterView.kt"
line="110"
column="39"/>
</issue>
Expand All @@ -2336,7 +2336,7 @@
errorLine1=" binding.topUnitText.text = &quot;0&quot;"
errorLine2=" ~~~">
<location
file="src/main/kotlin/org/fossify/calculator/views/ConverterView.kt"
file="src/main/kotlin/org/fossify/math/views/ConverterView.kt"
line="221"
column="40"/>
</issue>
Expand All @@ -2347,7 +2347,7 @@
errorLine1=" binding.bottomUnitText.text = &quot;0&quot;"
errorLine2=" ~~~">
<location
file="src/main/kotlin/org/fossify/calculator/views/ConverterView.kt"
file="src/main/kotlin/org/fossify/math/views/ConverterView.kt"
line="222"
column="43"/>
</issue>
Expand All @@ -2358,7 +2358,7 @@
errorLine1=" binding.configCalc.formula.text = &quot;15,937*5&quot;"
errorLine2=" ~~~~~~~~~~">
<location
file="src/main/kotlin/org/fossify/calculator/activities/WidgetConfigureActivity.kt"
file="src/main/kotlin/org/fossify/math/activities/WidgetConfigureActivity.kt"
line="87"
column="43"/>
</issue>
Expand All @@ -2369,7 +2369,7 @@
errorLine1=" binding.configCalc.formula.text = &quot;15,937*5&quot;"
errorLine2=" ~~~~~~~~">
<location
file="src/main/kotlin/org/fossify/calculator/activities/WidgetConfigureActivity.kt"
file="src/main/kotlin/org/fossify/math/activities/WidgetConfigureActivity.kt"
line="87"
column="44"/>
</issue>
Expand All @@ -2380,7 +2380,7 @@
errorLine1=" binding.configCalc.result.text = &quot;79,685&quot;"
errorLine2=" ~~~~~~~~">
<location
file="src/main/kotlin/org/fossify/calculator/activities/WidgetConfigureActivity.kt"
file="src/main/kotlin/org/fossify/math/activities/WidgetConfigureActivity.kt"
line="88"
column="42"/>
</issue>
Expand All @@ -2391,7 +2391,7 @@
errorLine1=" binding.configCalc.result.text = &quot;79,685&quot;"
errorLine2=" ~~~~~~">
<location
file="src/main/kotlin/org/fossify/calculator/activities/WidgetConfigureActivity.kt"
file="src/main/kotlin/org/fossify/math/activities/WidgetConfigureActivity.kt"
line="88"
column="43"/>
</issue>
Expand Down

This file was deleted.

62 changes: 62 additions & 0 deletions app/schemas/org.fossify.math.databases.CalculatorDatabase/1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "847fbacc72515e2c4dc9985eefeb45f9",
"entities": [
{
"tableName": "history",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `formula` TEXT NOT NULL, `result` TEXT NOT NULL, `timestamp` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "formula",
"columnName": "formula",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "result",
"columnName": "result",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_history_id",
"unique": true,
"columnNames": [
"id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_history_id` ON `${TABLE_NAME}` (`id`)"
}
],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '847fbacc72515e2c4dc9985eefeb45f9')"
]
}
}
Loading
Loading