Merge branch 'master' of https://github.com/streetcomplete/StreetComp…

…lete
streetcomplete · Mar 27, 2024 · 5b9423b · 5b9423b
2 parents 4128fde + d16a3a9
commit 5b9423b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/about/ChangelogFragment.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/about/ChangelogFragment.kt
@@ -3,13 +3,9 @@ package de.westnordost.streetcomplete.screens.about
 import android.content.Context
 import android.content.DialogInterface
 import android.content.res.Resources
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.webkit.WebView
-import androidx.annotation.ColorRes
-import androidx.annotation.DimenRes
 import androidx.appcompat.app.AlertDialog
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.databinding.DialogWhatsNewBinding
@@ -19,18 +15,14 @@ import de.westnordost.streetcomplete.screens.TwoPaneDetailFragment
 import de.westnordost.streetcomplete.util.ktx.getRawTextFile
 import de.westnordost.streetcomplete.util.ktx.indicesOf
 import de.westnordost.streetcomplete.util.ktx.observe
-import de.westnordost.streetcomplete.util.ktx.pxToDp
-import de.westnordost.streetcomplete.util.ktx.pxToSp
 import de.westnordost.streetcomplete.util.ktx.setHtmlBody
-import de.westnordost.streetcomplete.util.ktx.viewLifecycleScope
 import de.westnordost.streetcomplete.util.viewBinding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.androidx.viewmodel.ext.android.viewModel
-import kotlin.math.roundToInt
 
 /** Shows the full changelog */
 class ChangelogFragment : TwoPaneDetailFragment(R.layout.fragment_changelog), HasTitle {

diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/about/CreditsViewModel.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/about/CreditsViewModel.kt
@@ -59,12 +59,11 @@ class CreditsViewModelImpl(private val resources: Resources) : CreditsViewModel(
     private fun readProjectsContributors(): List<String> =
         resources.getYamlObject<List<String>>(R.raw.credits_projects)
 
-    private fun readCodeContributors(skipUsers: List<String?>): List<Contributor> {
-        return resources
+    private fun readCodeContributors(skipUsers: List<String?>): List<Contributor> =
+        resources
             .getYamlObject<List<Contributor>>(R.raw.credits_contributors)
             .filter { it.githubUsername !in skipUsers && it.score >= 50 }
             .sortedByDescending { it.score }
-    }
 
     private fun readTranslators(): Map<String, List<String>> {
         val translatorsByLanguage =