removed dynamic typeface

Ixam97 · May 3, 2024 · b1f5d07 · b1f5d07
1 parent b16619d
commit b1f5d07
Show file tree

Hide file tree

Showing 48 changed files with 319 additions and 246 deletions.
diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/AutoStartReceiver.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/AutoStartReceiver.kt
@@ -5,8 +5,8 @@ import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.ixam97.carStatsViewer.ui.activities.PermissionsActivity
 import com.ixam97.carStatsViewer.dataCollector.DataCollector
+import com.ixam97.carStatsViewer.ui.activities.PermissionsActivity
 import com.ixam97.carStatsViewer.utils.InAppLogger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/CarStatsViewer.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/CarStatsViewer.kt
@@ -1,10 +1,15 @@
 package com.ixam97.carStatsViewer
 
-import android.app.*
+import android.app.Activity
+import android.app.AlarmManager
+import android.app.AlertDialog
+import android.app.Application
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
-import android.graphics.Typeface
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.LayoutInflater
@@ -18,7 +23,8 @@ import com.ixam97.carStatsViewer.appPreferences.AppPreferences
 import com.ixam97.carStatsViewer.dataProcessor.DataProcessor
 import com.ixam97.carStatsViewer.database.log.LogDao
 import com.ixam97.carStatsViewer.database.log.LogDatabase
-import com.ixam97.carStatsViewer.database.tripData.*
+import com.ixam97.carStatsViewer.database.tripData.LocalTripDataSource
+import com.ixam97.carStatsViewer.database.tripData.TripDataDatabase
 import com.ixam97.carStatsViewer.liveDataApi.LiveDataApi
 import com.ixam97.carStatsViewer.liveDataApi.abrpLiveData.AbrpLiveData
 import com.ixam97.carStatsViewer.liveDataApi.http.HttpLiveData
@@ -27,7 +33,6 @@ import com.ixam97.carStatsViewer.utils.ChangeLogCreator.createChangelog
 import com.ixam97.carStatsViewer.utils.InAppLogger
 import com.ixam97.carStatsViewer.utils.ScreenshotButton
 import com.ixam97.carStatsViewer.utils.Watchdog
-import com.ixam97.carStatsViewer.utils.applyTypeface
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -74,9 +79,9 @@ class CarStatsViewer : Application() {
 
         lateinit var logDao: LogDao
 
-        var typefaceRegular: Typeface? = null
-        var typefaceMedium: Typeface? = null
-        var isPolestarTypeface = false
+        // var typefaceRegular: Typeface? = null
+        // var typefaceMedium: Typeface? = null
+        // var isPolestarTypeface = false
 
         val appContextIsInitialized: Boolean get() = this::appContext.isInitialized
 
@@ -142,10 +147,7 @@ class CarStatsViewer : Application() {
                         style(R.style.changes_text)
                     })
                 }
-
-                applyTypeface(layout)
                 setView(layout)
-
                 setCancelable(true)
                 create()
             }

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/adapters/LogAdapter.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/adapters/LogAdapter.kt
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.ixam97.carStatsViewer.R
 import com.ixam97.carStatsViewer.database.log.LogEntry
 import com.ixam97.carStatsViewer.utils.InAppLogger
