Merge pull request #206 from alexandr7035/develop

Release v5.4

- Improve UI performance
- Fix crash on contributions grid update
- Fix UI bugs
- Refactoring

app/build.gradle

@@ -32,8 +32,8 @@ android {
         applicationId 'by.alexandr7035.gitstat'
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 2100
-        versionName "5.3"
+        versionCode 2200
+        versionName "5.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/by/alexandr7035/gitstat/core/TimeHelper.kt

@@ -1,7 +1,7 @@
 package by.alexandr7035.gitstat.core
 
-import by.alexandr7035.gitstat.extensions.getStringDateFromLong
-import by.alexandr7035.gitstat.extensions.getUnixDateFromStringFormat
+import by.alexandr7035.gitstat.core.extensions.getStringDateFromLong
+import by.alexandr7035.gitstat.core.extensions.getUnixDateFromStringFormat
 import java.text.SimpleDateFormat
 import java.util.*
 

app/src/main/java/by/alexandr7035/gitstat/extensions/ApolloClient.kt → app/src/main/java/by/alexandr7035/gitstat/core/extensions/ApolloClient.kt

@@ -1,4 +1,4 @@
-package by.alexandr7035.gitstat.extensions
+package by.alexandr7035.gitstat.core.extensions
 
 import by.alexandr7035.gitstat.core.AppError
 import by.alexandr7035.gitstat.core.ErrorType

app/src/main/java/by/alexandr7035/gitstat/extensions/LineChart.kt → app/src/main/java/by/alexandr7035/gitstat/core/extensions/LineChart.kt

@@ -1,4 +1,4 @@
-package by.alexandr7035.gitstat.extensions
+package by.alexandr7035.gitstat.core.extensions
 
 import by.alexandr7035.gitstat.view.contributions.plots.LinePlotFill
 import com.github.mikephil.charting.charts.LineChart

app/src/main/java/by/alexandr7035/gitstat/core/extensions/LiveData.kt

@@ -0,0 +1,15 @@
+package by.alexandr7035.gitstat.core.extensions
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+
+// Sometimes we may receive nulls in livedata observers
+// For example, when room cache tables are cleared before saving updated data
+// So we just skip null updates to avoid null checks
+//
+// See https://proandroiddev.com/nonnull-livedata-with-kotlin-extension-26963ffd0333
+fun <T> LiveData<T>.observeNullSafe(owner: LifecycleOwner, observer: (t: T) -> Unit) {
+    this.observe(owner, {
+        it?.let(observer)
+    })
+}

app/src/main/java/by/alexandr7035/gitstat/extensions/Long.kt → app/src/main/java/by/alexandr7035/gitstat/core/extensions/Long.kt

@@ -1,4 +1,4 @@
-package by.alexandr7035.gitstat.extensions
+package by.alexandr7035.gitstat.core.extensions
 
 import java.text.SimpleDateFormat
 import java.util.*

app/src/main/java/by/alexandr7035/gitstat/extensions/NavController.kt → app/src/main/java/by/alexandr7035/gitstat/core/extensions/NavController.kt

@@ -1,4 +1,4 @@
-package by.alexandr7035.gitstat.extensions
+package by.alexandr7035.gitstat.core.extensions
 
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections

app/src/main/java/by/alexandr7035/gitstat/extensions/PieChart.kt → app/src/main/java/by/alexandr7035/gitstat/core/extensions/PieChart.kt

@@ -1,8 +1,7 @@
-package by.alexandr7035.gitstat.extensions
+package by.alexandr7035.gitstat.core.extensions
 
 import android.graphics.Color
 import android.graphics.Typeface
-import by.alexandr7035.gitstat.view.repositories.plots.languages_plot.PieDataValueFormatter
 import com.github.mikephil.charting.charts.PieChart
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.data.PieData

app/src/main/java/by/alexandr7035/gitstat/extensions/String.kt → app/src/main/java/by/alexandr7035/gitstat/core/extensions/String.kt

@@ -1,4 +1,4 @@
-package by.alexandr7035.gitstat.extensions
+package by.alexandr7035.gitstat.core.extensions
 
 import android.graphics.Typeface
 import android.text.SpannableString

app/src/main/java/by/alexandr7035/gitstat/extensions/Timber.kt → app/src/main/java/by/alexandr7035/gitstat/core/extensions/Timber.kt

@@ -1,4 +1,4 @@
-package by.alexandr7035.gitstat.extensions
+package by.alexandr7035.gitstat.core.extensions
 
 import timber.log.Timber
 

app/src/main/java/by/alexandr7035/gitstat/extensions/YAxis.kt → app/src/main/java/by/alexandr7035/gitstat/core/extensions/YAxis.kt

@@ -1,4 +1,4 @@
-package by.alexandr7035.gitstat.extensions
+package by.alexandr7035.gitstat.core.extensions
 
 import com.github.mikephil.charting.components.YAxis
 import kotlin.math.floor

app/src/main/java/by/alexandr7035/gitstat/core/view/CollapsingTextView.kt

@@ -0,0 +1,32 @@
+package by.alexandr7035.gitstat.core.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.widget.AppCompatTextView
+
+class CollapsingTextView(context: Context, attrs: AttributeSet): AppCompatTextView(context, attrs), View.OnClickListener {
+    private var predefinedMaxLines = 0
+
+    init {
+        predefinedMaxLines = maxLines
+
+        // If want to collapse on clicks directly on the view
+        // Otherwise use toggle() method
+        if (isClickable) {
+            super.setOnClickListener(this)
+        }
+    }
+
+    override fun onClick(p0: View?) {
+        toggle()
+    }
+
+    fun toggle() {
+        maxLines = if (maxLines == predefinedMaxLines) {
+            Int.MAX_VALUE
+        } else {
+            predefinedMaxLines
+        }
+    }
+}

app/src/main/java/by/alexandr7035/gitstat/core/view/HorizontalRatioBarView.kt

@@ -8,7 +8,7 @@ import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.View
 import by.alexandr7035.gitstat.R
-import by.alexandr7035.gitstat.extensions.debug
+import by.alexandr7035.gitstat.core.extensions.debug
 import timber.log.Timber
 
 

app/src/main/java/by/alexandr7035/gitstat/data/ContributionsRepository.kt

@@ -1,18 +1,15 @@
 package by.alexandr7035.gitstat.data
 
 import androidx.lifecycle.LiveData
-import by.alexandr7035.gitstat.core.KeyValueStorage
-import by.alexandr7035.gitstat.core.TimeHelper
+import by.alexandr7035.gitstat.data.helpers.YearlyMetricsHelper
 import by.alexandr7035.gitstat.data.local.dao.ContributionsDao
 import by.alexandr7035.gitstat.data.local.model.*
 import javax.inject.Inject
-import kotlin.math.round
 
 
 class ContributionsRepository @Inject constructor(
     private val dao: ContributionsDao,
-    private val timeHelper: TimeHelper,
-    private val keyValueStorage: KeyValueStorage
+    private val yearlyMetricsHelper: YearlyMetricsHelper
 ) {
 
     fun getAllContributionsLiveData(): LiveData<List<ContributionDayEntity>> {
@@ -39,32 +36,11 @@ class ContributionsRepository @Inject constructor(
     // Simply calculate for previous years
     // For the current year need to detect last contribution year
     fun getLastTotalContributionRateForYear(yearData: ContributionsYearWithRates): Float {
-        return if (yearData.year.id == timeHelper.getCurrentYearForUnixDate(System.currentTimeMillis())) {
-            val lastCacheSyncDate = keyValueStorage.getLastCacheSyncDate()
-            yearData.contributionRates.findLast { it.date == timeHelper.getBeginningOfDayForUnixDate(lastCacheSyncDate) }?.rate ?: 0F
-        } else {
-            yearData.contributionRates[yearData.contributionRates.size - 1].rate
-        }
+        return yearlyMetricsHelper.getAnnualContributionRate(yearData)
     }
 
     fun getContributionRateForYear(yearData: ContributionsYearWithDays): Float {
-
-        val contributionsCount = yearData.contributionDays.sumOf { it.count }
-
-        return if (yearData.year.id == timeHelper.getCurrentYearForUnixDate(System.currentTimeMillis())) {
-            // Get last contribution day
-            val lastCacheSyncDate = keyValueStorage.getLastCacheSyncDate()
-            val lastContributedDay = yearData.contributionDays.findLast {
-                it.date == timeHelper.getBeginningOfDayForUnixDate(lastCacheSyncDate)
-            }
-            val lastContributedDayPosition = yearData.contributionDays.lastIndexOf(lastContributedDay)
-            // Slice of days from the beginning of the year to last contribution date
-            val contributionDays = yearData.contributionDays.slice(0..lastContributedDayPosition)
-
-            round(contributionsCount.toFloat() / contributionDays.size.toFloat() * 100) / 100F
-        } else {
-            round(contributionsCount.toFloat() / yearData.contributionDays.size.toFloat() * 100) / 100F
-        }
+        return yearlyMetricsHelper.getEndingTotalContributionRate(yearData)
     }
 
     fun getMaxContributionRateForYear(yearData: ContributionsYearWithRates): Float {

app/src/main/java/by/alexandr7035/gitstat/data/DataSyncRepository.kt

@@ -6,7 +6,7 @@ import by.alexandr7035.gitstat.core.*
 import by.alexandr7035.gitstat.data.local.CacheDB
 import by.alexandr7035.gitstat.data.local.model.*
 import by.alexandr7035.gitstat.data.remote.mappers.*
-import by.alexandr7035.gitstat.extensions.performRequestWithDataResult
+import by.alexandr7035.gitstat.core.extensions.performRequestWithDataResult
 import com.apollographql.apollo3.ApolloClient
 import timber.log.Timber
 import java.util.*
@@ -67,13 +67,13 @@ class DataSyncRepository @Inject constructor(
             // NOTE! DO NOT CHANGE ORDER
             // LIVEDATA TRIGGERED IMMEDIATELY AFTER SAVING CACHE
             // AS ONE DATA MAY DEPEND ON THE OTHER, WRONG ORDER MAY CAUSE CRASH
-            // Years and months must be at the end
+            // Order must be: days -> months -> years
             db.getContributionsDao().apply {
                 insertContributionRatesCache(contributionRates)
                 insertContributionDays(contributionDays)
                 insertContributionTypes(contributionTypes)
-                insertContributionYearsCache(contributionYears)
                 insertContributionMonthsCache(contributionMonths)
+                insertContributionYearsCache(contributionYears)
             }
 
             syncStatusLiveData?.postValue(DataSyncStatus.SUCCESS)

app/src/main/java/by/alexandr7035/gitstat/data/SyncForegroundService.kt

@@ -10,7 +10,8 @@ import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.MutableLiveData
 import by.alexandr7035.gitstat.R
 import by.alexandr7035.gitstat.core.DataSyncStatus
-import by.alexandr7035.gitstat.extensions.debug
+import by.alexandr7035.gitstat.core.extensions.debug
+import by.alexandr7035.gitstat.core.extensions.observeNullSafe
 import by.alexandr7035.gitstat.view.MainActivity
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.*
@@ -48,7 +49,7 @@ class SyncForegroundService: LifecycleService() {
             stopSelf()
         }
 
-        statusLiveData?.observe(this, {
+        statusLiveData?.observeNullSafe(this, {
             Timber.debug("Service: sync status changed $it")
 
             val notificationText = when (it) {

app/src/main/java/by/alexandr7035/gitstat/data/helpers/YearlyMetricsHelper.kt

@@ -0,0 +1,47 @@
+package by.alexandr7035.gitstat.data.helpers
+
+import by.alexandr7035.gitstat.core.KeyValueStorage
+import by.alexandr7035.gitstat.core.TimeHelper
+import by.alexandr7035.gitstat.data.local.model.ContributionsYearWithDays
+import by.alexandr7035.gitstat.data.local.model.ContributionsYearWithRates
+import javax.inject.Inject
+import kotlin.math.round
+
+interface YearlyMetricsHelper {
+    // Contribution rate for certain year
+    fun getAnnualContributionRate(yearData: ContributionsYearWithRates): Float
+
+    // Value of total (not annual) contribution rate by the end of specified year
+    fun getEndingTotalContributionRate(yearData: ContributionsYearWithDays): Float
+
+
+    class Impl @Inject constructor(private val timeHelper: TimeHelper, private val keyValueStorage: KeyValueStorage): YearlyMetricsHelper {
+        override fun getAnnualContributionRate(yearData: ContributionsYearWithRates): Float {
+            return if (yearData.year.id == timeHelper.getCurrentYearForUnixDate(System.currentTimeMillis())) {
+                val lastCacheSyncDate = keyValueStorage.getLastCacheSyncDate()
+                yearData.contributionRates.findLast { it.date == timeHelper.getBeginningOfDayForUnixDate(lastCacheSyncDate) }?.rate ?: 0F
+            } else {
+                yearData.contributionRates[yearData.contributionRates.size - 1].rate
+            }
+        }
+
+        override fun getEndingTotalContributionRate(yearData: ContributionsYearWithDays): Float {
+            val contributionsCount = yearData.contributionDays.sumOf { it.count }
+
+            return if (yearData.year.id == timeHelper.getCurrentYearForUnixDate(System.currentTimeMillis())) {
+                // Get last contribution day
+                val lastCacheSyncDate = keyValueStorage.getLastCacheSyncDate()
+                val lastContributedDay = yearData.contributionDays.findLast {
+                    it.date == timeHelper.getBeginningOfDayForUnixDate(lastCacheSyncDate)
+                }
+                val lastContributedDayPosition = yearData.contributionDays.lastIndexOf(lastContributedDay)
+                // Slice of days from the beginning of the year to last contribution date
+                val contributionDays = yearData.contributionDays.slice(0..lastContributedDayPosition)
+
+                round(contributionsCount.toFloat() / contributionDays.size.toFloat() * 100) / 100F
+            } else {
+                round(contributionsCount.toFloat() / yearData.contributionDays.size.toFloat() * 100) / 100F
+            }
+        }
+    }
+}

app/src/main/java/by/alexandr7035/gitstat/data/remote/mappers/RepositoriesRemoteToCacheMapper.kt

@@ -5,7 +5,7 @@ import by.alexandr7035.gitstat.core.Mapper
 import by.alexandr7035.gitstat.core.TimeHelper
 import by.alexandr7035.gitstat.data.local.model.RepoLanguage
 import by.alexandr7035.gitstat.data.local.model.RepositoryEntity
-import by.alexandr7035.gitstat.extensions.debug
+import by.alexandr7035.gitstat.core.extensions.debug
 import timber.log.Timber
 import javax.inject.Inject
 

app/src/main/java/by/alexandr7035/gitstat/di/AppModule.kt

@@ -5,6 +5,7 @@ import androidx.room.Room
 import by.alexandr7035.gitstat.core.KeyValueStorage
 import by.alexandr7035.gitstat.core.TimeHelper
 import by.alexandr7035.gitstat.data.*
+import by.alexandr7035.gitstat.data.helpers.YearlyMetricsHelper
 import by.alexandr7035.gitstat.data.local.CacheDB
 import by.alexandr7035.gitstat.data.local.RoomTypeConverters
 import by.alexandr7035.gitstat.data.local.dao.ContributionsDao
@@ -65,10 +66,9 @@ object AppModule {
     @Singleton
     fun provideContributionsRepository(
         dao: ContributionsDao,
-        timeHelper: TimeHelper,
-        keyValueStorage: KeyValueStorage
+        yearlyMetricsHelper: YearlyMetricsHelper
     ): ContributionsRepository{
-        return ContributionsRepository(dao, timeHelper, keyValueStorage)
+        return ContributionsRepository(dao, yearlyMetricsHelper)
     }
 
 
@@ -175,4 +175,10 @@ object AppModule {
     fun provideTimeHelper(): TimeHelper {
         return TimeHelper()
     }
+
+    @Provides
+    @Singleton
+    fun provideYearlyMetricsHelper(keyValueStorage: KeyValueStorage, timeHelper: TimeHelper): YearlyMetricsHelper {
+        return YearlyMetricsHelper.Impl(timeHelper, keyValueStorage)
+    }
 }