Skip to content

Commit

Permalink
Utils code cleaned up
Browse files Browse the repository at this point in the history 
Cleaned up code
  • Loading branch information
@IvanAkhmylin
IvanAkhmylin committed Aug 30, 2020
1 parent dd285d1 commit 1e2c887
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 50 deletions.
8 changes: 5 additions & 3 deletions app/src/main/java/com/example/tracker/ui/countries/CountriesViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,11 @@ class CountriesViewModel @Inject constructor(val model: CountriesRepository) : V
}

fun resetData(){
mSearchQuery = ""
mFilteredCountries = mCountryImmutable as ArrayList<Country>
mCountries.postValue(mCountryImmutable)
if (::mCountryImmutable.isInitialized){
mSearchQuery = ""
mFilteredCountries = mCountryImmutable as ArrayList<Country>
mCountries.postValue(mCountryImmutable)
}
}

fun sortBy(type: String) {
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/java/com/example/tracker/utils/ExpansionUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ object ExpansionUtils {
return "${context.getString(R.string.updated)}: $date ${context.getString(R.string.at)} $time"
}

fun ArrayList<String>.getAreaCount(): ArrayList<String>? {
val label: ArrayList<String> = ArrayList()
for (i in 0 until this.size) label.add(this.get(i))
return label
}

fun String.toMillis(): Long {
val df = SimpleDateFormat("MM/dd/yy", Locale.getDefault())
return df.parse(this).time
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/example/tracker/utils/SettingUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object SettingUtils {
(context as AppCompatActivity).finish()
}

fun checkAppLang(prefs: SharedPreferences, activity: Context) {
private fun checkAppLang(prefs: SharedPreferences, activity: Context) {
var lang = prefs.getString("change_lang", "")

if (lang?.isEmpty()!!) {
Expand Down
89 changes: 49 additions & 40 deletions app/src/main/java/com/example/tracker/utils/Utils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ package com.example.tracker.utils
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.graphics.Bitmap
import android.graphics.Canvas
import android.net.Uri
import android.view.MotionEvent
import android.view.View
import androidx.appcompat.app.AlertDialog
import androidx.browser.customtabs.CustomTabsIntent
import androidx.core.content.ContextCompat
import androidx.core.widget.NestedScrollView
import com.example.tracker.Constants.Constants
import com.example.tracker.R
import com.example.tracker.utils.ExpansionUtils.fromMillis
import com.example.tracker.utils.ExpansionUtils.toMillis
import com.example.tracker.data.local.entity.TimeLine
import com.example.tracker.utils.ExpansionUtils.fromMillis
import com.example.tracker.utils.ExpansionUtils.isDarkThemeOn
import com.example.tracker.utils.ExpansionUtils.toMillis
import com.example.tracker.view.LineChartMarker
import com.github.mikephil.charting.charts.LineChart
import com.github.mikephil.charting.charts.PieChart
import com.github.mikephil.charting.components.XAxis
import com.github.mikephil.charting.data.*
import com.github.mikephil.charting.formatter.LargeValueFormatter
import com.github.mikephil.charting.formatter.ValueFormatter
import kotlinx.coroutines.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import kotlinx.coroutines.withContext
import org.jsoup.Jsoup
import java.io.IOException
import java.util.*
Expand Down Expand Up @@ -56,26 +56,29 @@ object Utils {

val keys = timeline.cases.keys.toTypedArray()


/*
Create CASES points for line chart
*/
for ((index, key) in keys.withIndex()) {
val previousKey = keys.getOrNull(index - 1)


if (previousKey != null) {
val increasedValue = timeline.cases.getOrDefault(key, 0)
.minus(timeline.cases.getOrDefault(previousKey, 0))
val increasedValue = timeline.cases.getOrElse(key) { 0 }
.minus(timeline.cases.getOrElse(previousKey) { 0 })

val data = Triple<Long, Int, String>(
val data = Triple(
key.toMillis(),
increasedValue,
Constants.CASES
)

val x_points = key.toMillis().toFloat()
val y_points: Float = increasedValue.toFloat()
val xPoints = key.toMillis().toFloat()
val yPoints: Float = increasedValue.toFloat()
cases.add(
Entry(
x_points,
y_points,
xPoints,
yPoints,
null,
data
)
Expand All @@ -88,26 +91,28 @@ object Utils {
)
}
}

/*
Create RECOVERED points for line chart
*/
for ((index, key) in keys.withIndex()) {
val previousKey = keys.getOrNull(index - 1)
if (previousKey != null) {
val increasedValue = timeline.recovered.getOrDefault(key, 0)
.minus(timeline.recovered.getOrDefault(previousKey, 0))
val increasedValue = timeline.recovered.getOrElse(key) { 0 }
.minus(timeline.recovered.getOrElse(previousKey) { 0 })


val data = Triple<Long, Int, String>(
val data = Triple(
key.toMillis(),
increasedValue,
Constants.RECOVERED
)

val x_points = key.toMillis().toFloat()
val y_points: Float = increasedValue.toFloat()
val xPoints = key.toMillis().toFloat()
val yPoints: Float = increasedValue.toFloat()
recovered.add(
Entry(
x_points,
y_points,
xPoints,
yPoints,
null,
data
)
Expand All @@ -120,25 +125,27 @@ object Utils {
)
}
}

/*
Create DEATHS points for line chart
*/
for ((index, key) in keys.withIndex()) {
val previousKey = keys.getOrNull(index - 1)
if (previousKey != null) {
val increasedValue = timeline.deaths.getOrDefault(key, 0)
.minus(timeline.deaths.getOrDefault(previousKey, 0))
val increasedValue = timeline.deaths.getOrElse(key) { 0 }
.minus(timeline.deaths.getOrElse(previousKey) { 0 })

val data = Triple<Long, Int, String>(
val data = Triple(
key.toMillis(),
increasedValue,
Constants.DEATHS
)

val x_points = key.toMillis().toFloat()
val y_points: Float = increasedValue.toFloat()
val xPoints = key.toMillis().toFloat()
val yPoints: Float = increasedValue.toFloat()
deaths.add(
Entry(
x_points,
y_points,
xPoints,
yPoints,
null,
data
)
Expand All @@ -158,7 +165,7 @@ object Utils {
circleRadius = 1f
color = ContextCompat.getColor(context, R.color.blue)
setCircleColor(ContextCompat.getColor(context, R.color.blue))
highLightColor = context.getColor(R.color.blue)
highLightColor = ContextCompat.getColor(context, R.color.blue)
highlightLineWidth = 2f
setDrawValues(false)
}
Expand All @@ -168,7 +175,7 @@ object Utils {
circleRadius = 1f
color = ContextCompat.getColor(context, R.color.red)
setCircleColor(ContextCompat.getColor(context, R.color.red))
highLightColor = context.getColor(R.color.red)
highLightColor = ContextCompat.getColor(context, R.color.red)
highlightLineWidth = 2f
setDrawValues(false)
}
Expand All @@ -178,7 +185,7 @@ object Utils {
circleRadius = 1f
color = ContextCompat.getColor(context, R.color.green)
setCircleColor(ContextCompat.getColor(context, R.color.green))
highLightColor = context.getColor(R.color.green)
highLightColor = ContextCompat.getColor(context, R.color.green)
highlightLineWidth = 2f
setDrawValues(false)
}
Expand All @@ -191,11 +198,11 @@ object Utils {

mLineChart.apply {
axisLeft.apply {
textColor = context.getColor(R.color.primary_text)
textColor = ContextCompat.getColor(context, R.color.primary_text)
valueFormatter = LargeValueFormatter()
}
xAxis.apply {
textColor = context.getColor(R.color.primary_text)
textColor = ContextCompat.getColor(context, R.color.primary_text)
setAvoidFirstLastClipping(true)
spaceMax = 0.01f
spaceMin = 0.01f
Expand Down Expand Up @@ -307,10 +314,12 @@ object Utils {
it?.let {
if (appLang != "en") {
it.forEachIndexed { _, country ->
val inLocale: Locale = Locale.forLanguageTag("en-EN")
val outLocale: Locale = Locale.forLanguageTag(appLang)

val inLocale = Locale("en")
val outLocale = Locale(appLang)

for (l in Locale.getAvailableLocales()) {
if (l.getDisplayCountry(inLocale).equals(country)) {
if (l.getDisplayCountry(inLocale) == country) {
names.add(l.getDisplayCountry(outLocale))
break
}
Expand All @@ -325,8 +334,8 @@ object Utils {
return@withContext names
}
}

}

translation.await()
onResult(names)
}
Expand All @@ -345,7 +354,7 @@ object Utils {
return link
}

fun showWebPage(context: Context, link: String) {
fun showWebPage(context: Context, link: String) {
val builder = CustomTabsIntent.Builder()
if (context.isDarkThemeOn()) {
builder.setColorScheme(CustomTabsIntent.COLOR_SCHEME_DARK)
Expand Down

0 comments on commit 1e2c887

Please sign in to comment.