Skip to content

Commit 3b44ea4

Browse files
Ixam97Ixam97
committed
Merge remote-tracking branch 'origin/active_development'
2 parents 61fbdec + f058d9e commit 3b44ea4

File tree

6 files changed

+248
-97
lines changed

6 files changed

+248
-97
lines changed

‎automotive/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
defaultConfig {
1111
minSdkVersion 29
1212
targetSdkVersion 33
13-
versionCode 202
14-
versionName "0.26.0.0010"
13+
versionCode 203
14+
versionName "0.26.1.0001"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}

‎automotive/src/main/java/com/ixam97/carStatsViewer/CarStatsViewer.kt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class CarStatsViewer : Application() {
8888
context,
8989
0,
9090
serviceIntent,
91-
PendingIntent.FLAG_UPDATE_CURRENT
91+
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
9292
)
9393
alarmManager.cancel(pendingIntent)
9494
if (cancel) return
@@ -119,6 +119,8 @@ class CarStatsViewer : Application() {
119119

120120
val layout = LayoutInflater.from(context).inflate(R.layout.dialog_changelog, null)
121121

122+
val changelog5Title = layout.findViewById<TextView>(R.id.changes_0_26_1_title)
123+
val changelog5TextView = layout.findViewById<TextView>(R.id.changes_0_26_1)
122124
val changelog4Title = layout.findViewById<TextView>(R.id.changes_0_26_0_title)
123125
val changelog4TextView = layout.findViewById<TextView>(R.id.changes_0_26_0)
124126
val changelog3Title = layout.findViewById<TextView>(R.id.changes_0_25_2_title)
@@ -128,11 +130,19 @@ class CarStatsViewer : Application() {
128130
val changelog1Title = layout.findViewById<TextView>(R.id.changes_0_25_0_title)
129131
val changelog1TextView = layout.findViewById<TextView>(R.id.changes_0_25_0)
130132

133+
changelog5Title.text = context.getString(R.string.main_changelog_dialog_title, "0.26.1")
131134
changelog4Title.text = context.getString(R.string.main_changelog_dialog_title, "0.26.0")
132135
changelog3Title.text = context.getString(R.string.main_changelog_dialog_title, "0.25.2")
133136
changelog2Title.text = context.getString(R.string.main_changelog_dialog_title, "0.25.1")
134137
changelog1Title.text = context.getString(R.string.main_changelog_dialog_title, "0.25.0")
135138

139+
val changesArray5 = context.resources.getStringArray(R.array.changes_0_26_1)
140+
var changelog5 = ""
141+
changesArray5.forEachIndexed { index, change ->
142+
changelog5 += "• $change"
143+
if (index < changesArray5.size - 1) changelog5 += "\n\n"
144+
}
145+
136146
val changesArray4 = context.resources.getStringArray(R.array.changes_0_26_0)
137147
var changelog4 = ""
138148
changesArray4.forEachIndexed { index, change ->
@@ -161,6 +171,7 @@ class CarStatsViewer : Application() {
161171
if (index < changesArray1.size - 1) changelog1 += "\n\n"
162172
}
163173

174+
changelog5TextView.text = changelog5
164175
changelog4TextView.text = changelog4
165176
changelog3TextView.text = changelog3
166177
changelog2TextView.text = changelog2

‎automotive/src/main/java/com/ixam97/carStatsViewer/ui/activities/MainActivity.kt‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,14 @@ class MainActivity : FragmentActivity() {
211211
remove(summaryFragment)
212212
}
213213
}
214-
main_button_summary.isEnabled = false
214+
// main_button_summary.isEnabled = false
215215
main_image_button_summary.isEnabled = false
216216
main_button_history.isEnabled = false
217217
main_button_history.setColorFilter(getColor(R.color.disabled_tint), PorterDuff.Mode.SRC_IN)
218218
main_image_button_summary.setColorFilter(getColor(R.color.disabled_tint), PorterDuff.Mode.SRC_IN)
219219
} else if (it.speed <= .1 && moving) {
220220
moving = false
221-
main_button_summary.isEnabled = true
221+
// main_button_summary.isEnabled = true
222222
main_image_button_summary.isEnabled = true
223223
main_button_history.isEnabled = true
224224
main_button_history.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN)
@@ -514,25 +514,25 @@ class MainActivity : FragmentActivity() {
514514

515515
when (secondaryConsumptionDimension) {
516516
1 -> {
517-
main_button_secondary_dimension.text = getString(R.string.main_secondary_axis, getString(R.string.main_speed))
517+
// main_button_secondary_dimension.text = getString(R.string.main_secondary_axis, getString(R.string.main_speed))
518518
constraintSet.connect(R.id.main_secondary_dimension_indicator, ConstraintSet.LEFT, R.id.main_image_button_speed, ConstraintSet.LEFT)
519519
constraintSet.connect(R.id.main_secondary_dimension_indicator, ConstraintSet.RIGHT, R.id.main_image_button_speed, ConstraintSet.RIGHT)
520520
main_secondary_dimension_indicator.isVisible = true
521521
}
522522
2 -> {
523-
main_button_secondary_dimension.text = getString(R.string.main_secondary_axis, getString(R.string.main_SoC))
523+
// main_button_secondary_dimension.text = getString(R.string.main_secondary_axis, getString(R.string.main_SoC))
524524
constraintSet.connect(R.id.main_secondary_dimension_indicator, ConstraintSet.LEFT, R.id.main_image_button_soc, ConstraintSet.LEFT)
525525
constraintSet.connect(R.id.main_secondary_dimension_indicator, ConstraintSet.RIGHT, R.id.main_image_button_soc, ConstraintSet.RIGHT)
526526
main_secondary_dimension_indicator.isVisible = true
527527
}
528528
3 -> {
529-
main_button_secondary_dimension.text = getString(R.string.main_secondary_axis, getString(R.string.plot_dimensionY_ALTITUDE))
529+
// main_button_secondary_dimension.text = getString(R.string.main_secondary_axis, getString(R.string.plot_dimensionY_ALTITUDE))
530530
constraintSet.connect(R.id.main_secondary_dimension_indicator, ConstraintSet.LEFT, R.id.main_image_button_alt, ConstraintSet.LEFT)
531531
constraintSet.connect(R.id.main_secondary_dimension_indicator, ConstraintSet.RIGHT, R.id.main_image_button_alt, ConstraintSet.RIGHT)
532532
main_secondary_dimension_indicator.isVisible = true
533533
}
534534
else -> {
535-
main_button_secondary_dimension.text = getString(R.string.main_secondary_axis, "-")
535+
// main_button_secondary_dimension.text = getString(R.string.main_secondary_axis, "-")
536536
constraintSet.connect(R.id.main_secondary_dimension_indicator, ConstraintSet.LEFT, R.id.main_image_button_speed, ConstraintSet.RIGHT)
537537
constraintSet.connect(R.id.main_secondary_dimension_indicator, ConstraintSet.RIGHT, R.id.main_image_button_speed, ConstraintSet.RIGHT)
538538
main_secondary_dimension_indicator.visibility = View.GONE
@@ -701,6 +701,7 @@ class MainActivity : FragmentActivity() {
701701
startActivity(Intent(this, SettingsActivity::class.java))
702702
overridePendingTransition(R.anim.slide_in_right, R.anim.stay_still)
703703
}
704+
/*
704705
main_button_secondary_dimension.setOnClickListener {
705706
var currentIndex = appPreferences.secondaryConsumptionDimension
706707
currentIndex++
@@ -709,6 +710,7 @@ class MainActivity : FragmentActivity() {
709710
710711
setSecondaryConsumptionPlotDimension(currentIndex)
711712
}
713+
*/
712714

713715
main_image_button_speed.setOnClickListener {
714716
var currentIndex = appPreferences.secondaryConsumptionDimension
@@ -736,9 +738,11 @@ class MainActivity : FragmentActivity() {
736738
setPrimaryConsumptionPlotDimension(appPreferences.mainPrimaryDimensionRestriction)
737739
}
738740

741+
/*
739742
main_button_summary.setOnClickListener {
740743
openSummaryFragment()
741744
}
745+
*/
742746

743747
main_image_button_summary.setOnClickListener {
744748
openSummaryFragment()

0 commit comments

Comments
 (0)