From 68b4dc196eb8b822c320f164bf5a566fa592788f Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 17 Feb 2021 16:10:07 -0600
Subject: [PATCH] Fix some lint warnings

---
 app/proguard.pro                                        | 1 -
 app/src/main/java/org/tasks/dialogs/GeofenceDialog.java | 6 +++---
 app/src/main/java/org/tasks/time/DateTime.java          | 4 ----
 app/src/main/res/layout/location_details.xml            | 4 ++--
 app/src/main/res/values-kn/strings.xml                  | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/proguard.pro b/app/proguard.pro
index 284dd997a..b1f023d43 100644
--- a/app/proguard.pro
+++ b/app/proguard.pro
@@ -42,7 +42,6 @@
 -dontwarn org.codehaus.groovy.**
 -dontwarn org.apache.log4j.**             # ignore warnings from log4j dependency
 -keep class net.fortuna.ical4j.** { *; }  # keep all model classes (properties/factories, created at runtime)
--keep class org.threeten.bp.** { *; }     # keep ThreeTen (for time zone processing)
 -keep class at.bitfire.** { *; }       # all DAVdroid code is required
 
 # https://github.com/google/google-api-java-client-samples/blob/34c3b43cb15f4ee1b636a0e01521cc81a2451dcd/tasks-android-sample/proguard-google-api-client.txt
diff --git a/app/src/main/java/org/tasks/dialogs/GeofenceDialog.java b/app/src/main/java/org/tasks/dialogs/GeofenceDialog.java
index 3394737b1..15078449c 100644
--- a/app/src/main/java/org/tasks/dialogs/GeofenceDialog.java
+++ b/app/src/main/java/org/tasks/dialogs/GeofenceDialog.java
@@ -10,13 +10,13 @@ import android.os.Bundle;
 import android.os.Parcelable;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.Switch;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import com.google.android.material.slider.Slider;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import dagger.hilt.android.AndroidEntryPoint;
 import javax.inject.Inject;
 import org.tasks.R;
@@ -42,10 +42,10 @@ public class GeofenceDialog extends DialogFragment {
   @Inject Toaster toaster;
 
   @BindView(R.id.location_arrival)
-  Switch arrivalView;
+  SwitchMaterial arrivalView;
 
   @BindView(R.id.location_departure)
-  Switch departureView;
+  SwitchMaterial departureView;
 
   @BindView(R.id.slider)
   Slider slider;
diff --git a/app/src/main/java/org/tasks/time/DateTime.java b/app/src/main/java/org/tasks/time/DateTime.java
index 397b43851..dceedd807 100644
--- a/app/src/main/java/org/tasks/time/DateTime.java
+++ b/app/src/main/java/org/tasks/time/DateTime.java
@@ -178,10 +178,6 @@ public class DateTime {
     return timestamp;
   }
 
-  public TimeZone getTimeZone() {
-    return timeZone;
-  }
-
   public int getMillisOfDay() {
     Calendar calendar = getCalendar();
     long millisOfDay =
diff --git a/app/src/main/res/layout/location_details.xml b/app/src/main/res/layout/location_details.xml
index 20375da09..8883d5f2e 100644
--- a/app/src/main/res/layout/location_details.xml
+++ b/app/src/main/res/layout/location_details.xml
@@ -10,14 +10,14 @@
     android:paddingStart="@dimen/keyline_second"
     android:paddingEnd="@dimen/keyline_first"
     android:orientation="vertical">
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
       android:id="@+id/location_arrival"
       android:layout_width="match_parent"
       android:layout_height="?android:attr/listPreferredItemHeightSmall"
       android:gravity="center_vertical"
       android:text="@string/location_remind_arrival"
       android:textAppearance="?attr/textAppearanceListItemSmall"/>
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
       android:id="@+id/location_departure"
       android:layout_width="match_parent"
       android:layout_height="?android:attr/listPreferredItemHeightSmall"
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 8bf81a8d8..a5dbcfc0a 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -10,7 +10,7 @@
     <string name="backup_BAc_import">ಕಾದಿಟ್ಟದ್ದನ್ನು ಆಮದಿಸು</string>
     <string name="backup_BAc_export">ಈಗ ಕಾದಿರಿಸು</string>
     <string name="backup_BPr_header">ಕಾದಿಟ್ಟವುಗಳು</string>
-    <string name="export_toast">%1$ರಿಂದ %2$ಕ್ಕೆ ಕಾದಿರಿಸು.</string>
+    <string name="export_toast">%1$sರಿಂದ %2$sಕ್ಕೆ ಕಾದಿರಿಸು.</string>
     <string name="display_name">ಹೆಸರನ್ನು ತೋರಿಸು</string>
     <string name="TVA_add_comment">ಅಭಿಪ್ರಾಯವನ್ನು ಸೇರಿಸು…</string>
     <string name="actfm_picture_clear">ಚಿತ್ರವನ್ನು ಅಳಿಸು</string>