dependencies update and code cleanup

VREMSoftwareDevelopment · Apr 13, 2024 · 765312f · 765312f
1 parent b03837e
commit 765312f
Show file tree

Hide file tree

Showing 87 changed files with 415 additions and 624 deletions.
diff --git a/README.md b/README.md
@@ -50,10 +50,10 @@ This is the official repository of WiFi Analyzer.
     * <img src="images/ic_lock_outline_black_18dp.png" alt="WEP/WPS" height="20">WEP/WPS
     * <img src="images/ic_lock_open_black_18dp.png" alt="Disabled" height="20">Disabled
 * Wi-Fi Standard (Requires Android OS 11+):
-    * <img src="images/ic_wifi_legacy.png" alt="802.11a/b/g" height="20">802.11a/b/g
-    * <img src="images/ic_wifi_4.png" alt="802.11n" height="20">802.11n
-    * <img src="images/ic_wifi_5.png" alt="802.11ac" height="20">802.11ac
-    * <img src="images/ic_wifi_6.png" alt="802.11ax" height="20">802.11ax
+    * 4 - 802.11n
+    * 5 - 802.11ac
+    * 6 - 802.11ax
+    * 7 - 802.11be
 
 ## How-to
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -43,11 +43,11 @@ dependencies {
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.11.0'
-    testImplementation 'org.mockito.kotlin:mockito-kotlin:5.2.1'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:5.3.1'
     testImplementation 'org.robolectric:robolectric:4.12.1'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
-    testImplementation 'org.slf4j:slf4j-simple:2.0.12'
+    testImplementation 'org.slf4j:slf4j-simple:2.0.13'
     testImplementation 'org.assertj:assertj-core:3.25.3'
     // Android Test Dependencies
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/app/build.properties b/app/build.properties
@@ -1,6 +1,6 @@
 #Build Properties
-#Sun Apr 07 12:03:31 EDT 2024
-version_build=16
+#Sat Apr 13 08:45:25 EDT 2024
+version_build=17
 version_major=3
 version_minor=1
 version_patch=2

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.kt
@@ -33,8 +33,6 @@ import com.vrem.wifianalyzer.wifi.model.WiFiSignal
 
 @OpenClass
 class AccessPointDetail {
-    private val vendorShortMax = 12
-    private val vendorLongMax = 30
 
     fun makeView(
         convertView: View?,
@@ -107,9 +105,8 @@ class AccessPointDetail {
         }
 
     private fun setWiFiStandardImage(view: View, wiFiSignal: WiFiSignal) =
-        view.findViewById<ImageView>(R.id.wiFiStandardImage)?.let {
-            it.tag = wiFiSignal.extra.wiFiStandard.imageResource
-            it.setImageResource(wiFiSignal.extra.wiFiStandard.imageResource)
+        view.findViewById<TextView>(R.id.wiFiStandardValue)?.let {
+            it.text = ContextCompat.getString(view.context, wiFiSignal.extra.wiFiStandard.valueResource)
         }
 
     private fun setLevelText(view: View, wiFiSignal: WiFiSignal) =
@@ -132,7 +129,7 @@ class AccessPointDetail {
                 it.visibility = View.GONE
             } else {
                 it.visibility = View.VISIBLE
-                it.text = wiFiAdditional.vendorName.take(vendorShortMax)
+                it.text = wiFiAdditional.vendorName
             }
         }
 
@@ -152,7 +149,7 @@ class AccessPointDetail {
                 it.visibility = View.GONE
             } else {
                 it.visibility = View.VISIBLE
-                it.text = wiFiAdditional.vendorName.take(vendorLongMax)
+                it.text = wiFiAdditional.vendorName
             }
         }
 
@@ -165,7 +162,7 @@ class AccessPointDetail {
         }
 
     private fun setViewWiFiStandard(view: View, wiFiSignal: WiFiSignal) =
-        view.findViewById<TextView>(R.id.wiFiStandard)?.setText(wiFiSignal.extra.wiFiStandard.textResource)
+        view.findViewById<TextView>(R.id.wiFiStandardFull)?.setText(wiFiSignal.extra.wiFiStandard.fullResource)
 
     private fun setView80211mc(view: View, wiFiSignal: WiFiSignal) =
         view.findViewById<TextView>(R.id.flag80211mc)?.let {

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/StrengthAdapter.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/StrengthAdapter.kt
@@ -22,7 +22,7 @@ import com.vrem.wifianalyzer.wifi.model.Strength
 
 class StrengthAdapter(selections: Set<Strength>) : EnumFilterAdapter<Strength>(selections, Strength.entries) {
     override fun color(selection: Strength): Int =
-        if (selections.contains(selection)) selection.colorResource else Strength.colorResourceDefault
+        if (selections.contains(selection)) selection.colorResource else Strength.COLOR_RESOURCE_DEFAULT
 
     override fun save(settings: Settings): Unit =
         settings.saveStrengths(selections)

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewBuilder.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewBuilder.kt
@@ -56,15 +56,15 @@ internal fun GridLabelRenderer.colors(themeStyle: ThemeStyle): GridLabelRenderer
 internal fun GridLabelRenderer.horizontalTitle(title: String): GridLabelRenderer {
     if (title.isNotEmpty()) {
         this.horizontalAxisTitle = title
-        this.horizontalAxisTitleTextSize = this.horizontalAxisTitleTextSize * AXIS_TEXT_SIZE_ADJUSTMENT
+        this.horizontalAxisTitleTextSize *= AXIS_TEXT_SIZE_ADJUSTMENT
     }
     return this
 }
 
 internal fun GridLabelRenderer.verticalTitle(title: String): GridLabelRenderer {
     if (title.isNotEmpty()) {
         this.verticalAxisTitle = title
-        this.verticalAxisTitleTextSize = this.verticalAxisTitleTextSize * AXIS_TEXT_SIZE_ADJUSTMENT
+        this.verticalAxisTitleTextSize *= AXIS_TEXT_SIZE_ADJUSTMENT
     }
     return this
 }
@@ -87,7 +87,7 @@ internal fun GridLabelRenderer.labels(
     this.numHorizontalLabels = numHorizontalLabels
     this.isVerticalLabelsVisible = true
     this.isHorizontalLabelsVisible = horizontalLabelsVisible
-    this.textSize = this.textSize * TEXT_SIZE_ADJUSTMENT
+    this.textSize *= TEXT_SIZE_ADJUSTMENT
     this.reloadStyles()
     return this
 }

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/Strength.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/Strength.kt
@@ -33,7 +33,7 @@ enum class Strength(@DrawableRes val imageResource: Int, @ColorRes val colorReso
 
     companion object {
         @SuppressLint("NonConstantResourceId")
-        const val colorResourceDefault: Int = R.color.regular
+        const val COLOR_RESOURCE_DEFAULT: Int = R.color.regular
 
         fun calculate(level: Int): Strength {
             return entries[calculateSignalLevel(level, entries.size)]

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiSignal.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiSignal.kt
@@ -27,7 +27,7 @@ data class WiFiSignalExtra(
     val fastRoaming: List<FastRoaming> = listOf()
 ) {
     fun wiFiStandardDisplay(context: Context): String =
-        context.getString(wiFiStandard.textResource)
+        context.getString(wiFiStandard.fullResource)
 
     fun fastRoamingDisplay(context: Context): String =
         fastRoaming

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiStandard.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiStandard.kt
@@ -19,22 +19,21 @@ package com.vrem.wifianalyzer.wifi.model
 
 import android.net.wifi.ScanResult
 import android.os.Build
-import androidx.annotation.DrawableRes
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import com.vrem.util.buildMinVersionR
 import com.vrem.wifianalyzer.R
 
 typealias WiFiStandardId = Int
 
-enum class WiFiStandard(val wiFiStandardId: WiFiStandardId, @StringRes val textResource: Int, @DrawableRes val imageResource: Int) {
-    UNKNOWN(0, R.string.wifi_standard_unknown, R.drawable.ic_wifi_unknown),
-    LEGACY(1, R.string.wifi_standard_legacy, R.drawable.ic_wifi_legacy),
-    N(4, R.string.wifi_standard_n, R.drawable.ic_wifi_4),
-    AC(5, R.string.wifi_standard_ac, R.drawable.ic_wifi_5),
-    AX(6, R.string.wifi_standard_ax, R.drawable.ic_wifi_6),
-    AD(7, R.string.wifi_standard_ad, R.drawable.ic_wifi_unknown),
-    BE(8, R.string.wifi_standard_be, R.drawable.ic_wifi_6);
+enum class WiFiStandard(val wiFiStandardId: WiFiStandardId, @StringRes val fullResource: Int, @StringRes val valueResource: Int) {
+    UNKNOWN(0, R.string.wifi_standard_unknown, R.string.wifi_standard_unknown),
+    LEGACY(1, R.string.wifi_standard_legacy, R.string.wifi_standard_unknown),
+    N(4, R.string.wifi_standard_n, R.string.wifi_standard_value_n),
+    AC(5, R.string.wifi_standard_ac, R.string.wifi_standard_value_ac),
+    AX(6, R.string.wifi_standard_ax, R.string.wifi_standard_value_ax),
+    AD(7, R.string.wifi_standard_ad, R.string.wifi_standard_unknown),
+    BE(8, R.string.wifi_standard_be, R.string.wifi_standard_value_be);
 
     companion object {
         fun findOne(scanResult: ScanResult): WiFiStandard =

diff --git a/app/src/main/res/drawable/ic_brightness_low.xml b/app/src/main/res/drawable/ic_brightness_low.xml
@@ -17,11 +17,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M20,15.31L23.31,12 20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6z"/>
+        android:pathData="M20,15.31L23.31,12 20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_color_lens.xml b/app/src/main/res/drawable/ic_color_lens.xml
@@ -17,11 +17,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/app/src/main/res/drawable/ic_expand_less.xml
@@ -18,11 +18,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/app/src/main/res/drawable/ic_expand_more.xml
@@ -18,11 +18,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_fast_forward.xml b/app/src/main/res/drawable/ic_fast_forward.xml
@@ -17,11 +17,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
+        android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_list.xml b/app/src/main/res/drawable/ic_filter_list.xml
@@ -18,11 +18,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_group.xml b/app/src/main/res/drawable/ic_group.xml
@@ -17,11 +17,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_import_export.xml b/app/src/main/res/drawable/ic_import_export.xml
@@ -18,11 +18,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>
+        android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info_outline.xml b/app/src/main/res/drawable/ic_info_outline.xml
@@ -18,11 +18,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_insert_chart.xml b/app/src/main/res/drawable/ic_insert_chart.xml
@@ -18,11 +18,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
+        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
@@ -17,11 +17,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#9E9E9E"
-        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -17,15 +17,15 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="240"
-        android:viewportHeight="240">
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240">
     <group
         android:translateX="24"
         android:translateY="24">
         <path
             android:fillColor="#308234"
-            android:pathData="M0,0h192v192h-192z"/>
+            android:pathData="M0,0h192v192h-192z" />
     </group>
 </vector>