Skip to content

Commit 131c2fa

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
cleanup
1 parent 7fede84 commit 131c2fa

9 files changed

Lines changed: 71 additions & 24 deletions

File tree

‎app/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,33 @@ apply {
3434
dependencies {
3535
// Compile Build Dependencies
3636
implementation fileTree(include: ["*.jar"], dir: "libs")
37-
implementation 'com.google.android.material:material:1.14.0'
3837
implementation 'androidx.annotation:annotation:1.10.0'
3938
implementation 'androidx.appcompat:appcompat:1.7.1'
4039
implementation 'androidx.collection:collection-ktx:1.6.0'
4140
implementation 'androidx.core:core-ktx:1.18.0'
4241
implementation 'androidx.core:core-splashscreen:1.2.0'
43-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
4442
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0'
4543
implementation 'androidx.media:media:1.8.0'
4644
implementation 'androidx.preference:preference-ktx:1.2.1'
47-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
45+
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0'
46+
implementation 'com.google.android.material:material:1.14.0'
4847
implementation 'com.patrykandpatrick.vico:views:3.2.2'
48+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
4949
// Unit Test Dependencies
5050
testImplementation 'androidx.test.ext:junit:1.3.0'
5151
testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
5252
testImplementation 'junit:junit:4.13.2'
53+
testImplementation 'org.assertj:assertj-core:3.27.7'
54+
testImplementation 'org.hamcrest:hamcrest:3.0'
55+
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
56+
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
5357
testImplementation 'org.mockito:mockito-core:5.23.0'
5458
testImplementation 'org.mockito.kotlin:mockito-kotlin:6.3.0'
5559
testImplementation 'org.robolectric:robolectric:4.16.1'
56-
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
57-
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
5860
testImplementation 'org.slf4j:slf4j-simple:2.0.18'
59-
testImplementation 'org.assertj:assertj-core:3.27.7'
60-
testImplementation 'org.hamcrest:hamcrest:3.0'
6161
// Android Test Dependencies
62-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
6362
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.7.0'
63+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
6464
androidTestImplementation 'androidx.test.ext:junit-ktx:1.3.0'
6565
androidTestImplementation 'androidx.test:rules:1.7.0'
6666
androidTestImplementation 'org.assertj:assertj-core:3.27.7'

‎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-
#Sat Jun 13 11:18:01 EDT 2026
3-
version_build=10
2+
#Sat Jun 13 12:41:08 EDT 2026
3+
version_build=11
44
version_major=3
55
version_minor=3
66
version_patch=2

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030

3131
<application
3232
android:allowBackup="true"
33-
android:fullBackupContent="true"
33+
android:dataExtractionRules="@xml/data_extraction_rules"
34+
android:fullBackupContent="@xml/backup_rules"
3435
android:hardwareAccelerated="true"
3536
android:icon="@mipmap/ic_launcher"
3637
android:label="@string/app_name"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,28 @@ class SeriesData(
5656
var connected: Boolean = false,
5757
var drawBackground: Boolean = false,
5858
) {
59-
private val _dataPoints: ArrayDeque<DataPoint> = ArrayDeque(dataPoints)
60-
val dataPoints: List<DataPoint> get() = _dataPoints
59+
val dataPoints: List<DataPoint>
60+
field = ArrayDeque(dataPoints)
6161

6262
fun replaceAll(points: List<DataPoint>) {
63-
_dataPoints.clear()
64-
_dataPoints.addAll(points)
63+
dataPoints.clear()
64+
dataPoints.addAll(points)
6565
}
6666

6767
fun append(
6868
point: DataPoint,
6969
maxSize: Int,
7070
) {
71-
_dataPoints.addLast(point)
72-
if (_dataPoints.size > maxSize) {
73-
_dataPoints.removeFirst()
71+
dataPoints.addLast(point)
72+
if (dataPoints.size > maxSize) {
73+
dataPoints.removeFirst()
7474
}
7575
}
7676

7777
fun toCoordinates(): Coordinates {
78-
val xValues = ArrayList<Double>(_dataPoints.size)
79-
val yValues = ArrayList<Double>(_dataPoints.size)
80-
_dataPoints.forEach { dataPoint ->
78+
val xValues = ArrayList<Double>(dataPoints.size)
79+
val yValues = ArrayList<Double>(dataPoints.size)
80+
dataPoints.forEach { dataPoint ->
8181
xValues.add(dataPoint.x.toDouble())
8282
yValues.add(dataPoint.y.toDouble())
8383
}

‎app/src/main/res/layout/main_content.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
android:id="@+id/nav_bottom"
4949
android:layout_width="match_parent"
5050
android:layout_height="wrap_content"
51-
android:layout_alignParentBottom="true"
52-
android:background="@color/primary_material_dark"
51+
android:background="@color/nav_bottom_background"
5352
app:itemIconTint="@drawable/menu_selector"
5453
app:itemTextColor="@drawable/menu_selector"
5554
app:labelVisibilityMode="labeled"

‎app/src/main/res/values/colors.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,6 @@
4343
<color name="background">#757575</color>
4444
<!-- black -->
4545
<color name="black">#000000</color>
46+
<!-- grey_900 -->
47+
<color name="nav_bottom_background">#212121</color>
4648
</resources>

‎app/src/main/res/xml/backup_rules.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ WiFiAnalyzer
4+
~ Copyright (C) 2015 - 2026 VREM Software Development <VREMSoftwareDevelopment@gmail.com>
5+
~
6+
~ This program is free software: you can redistribute it and/or modify
7+
~ it under the terms of the GNU General Public License as published by
8+
~ the Free Software Foundation, either version 3 of the License, or
9+
~ (at your option) any later version.
10+
~
11+
~ This program is distributed in the hope that it will be useful,
12+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
~ GNU General Public License for more details.
15+
~
16+
~ You should have received a copy of the GNU General Public License
17+
~ along with this program. If not, see <http://www.gnu.org/licenses/>
18+
-->
19+
20+
<!-- Backup configuration for Android 11 (API 30) and lower. Empty rules back up all eligible data. -->
21+
<full-backup-content />

‎app/src/main/res/xml/data_extraction_rules.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ WiFiAnalyzer
4+
~ Copyright (C) 2015 - 2026 VREM Software Development <VREMSoftwareDevelopment@gmail.com>
5+
~
6+
~ This program is free software: you can redistribute it and/or modify
7+
~ it under the terms of the GNU General Public License as published by
8+
~ the Free Software Foundation, either version 3 of the License, or
9+
~ (at your option) any later version.
10+
~
11+
~ This program is distributed in the hope that it will be useful,
12+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
~ GNU General Public License for more details.
15+
~
16+
~ You should have received a copy of the GNU General Public License
17+
~ along with this program. If not, see <http://www.gnu.org/licenses/>
18+
-->
19+
20+
<!-- Backup/transfer configuration for Android 12 (API 31) and higher. Empty rules back up all eligible data. -->
21+
<data-extraction-rules>
22+
<cloud-backup />
23+
<device-transfer />
24+
</data-extraction-rules>

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ buildscript {
2929
}
3030
dependencies {
3131
classpath 'com.android.tools.build:gradle:9.2.1'
32-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3332
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
33+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3434
}
3535
}
3636

0 commit comments

Comments
 (0)