-import kotlinx.android.synthetic.main.recyclerview_log_row.view.*
+import kotlinx.android.synthetic.main.recyclerview_log_row.view.log_row
 import java.text.SimpleDateFormat
 
 class LogAdapter(var log: List<LogEntry>): RecyclerView.Adapter<LogAdapter.LogViewHolder>() {

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/adapters/TripHistoryAdapter.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/adapters/TripHistoryAdapter.kt
@@ -7,9 +7,9 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.ixam97.carStatsViewer.CarStatsViewer
 import com.ixam97.carStatsViewer.R
-import com.ixam97.carStatsViewer.ui.activities.HistoryActivity
 import com.ixam97.carStatsViewer.database.tripData.DrivingSession
 import com.ixam97.carStatsViewer.database.tripData.TripType
+import com.ixam97.carStatsViewer.ui.activities.HistoryActivity
 import com.ixam97.carStatsViewer.ui.views.TripHistoryRowWidget
 import com.ixam97.carStatsViewer.utils.InAppLogger
 import kotlinx.coroutines.CoroutineScope

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/appPreferences/AppPreference.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/appPreferences/AppPreference.kt
@@ -1,8 +1,8 @@
 package com.ixam97.carStatsViewer.appPreferences
 
 import android.content.SharedPreferences
-import com.ixam97.carStatsViewer.utils.DistanceUnitEnum
 import com.ixam97.carStatsViewer.ui.plot.enums.PlotDimensionX
+import com.ixam97.carStatsViewer.utils.DistanceUnitEnum
 
 class AppPreference<T>(
     private val key: String,

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/appPreferences/AppPreferences.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/appPreferences/AppPreferences.kt
@@ -5,8 +5,8 @@ import android.content.SharedPreferences
 import com.google.gson.ExclusionStrategy
 import com.google.gson.FieldAttributes
 import com.ixam97.carStatsViewer.R
-import com.ixam97.carStatsViewer.utils.DistanceUnitEnum
 import com.ixam97.carStatsViewer.ui.plot.enums.PlotDimensionX
+import com.ixam97.carStatsViewer.utils.DistanceUnitEnum
 import com.ixam97.carStatsViewer.utils.Exclude
 
 class AppPreferences(

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/carPropertiesClient/CarProperty.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/carPropertiesClient/CarProperty.kt
@@ -1,7 +1,5 @@
 package com.ixam97.carStatsViewer.carPropertiesClient
 
-import android.car.VehiclePropertyIds
-
 class CarProperty(val propertyId: Int) {
 
     private val startupTimestamp = System.nanoTime()

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/dataCollector/DataCollector.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/dataCollector/DataCollector.kt
@@ -12,19 +12,27 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.ixam97.carStatsViewer.CarStatsViewer
 import com.ixam97.carStatsViewer.R
-import com.ixam97.carStatsViewer.ui.activities.MainActivity
 import com.ixam97.carStatsViewer.carPropertiesClient.CarProperties
 import com.ixam97.carStatsViewer.carPropertiesClient.CarPropertiesClient
 import com.ixam97.carStatsViewer.dataProcessor.DataProcessor
 import com.ixam97.carStatsViewer.emulatorMode
 import com.ixam97.carStatsViewer.locationClient.DefaultLocationClient
 import com.ixam97.carStatsViewer.locationClient.LocationClient
+import com.ixam97.carStatsViewer.ui.activities.MainActivity
 import com.ixam97.carStatsViewer.utils.DistanceUnitEnum
 import com.ixam97.carStatsViewer.utils.InAppLogger
 import com.ixam97.carStatsViewer.utils.StringFormatters
 import com.ixam97.carStatsViewer.utils.WatchdogState
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 
 class DataCollector: Service() {
 

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/dataProcessor/DataProcessor.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/dataProcessor/DataProcessor.kt
@@ -1,37 +1,35 @@
 package com.ixam97.carStatsViewer.dataProcessor
 
+// import com.ixam97.carStatsViewer.utils.TimestampSynchronizer
 import android.app.Notification
-import android.app.PendingIntent
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import androidx.core.graphics.drawable.toBitmap
-import com.ixam97.carStatsViewer.AutoStartReceiver
 import com.ixam97.carStatsViewer.CarStatsViewer
 import com.ixam97.carStatsViewer.Defines
 import com.ixam97.carStatsViewer.R
 import com.ixam97.carStatsViewer.carPropertiesClient.CarProperties
 import com.ixam97.carStatsViewer.carPropertiesClient.CarPropertiesData
-import com.ixam97.carStatsViewer.utils.TimeTracker
-import com.ixam97.carStatsViewer.database.tripData.*
+import com.ixam97.carStatsViewer.database.tripData.ChargingPoint
+import com.ixam97.carStatsViewer.database.tripData.ChargingSession
+import com.ixam97.carStatsViewer.database.tripData.DrivingPoint
+import com.ixam97.carStatsViewer.database.tripData.DrivingSession
+import com.ixam97.carStatsViewer.database.tripData.TripType
 import com.ixam97.carStatsViewer.emulatorMode
 import com.ixam97.carStatsViewer.emulatorPowerSign
 import com.ixam97.carStatsViewer.liveDataApi.http.HttpLiveData
 import com.ixam97.carStatsViewer.ui.plot.enums.PlotLineMarkerType
 import com.ixam97.carStatsViewer.utils.InAppLogger
 import com.ixam97.carStatsViewer.utils.Ticker
-// import com.ixam97.carStatsViewer.utils.TimestampSynchronizer
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.MutableSharedFlow
+import com.ixam97.carStatsViewer.utils.TimeTracker
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
-import java.util.*
-import java.util.concurrent.Executor
+import kotlinx.coroutines.launch
+import java.util.Date
 import kotlin.math.absoluteValue
 import kotlin.math.roundToInt
 

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/database/log/LogDao.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/database/log/LogDao.kt
@@ -1,6 +1,9 @@
 package com.ixam97.carStatsViewer.database.log
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
 
 @Dao
 interface LogDao {

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/database/log/LogDatabase.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/database/log/LogDatabase.kt
@@ -1,8 +1,6 @@
 package com.ixam97.carStatsViewer.database.log
 
 import androidx.room.Database
-import androidx.room.Entity
-import androidx.room.PrimaryKey
 import androidx.room.RoomDatabase
 
 @Database(entities = [LogEntry::class], version = 1)

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/database/tripData/TripDao.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/database/tripData/TripDao.kt
@@ -1,6 +1,11 @@
 package com.ixam97.carStatsViewer.database.tripData
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Ignore
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Upsert
 
 @Dao
 interface TripDao {

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/database/tripData/TripDataDatabase.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/database/tripData/TripDataDatabase.kt
@@ -2,7 +2,6 @@ package com.ixam97.carStatsViewer.database.tripData
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import androidx.room.migration.AutoMigrationSpec
 
 @Database(entities =
     [

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/database/tripData/TripDataEntities.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/database/tripData/TripDataEntities.kt
@@ -1,6 +1,11 @@
 package com.ixam97.carStatsViewer.database.tripData
 
-import androidx.room.*
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.Junction
+import androidx.room.PrimaryKey
+import androidx.room.Relation
 
 
 /**

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/database/tripData/TripDataSource.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/database/tripData/TripDataSource.kt
@@ -1,7 +1,5 @@
 package com.ixam97.carStatsViewer.database.tripData
 
-import androidx.room.Query
-
 interface TripDataSource {
 
     /*

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/LiveDataApi.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/LiveDataApi.kt
@@ -1,7 +1,6 @@
 package com.ixam97.carStatsViewer.liveDataApi
 
 import android.content.Context
-import android.os.Handler
 import com.ixam97.carStatsViewer.CarStatsViewer
 import com.ixam97.carStatsViewer.R
 import com.ixam97.carStatsViewer.dataProcessor.RealTimeData

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/abrpLiveData/AbrpLiveData.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/abrpLiveData/AbrpLiveData.kt
@@ -4,16 +4,15 @@ import android.app.AlertDialog
 import android.content.Context
 import android.view.LayoutInflater
 import android.widget.EditText
-import android.widget.Switch
-import com.ixam97.carStatsViewer.liveDataApi.LiveDataApi
 import com.ixam97.carStatsViewer.CarStatsViewer
-import com.ixam97.carStatsViewer.utils.InAppLogger
 import com.ixam97.carStatsViewer.R
 import com.ixam97.carStatsViewer.appPreferences.AppPreferences
 import com.ixam97.carStatsViewer.dataProcessor.DrivingState
 import com.ixam97.carStatsViewer.dataProcessor.RealTimeData
 import com.ixam97.carStatsViewer.liveDataApi.ConnectionStatus
+import com.ixam97.carStatsViewer.liveDataApi.LiveDataApi
 import com.ixam97.carStatsViewer.ui.views.FixedSwitchWidget
+import com.ixam97.carStatsViewer.utils.InAppLogger
 import org.json.JSONObject
 import java.io.DataOutputStream
 import java.net.HttpURLConnection

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/http/HttpLiveData.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/liveDataApi/http/HttpLiveData.kt
@@ -27,8 +27,7 @@ import java.io.DataOutputStream
 import java.net.HttpURLConnection
 import java.net.URL
 import java.nio.charset.StandardCharsets
-import java.util.*
-import kotlin.collections.ArrayList
+import java.util.Base64
 
 
 class HttpLiveData (

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/locationClient/DefaultLocationClient.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/locationClient/DefaultLocationClient.kt
@@ -1,18 +1,16 @@
 package com.ixam97.carStatsViewer.locationClient
 
+// import com.google.android.gms.location.*
 import android.annotation.SuppressLint
 import android.content.Context
 import android.location.Location
 import android.location.LocationManager
-// import com.google.android.gms.location.*
-import com.google.android.gms.tasks.CancellationTokenSource
 import com.ixam97.carStatsViewer.CarStatsViewer
 import com.ixam97.carStatsViewer.emulatorMode
 import com.ixam97.carStatsViewer.utils.InAppLogger
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.tasks.await
 import org.matthiaszimmermann.location.egm96.Geoid
 import kotlin.math.absoluteValue
 

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/mailSender/MailSender.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/mailSender/MailSender.kt
@@ -2,9 +2,6 @@ package com.ixam97.carStatsViewer.mailSender
 
 import android.graphics.Bitmap
 import com.ixam97.carStatsViewer.CarStatsViewer
-import kotlin.jvm.Synchronized
-import kotlin.Throws
-import com.ixam97.carStatsViewer.mailSender.JSSEProvider
 import jakarta.activation.DataHandler
 import jakarta.activation.DataSource
 import jakarta.activation.FileDataSource

diff --git a/automotive/src/main/java/com/ixam97/carStatsViewer/ui/activities/AboutActivity.kt b/automotive/src/main/java/com/ixam97/carStatsViewer/ui/activities/AboutActivity.kt
@@ -1,6 +1,5 @@
 package com.ixam97.carStatsViewer.ui.activities
 
-import android.app.Activity
 import android.app.AlertDialog
 import android.content.Intent
 import android.net.Uri
@@ -9,20 +8,24 @@ import androidx.fragment.app.FragmentActivity
 import com.ixam97.carStatsViewer.BuildConfig
 import com.ixam97.carStatsViewer.CarStatsViewer
 import com.ixam97.carStatsViewer.R
-import com.ixam97.carStatsViewer.utils.applyTypeface
 import com.ixam97.carStatsViewer.utils.setContentViewAndTheme
-import kotlinx.android.synthetic.main.activity_about.*
+import kotlinx.android.synthetic.main.activity_about.about_button_back
+import kotlinx.android.synthetic.main.activity_about.about_club_widget
+import kotlinx.android.synthetic.main.activity_about.about_contributors_widget
+import kotlinx.android.synthetic.main.activity_about.about_forums_widget
+import kotlinx.android.synthetic.main.activity_about.about_github_issues_widget
+import kotlinx.android.synthetic.main.activity_about.about_libs_widget
+import kotlinx.android.synthetic.main.activity_about.about_support_widget
+import kotlinx.android.synthetic.main.activity_about.about_supporters_widget
+import kotlinx.android.synthetic.main.activity_about.about_translators_widget
+import kotlinx.android.synthetic.main.activity_about.about_version_widget
 
 class AboutActivity : FragmentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentViewAndTheme(this, R.layout.activity_about)
 
-        CarStatsViewer.typefaceMedium?.let {
-            applyTypeface(about_activity)
-        }
-
         about_button_back.setOnClickListener {
             finish()
             if (BuildConfig.FLAVOR_aaos != "play")