From 922a344d83eeb966135cc87f01602dbb3425a87b Mon Sep 17 00:00:00 2001
From: Matte23 <matteo@underdesk.net>
Date: Sat, 21 Sep 2019 15:37:18 +0200
Subject: [PATCH] Minor fixes

---
 .../main/java/net/underdesk/circolapp/data/Circular.kt   | 2 +-
 .../underdesk/circolapp/fragments/NewReminderFragment.kt | 2 +-
 .../java/net/underdesk/circolapp/server/DataFetcher.kt   | 2 +-
 .../main/java/net/underdesk/circolapp/works/PollWork.kt  | 5 +++--
 app/src/main/res/drawable/ic_dashboard_black_24dp.xml    | 9 ---------
 app/src/main/res/navigation/mobile_navigation.xml        | 4 ++--
 app/src/main/res/values/dimens.xml                       | 5 -----
 app/src/main/res/values/strings.xml                      | 5 ++++-
 build.gradle                                             | 2 +-
 9 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_dashboard_black_24dp.xml
 delete mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/src/main/java/net/underdesk/circolapp/data/Circular.kt b/app/src/main/java/net/underdesk/circolapp/data/Circular.kt
index 23c626b..7e1412f 100644
--- a/app/src/main/java/net/underdesk/circolapp/data/Circular.kt
+++ b/app/src/main/java/net/underdesk/circolapp/data/Circular.kt
@@ -40,7 +40,7 @@ data class Circular(
         fun generateFromString(string: String, url: String): Circular {
             val id = string.split(" ")[1]
 
-            val dateRegex = """(\d{2}\/\d{2}\/\d{4})"""
+            val dateRegex = """(\d{2}/\d{2}/\d{4})"""
             val matcherDate = Pattern.compile(dateRegex).matcher(string)
 
             var title = string.removeSuffix("-signed")
diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt
index f3ea476..dc42976 100644
--- a/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt
+++ b/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt
@@ -51,7 +51,7 @@ class NewReminderFragment : DialogFragment() {
         }
     }
 
-    var dateNotChosen = true
+    private var dateNotChosen = true
     var circular: Circular? = null
 
     override fun onCreateView(
diff --git a/app/src/main/java/net/underdesk/circolapp/server/DataFetcher.kt b/app/src/main/java/net/underdesk/circolapp/server/DataFetcher.kt
index 1c4edee..96f8697 100644
--- a/app/src/main/java/net/underdesk/circolapp/server/DataFetcher.kt
+++ b/app/src/main/java/net/underdesk/circolapp/server/DataFetcher.kt
@@ -34,7 +34,7 @@ class DataFetcher {
     }
 
     @Throws(IOException::class)
-    public fun getCircularsFromServer(): List<Circular> {
+    fun getCircularsFromServer(): List<Circular> {
         val json = gson.fromJson(retrieveDataFromServer(), Response::class.java)
 
         val document = Jsoup.parseBodyFragment(json.content!!.rendered)
diff --git a/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt b/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt
index d7e769f..50cf0db 100644
--- a/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt
+++ b/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt
@@ -96,8 +96,9 @@ class PollWork(appContext: Context, workerParams: WorkerParameters) :
             val summaryNotification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
                 .setContentTitle(applicationContext.getString(R.string.notification_summary_title))
                 .setContentText(
-                    applicationContext.getString(
-                        R.string.notification_summary_text,
+                    applicationContext.resources.getQuantityString(
+                        R.plurals.notification_summary_text,
+                        circularCount,
                         circularCount
                     )
                 )
diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
deleted file mode 100644
index 46fc8de..0000000
--- a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
-</vector>
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 4d75f85..85def39 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -9,7 +9,7 @@
         android:id="@+id/navigation_circular_letters"
         android:name="net.underdesk.circolapp.fragments.CircularLetterFragment"
         android:label="@string/title_circular_letters"
-        tools:layout="@layout/fragment_favourites" />
+        tools:layout="@layout/fragment_circular_letters" />
 
     <fragment
         android:id="@+id/navigation_favourites"
@@ -21,5 +21,5 @@
         android:id="@+id/navigation_reminders"
         android:name="net.underdesk.circolapp.fragments.RemindersFragment"
         android:label="@string/title_reminders"
-        tools:layout="@layout/fragment_reminders" />
+        tools:layout="@layout/fragment_circular_letters" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 47c8224..0000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7a5171..29774c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,7 +7,10 @@
     <string name="notification_title">Circular letter number %1$d</string>
     <string name="notification_summary_title">New circulars published</string>
     <string name="notification_summary">New circulars</string>
-    <string name="notification_summary_text">%1$d new circulars</string>
+    <plurals name="notification_summary_text">
+        <item quantity="one">%d new circular</item>
+        <item quantity="other">%d new circulars</item>
+    </plurals>
 
     <string name="notification_title_reminder">Reminder</string>
 
diff --git a/build.gradle b/build.gradle
index 4420c59..eccd7a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()