diff --git a/app/build.gradle b/app/build.gradle
index 016c184..d100284 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
applicationId "yetzio.yetcalc"
minSdk 21
targetSdk 34
- versionCode 14
- versionName "1.1.3"
+ versionCode 15
+ versionName "1.1.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/java/yetzio/yetcalc/MainActivity.kt b/app/src/main/java/yetzio/yetcalc/MainActivity.kt
index c34edc5..7b3e911 100644
--- a/app/src/main/java/yetzio/yetcalc/MainActivity.kt
+++ b/app/src/main/java/yetzio/yetcalc/MainActivity.kt
@@ -62,6 +62,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AdapterView.OnIt
// Buttons - All
private lateinit var gradbt: Button
private lateinit var lambertW0bt: Button
+ private lateinit var histOthBt: ImageButton
private lateinit var anglebt: Button
private lateinit var othconstbt: Button
@@ -320,6 +321,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AdapterView.OnIt
num3bt = findViewById(R.id.numberthree)
num0bt = findViewById(R.id.numberzero)
pointbt = findViewById(R.id.pointbutton)
+ histOthBt = findViewById(R.id.histOthBt)
// Set theme
if(light){
@@ -347,6 +349,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AdapterView.OnIt
Paris.style(anglebt).apply(R.style.yetCalcBorderlessButtonsLDLight)
Paris.style(sqrootbt).apply(R.style.yetCalcBorderlessButtonsLDLight)
+ Paris.style(histOthBt).apply(R.style.yetCalcBorderlessButtonsHistLDLight)
Paris.style(pibt).apply(R.style.yetCalcBorderlessButtonsLDLight)
Paris.style(othconstbt).apply(R.style.yetCalcBorderlessButtonsLDLight)
@@ -387,6 +390,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AdapterView.OnIt
}
else{
Paris.style(sqrootbt).apply(R.style.yetCalcBorderlessButtonsLight)
+ Paris.style(histOthBt).apply(R.style.yetCalcBorderlessButtonsHistLight)
Paris.style(pibt).apply(R.style.yetCalcBorderlessButtonsLight)
Paris.style(leftbracbt).apply(R.style.yetCalcBorderlessButtonsLight)
Paris.style(rightbracbt).apply(R.style.yetCalcBorderlessButtonsLight)
@@ -420,6 +424,9 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AdapterView.OnIt
Paris.style(bkspacebt).apply(R.style.yetCalcNumberButtonLight)
}
}
+ else if(dark){
+ Paris.style(histOthBt).apply(R.style.yetCalcBorderlessButtonsHist)
+ }
else{
// for future themes
}
@@ -662,6 +669,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AdapterView.OnIt
for (bt in button_list){
bt.setOnClickListener(this)
}
+ histOthBt.setOnClickListener(this)
}
override fun onClick(view: View?) {
@@ -1270,6 +1278,10 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AdapterView.OnIt
private fun handleGeneralButtons(id: Int){
when(id){
+ R.id.histOthBt -> {
+ val hisintent = Intent(this, HistoryActivity::class.java)
+ histLauncher.launch(hisintent)
+ }
R.id.currentAngleView -> {
angleModeSetter()
}
diff --git a/app/src/main/res/drawable-anydpi-v33/ic_launcher_monochrome.xml b/app/src/main/res/drawable-anydpi-v33/ic_launcher_monochrome.xml
new file mode 100644
index 0000000..d3299b1
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v33/ic_launcher_monochrome.xml
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/histothblack.xml b/app/src/main/res/drawable/histothblack.xml
new file mode 100644
index 0000000..8e3705d
--- /dev/null
+++ b/app/src/main/res/drawable/histothblack.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index eba08e0..89d1977 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -662,10 +662,18 @@
style="@style/yetCalcBorderlessButtons"
android:textSize="16sp"/>
+
+
+ android:layout_weight="11" />
-
+
diff --git a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
new file mode 100644
index 0000000..6885f56
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b81bd2..091ffc9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
Yet Zio
yetCalc
- 1.1.3
+ 1.1.4
Yet another calculator by Yet Zio
View on GitHub
Free and open source software\nLicensed under the BSD-3-Clause license.
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9007a80..ba6e6dc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -134,6 +134,12 @@
- @drawable/extra_standard_land
+
+
+
+
+
+