diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..3c91b1f --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 4042c45..15f3cdf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ plugins { android { compileSdkVersion 30 - buildToolsVersion "30.0.2" + buildToolsVersion "30.0.3" apply plugin: "androidx.navigation.safeargs" @@ -36,25 +36,24 @@ repositories { dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.navigation:navigation-fragment:2.3.2' - implementation 'androidx.navigation:navigation-ui:2.3.2' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation 'androidx.navigation:navigation-fragment:2.3.5' + implementation 'androidx.navigation:navigation-ui:2.3.5' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation 'com.squareup.retrofit2:retrofit:2.3.0' implementation 'com.squareup.retrofit2:converter-gson:2.3.0' - implementation 'com.google.code.gson:gson:2.8.2' - implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1' - implementation 'com.squareup.okhttp3:okhttp:3.9.1' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.squareup.okhttp3:logging-interceptor:3.14.7' + implementation 'com.squareup.okhttp3:okhttp:3.14.7' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'com.jakewharton.threetenabp:threetenabp:1.2.1' - implementation group: 'commons-io', name: 'commons-io', version: '2.11.0' } \ No newline at end of file diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/file/FavouritiesFile.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/file/FavouritiesFile.java index 8748594..798090f 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/file/FavouritiesFile.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/file/FavouritiesFile.java @@ -1,8 +1,5 @@ package cc.pogoda.mobile.pogodacc.file; -import android.renderscript.ScriptGroup; - -import org.apache.commons.io.FileUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -86,7 +83,7 @@ public class FavouritiesFile { // checks if file exists and delete it if yes if (output.exists()) { - FileUtils.deleteQuietly(output); + output.delete(); output.createNewFile(); } diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableStationsList.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableStationsList.java index c972f4f..5176e1e 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableStationsList.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableStationsList.java @@ -65,14 +65,14 @@ public class ParceableStationsList implements Parcelable { parcel.writeString(s.getMoreInfo()); - parcel.writeBoolean(s.getAvailableParameters().humidity); - parcel.writeBoolean(s.getAvailableParameters().qnh); - parcel.writeBoolean(s.getAvailableParameters().windDirection); - parcel.writeBoolean(s.getAvailableParameters().windGusts); - parcel.writeBoolean(s.getAvailableParameters().windSpeed); - parcel.writeBoolean(s.getAvailableParameters().rain); - parcel.writeBoolean(s.getAvailableParameters().waterTemperature); - parcel.writeBoolean(s.getAvailableParameters().airTemperature); + parcel.writeInt(s.getAvailableParameters().humidity ? 1 : 0); + parcel.writeInt(s.getAvailableParameters().qnh ? 1 : 0); + parcel.writeInt(s.getAvailableParameters().windDirection ? 1 : 0); + parcel.writeInt(s.getAvailableParameters().windGusts ? 1 : 0); + parcel.writeInt(s.getAvailableParameters().windSpeed ? 1 : 0); + parcel.writeInt(s.getAvailableParameters().rain ? 1 : 0); + parcel.writeInt(s.getAvailableParameters().waterTemperature ? 1 : 0); + parcel.writeInt(s.getAvailableParameters().airTemperature ? 1 : 0); } } @@ -101,14 +101,14 @@ public class ParceableStationsList implements Parcelable { AvailableParameters params = new AvailableParameters(); - params.humidity = in.readBoolean(); - params.qnh = in.readBoolean(); - params.windDirection = in.readBoolean(); - params.windGusts = in.readBoolean(); - params.windSpeed = in.readBoolean(); - params.rain = in.readBoolean(); - params.waterTemperature = in.readBoolean(); - params.airTemperature = in.readBoolean(); + params.humidity = (in.readInt() > 0) ? true : false; + params.qnh = (in.readInt() > 0) ? true : false; + params.windDirection = (in.readInt() > 0) ? true : false; + params.windGusts = (in.readInt() > 0) ? true : false; + params.windSpeed = (in.readInt() > 0) ? true : false; + params.rain = (in.readInt() > 0) ? true : false; + params.waterTemperature = (in.readInt() > 0) ? true : false; + params.airTemperature = (in.readInt() > 0) ? true : false; wx.setAvailableParameters(params); diff --git a/build.gradle b/build.gradle index 20585d6..8be0387 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath "com.android.tools.build:gradle:4.1.0" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.2" + classpath "com.android.tools.build:gradle:4.1.3" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files