Skip to content

Commit 765312f

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
dependencies update and code cleanup
1 parent b03837e commit 765312f

File tree

87 files changed

+415
-624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+415
-624
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ This is the official repository of WiFi Analyzer.
5050
* <img src="images/ic_lock_outline_black_18dp.png" alt="WEP/WPS" height="20">WEP/WPS
5151
* <img src="images/ic_lock_open_black_18dp.png" alt="Disabled" height="20">Disabled
5252
* Wi-Fi Standard (Requires Android OS 11+):
53-
* <img src="images/ic_wifi_legacy.png" alt="802.11a/b/g" height="20">802.11a/b/g
54-
* <img src="images/ic_wifi_4.png" alt="802.11n" height="20">802.11n
55-
* <img src="images/ic_wifi_5.png" alt="802.11ac" height="20">802.11ac
56-
* <img src="images/ic_wifi_6.png" alt="802.11ax" height="20">802.11ax
53+
* 4 - 802.11n
54+
* 5 - 802.11ac
55+
* 6 - 802.11ax
56+
* 7 - 802.11be
5757

5858
## How-to
5959

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ dependencies {
4343
testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
4444
testImplementation 'junit:junit:4.13.2'
4545
testImplementation 'org.mockito:mockito-core:5.11.0'
46-
testImplementation 'org.mockito.kotlin:mockito-kotlin:5.2.1'
46+
testImplementation 'org.mockito.kotlin:mockito-kotlin:5.3.1'
4747
testImplementation 'org.robolectric:robolectric:4.12.1'
4848
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
4949
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
50-
testImplementation 'org.slf4j:slf4j-simple:2.0.12'
50+
testImplementation 'org.slf4j:slf4j-simple:2.0.13'
5151
testImplementation 'org.assertj:assertj-core:3.25.3'
5252
// Android Test Dependencies
5353
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

‎app/build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Build Properties
2-
#Sun Apr 07 12:03:31 EDT 2024
3-
version_build=16
2+
#Sat Apr 13 08:45:25 EDT 2024
3+
version_build=17
44
version_major=3
55
version_minor=1
66
version_patch=2

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ import com.vrem.wifianalyzer.wifi.model.WiFiSignal
3333

3434
@OpenClass
3535
class AccessPointDetail {
36-
private val vendorShortMax = 12
37-
private val vendorLongMax = 30
3836

3937
fun makeView(
4038
convertView: View?,
@@ -107,9 +105,8 @@ class AccessPointDetail {
107105
}
108106

109107
private fun setWiFiStandardImage(view: View, wiFiSignal: WiFiSignal) =
110-
view.findViewById<ImageView>(R.id.wiFiStandardImage)?.let {
111-
it.tag = wiFiSignal.extra.wiFiStandard.imageResource
112-
it.setImageResource(wiFiSignal.extra.wiFiStandard.imageResource)
108+
view.findViewById<TextView>(R.id.wiFiStandardValue)?.let {
109+
it.text = ContextCompat.getString(view.context, wiFiSignal.extra.wiFiStandard.valueResource)
113110
}
114111

115112
private fun setLevelText(view: View, wiFiSignal: WiFiSignal) =
@@ -132,7 +129,7 @@ class AccessPointDetail {
132129
it.visibility = View.GONE
133130
} else {
134131
it.visibility = View.VISIBLE
135-
it.text = wiFiAdditional.vendorName.take(vendorShortMax)
132+
it.text = wiFiAdditional.vendorName
136133
}
137134
}
138135

@@ -152,7 +149,7 @@ class AccessPointDetail {
152149
it.visibility = View.GONE
153150
} else {
154151
it.visibility = View.VISIBLE
155-
it.text = wiFiAdditional.vendorName.take(vendorLongMax)
152+
it.text = wiFiAdditional.vendorName
156153
}
157154
}
158155

@@ -165,7 +162,7 @@ class AccessPointDetail {
165162
}
166163

167164
private fun setViewWiFiStandard(view: View, wiFiSignal: WiFiSignal) =
168-
view.findViewById<TextView>(R.id.wiFiStandard)?.setText(wiFiSignal.extra.wiFiStandard.textResource)
165+
view.findViewById<TextView>(R.id.wiFiStandardFull)?.setText(wiFiSignal.extra.wiFiStandard.fullResource)
169166

170167
private fun setView80211mc(view: View, wiFiSignal: WiFiSignal) =
171168
view.findViewById<TextView>(R.id.flag80211mc)?.let {

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/StrengthAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.vrem.wifianalyzer.wifi.model.Strength
2222

2323
class StrengthAdapter(selections: Set<Strength>) : EnumFilterAdapter<Strength>(selections, Strength.entries) {
2424
override fun color(selection: Strength): Int =
25-
if (selections.contains(selection)) selection.colorResource else Strength.colorResourceDefault
25+
if (selections.contains(selection)) selection.colorResource else Strength.COLOR_RESOURCE_DEFAULT
2626

2727
override fun save(settings: Settings): Unit =
2828
settings.saveStrengths(selections)

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewBuilder.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ internal fun GridLabelRenderer.colors(themeStyle: ThemeStyle): GridLabelRenderer
5656
internal fun GridLabelRenderer.horizontalTitle(title: String): GridLabelRenderer {
5757
if (title.isNotEmpty()) {
5858
this.horizontalAxisTitle = title
59-
this.horizontalAxisTitleTextSize = this.horizontalAxisTitleTextSize * AXIS_TEXT_SIZE_ADJUSTMENT
59+
this.horizontalAxisTitleTextSize *= AXIS_TEXT_SIZE_ADJUSTMENT
6060
}
6161
return this
6262
}
6363

6464
internal fun GridLabelRenderer.verticalTitle(title: String): GridLabelRenderer {
6565
if (title.isNotEmpty()) {
6666
this.verticalAxisTitle = title
67-
this.verticalAxisTitleTextSize = this.verticalAxisTitleTextSize * AXIS_TEXT_SIZE_ADJUSTMENT
67+
this.verticalAxisTitleTextSize *= AXIS_TEXT_SIZE_ADJUSTMENT
6868
}
6969
return this
7070
}
@@ -87,7 +87,7 @@ internal fun GridLabelRenderer.labels(
8787
this.numHorizontalLabels = numHorizontalLabels
8888
this.isVerticalLabelsVisible = true
8989
this.isHorizontalLabelsVisible = horizontalLabelsVisible
90-
this.textSize = this.textSize * TEXT_SIZE_ADJUSTMENT
90+
this.textSize *= TEXT_SIZE_ADJUSTMENT
9191
this.reloadStyles()
9292
return this
9393
}

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/Strength.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ enum class Strength(@DrawableRes val imageResource: Int, @ColorRes val colorReso
3333

3434
companion object {
3535
@SuppressLint("NonConstantResourceId")
36-
const val colorResourceDefault: Int = R.color.regular
36+
const val COLOR_RESOURCE_DEFAULT: Int = R.color.regular
3737

3838
fun calculate(level: Int): Strength {
3939
return entries[calculateSignalLevel(level, entries.size)]

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiSignal.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data class WiFiSignalExtra(
2727
val fastRoaming: List<FastRoaming> = listOf()
2828
) {
2929
fun wiFiStandardDisplay(context: Context): String =
30-
context.getString(wiFiStandard.textResource)
30+
context.getString(wiFiStandard.fullResource)
3131

3232
fun fastRoamingDisplay(context: Context): String =
3333
fastRoaming

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiStandard.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,21 @@ package com.vrem.wifianalyzer.wifi.model
1919

2020
import android.net.wifi.ScanResult
2121
import android.os.Build
22-
import androidx.annotation.DrawableRes
2322
import androidx.annotation.RequiresApi
2423
import androidx.annotation.StringRes
2524
import com.vrem.util.buildMinVersionR
2625
import com.vrem.wifianalyzer.R
2726

2827
typealias WiFiStandardId = Int
2928

30-
enum class WiFiStandard(val wiFiStandardId: WiFiStandardId, @StringRes val textResource: Int, @DrawableRes val imageResource: Int) {
31-
UNKNOWN(0, R.string.wifi_standard_unknown, R.drawable.ic_wifi_unknown),
32-
LEGACY(1, R.string.wifi_standard_legacy, R.drawable.ic_wifi_legacy),
33-
N(4, R.string.wifi_standard_n, R.drawable.ic_wifi_4),
34-
AC(5, R.string.wifi_standard_ac, R.drawable.ic_wifi_5),
35-
AX(6, R.string.wifi_standard_ax, R.drawable.ic_wifi_6),
36-
AD(7, R.string.wifi_standard_ad, R.drawable.ic_wifi_unknown),
37-
BE(8, R.string.wifi_standard_be, R.drawable.ic_wifi_6);
29+
enum class WiFiStandard(val wiFiStandardId: WiFiStandardId, @StringRes val fullResource: Int, @StringRes val valueResource: Int) {
30+
UNKNOWN(0, R.string.wifi_standard_unknown, R.string.wifi_standard_unknown),
31+
LEGACY(1, R.string.wifi_standard_legacy, R.string.wifi_standard_unknown),
32+
N(4, R.string.wifi_standard_n, R.string.wifi_standard_value_n),
33+
AC(5, R.string.wifi_standard_ac, R.string.wifi_standard_value_ac),
34+
AX(6, R.string.wifi_standard_ax, R.string.wifi_standard_value_ax),
35+
AD(7, R.string.wifi_standard_ad, R.string.wifi_standard_unknown),
36+
BE(8, R.string.wifi_standard_be, R.string.wifi_standard_value_be);
3837

3938
companion object {
4039
fun findOne(scanResult: ScanResult): WiFiStandard =

‎app/src/main/res/drawable/ic_brightness_low.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
-->
1818

1919
<vector xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:width="24dp"
21-
android:height="24dp"
22-
android:viewportWidth="24.0"
23-
android:viewportHeight="24.0">
20+
android:width="24dp"
21+
android:height="24dp"
22+
android:viewportWidth="24.0"
23+
android:viewportHeight="24.0">
2424
<path
2525
android:fillColor="#9E9E9E"
26-
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"/>
26+
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" />
2727
</vector>

‎app/src/main/res/drawable/ic_color_lens.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
-->
1818

1919
<vector xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:width="24dp"
21-
android:height="24dp"
22-
android:viewportWidth="24.0"
23-
android:viewportHeight="24.0">
20+
android:width="24dp"
21+
android:height="24dp"
22+
android:viewportWidth="24.0"
23+
android:viewportHeight="24.0">
2424
<path
2525
android:fillColor="#9E9E9E"
26-
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"/>
26+
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" />
2727
</vector>

‎app/src/main/res/drawable/ic_expand_less.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
-->
1919

2020
<vector xmlns:android="http://schemas.android.com/apk/res/android"
21-
android:width="24dp"
22-
android:height="24dp"
23-
android:viewportWidth="24.0"
24-
android:viewportHeight="24.0">
21+
android:width="24dp"
22+
android:height="24dp"
23+
android:viewportWidth="24.0"
24+
android:viewportHeight="24.0">
2525
<path
2626
android:fillColor="#9E9E9E"
27-
android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
27+
android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
2828
</vector>

‎app/src/main/res/drawable/ic_expand_more.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
-->
1919

2020
<vector xmlns:android="http://schemas.android.com/apk/res/android"
21-
android:width="24dp"
22-
android:height="24dp"
23-
android:viewportWidth="24.0"
24-
android:viewportHeight="24.0">
21+
android:width="24dp"
22+
android:height="24dp"
23+
android:viewportWidth="24.0"
24+
android:viewportHeight="24.0">
2525
<path
2626
android:fillColor="#9E9E9E"
27-
android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
27+
android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z" />
2828
</vector>

‎app/src/main/res/drawable/ic_fast_forward.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
-->
1818

1919
<vector xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:width="24dp"
21-
android:height="24dp"
22-
android:viewportWidth="24.0"
23-
android:viewportHeight="24.0">
20+
android:width="24dp"
21+
android:height="24dp"
22+
android:viewportWidth="24.0"
23+
android:viewportHeight="24.0">
2424
<path
2525
android:fillColor="#9E9E9E"
26-
android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
26+
android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z" />
2727
</vector>

‎app/src/main/res/drawable/ic_filter_list.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
-->
1919

2020
<vector xmlns:android="http://schemas.android.com/apk/res/android"
21-
android:width="24dp"
22-
android:height="24dp"
23-
android:viewportWidth="24.0"
24-
android:viewportHeight="24.0">
21+
android:width="24dp"
22+
android:height="24dp"
23+
android:viewportWidth="24.0"
24+
android:viewportHeight="24.0">
2525
<path
2626
android:fillColor="#9E9E9E"
27-
android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
27+
android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
2828
</vector>

‎app/src/main/res/drawable/ic_group.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
-->
1818

1919
<vector xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:width="24dp"
21-
android:height="24dp"
22-
android:viewportWidth="24.0"
23-
android:viewportHeight="24.0">
20+
android:width="24dp"
21+
android:height="24dp"
22+
android:viewportWidth="24.0"
23+
android:viewportHeight="24.0">
2424
<path
2525
android:fillColor="#9E9E9E"
26-
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"/>
26+
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" />
2727
</vector>

‎app/src/main/res/drawable/ic_import_export.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
-->
1919

2020
<vector xmlns:android="http://schemas.android.com/apk/res/android"
21-
android:width="24dp"
22-
android:height="24dp"
23-
android:viewportWidth="24.0"
24-
android:viewportHeight="24.0">
21+
android:width="24dp"
22+
android:height="24dp"
23+
android:viewportWidth="24.0"
24+
android:viewportHeight="24.0">
2525
<path
2626
android:fillColor="#9E9E9E"
27-
android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>
27+
android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
2828
</vector>

‎app/src/main/res/drawable/ic_info_outline.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
-->
1919

2020
<vector xmlns:android="http://schemas.android.com/apk/res/android"
21-
android:width="24dp"
22-
android:height="24dp"
23-
android:viewportWidth="24.0"
24-
android:viewportHeight="24.0">
21+
android:width="24dp"
22+
android:height="24dp"
23+
android:viewportWidth="24.0"
24+
android:viewportHeight="24.0">
2525
<path
2626
android:fillColor="#9E9E9E"
27-
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"/>
27+
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" />
2828
</vector>

‎app/src/main/res/drawable/ic_insert_chart.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
-->
1919

2020
<vector xmlns:android="http://schemas.android.com/apk/res/android"
21-
android:width="24dp"
22-
android:height="24dp"
23-
android:viewportWidth="24.0"
24-
android:viewportHeight="24.0">
21+
android:width="24dp"
22+
android:height="24dp"
23+
android:viewportWidth="24.0"
24+
android:viewportHeight="24.0">
2525
<path
2626
android:fillColor="#9E9E9E"
27-
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"/>
27+
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" />
2828
</vector>

‎app/src/main/res/drawable/ic_language.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
-->
1818

1919
<vector xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:width="24dp"
21-
android:height="24dp"
22-
android:viewportWidth="24.0"
23-
android:viewportHeight="24.0">
20+
android:width="24dp"
21+
android:height="24dp"
22+
android:viewportWidth="24.0"
23+
android:viewportHeight="24.0">
2424
<path
2525
android:fillColor="#9E9E9E"
26-
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"/>
26+
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" />
2727
</vector>

‎app/src/main/res/drawable/ic_launcher_background.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
-->
1818

1919
<vector xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:width="108dp"
21-
android:height="108dp"
22-
android:viewportWidth="240"
23-
android:viewportHeight="240">
20+
android:width="108dp"
21+
android:height="108dp"
22+
android:viewportWidth="240"
23+
android:viewportHeight="240">
2424
<group
2525
android:translateX="24"
2626
android:translateY="24">
2727
<path
2828
android:fillColor="#308234"
29-
android:pathData="M0,0h192v192h-192z"/>
29+
android:pathData="M0,0h192v192h-192z" />
3030
</group>
3131
</vector>

0 commit comments

Comments
 (0)