Matte23/circolapp
1
0
Fork 0
mirror of https://github.com/Matte23/circolapp.git synced 2025-12-06 07:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Matteo Schiff
2019-09-21 15:37:18 +02:00
committed by Matte23
parent 9c41010ed5
commit 922a344d83
9 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/underdesk/circolapp/data/Circular.kt
View File

@@ -40,7 +40,7 @@ data class Circular(
fun generateFromString(string: String, url: String): Circular { fun generateFromString(string: String, url: String): Circular {
val id = string.split(" ")[1] 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) val matcherDate = Pattern.compile(dateRegex).matcher(string)
var title = string.removeSuffix("-signed") var title = string.removeSuffix("-signed")

2
app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt
View File

@@ -51,7 +51,7 @@ class NewReminderFragment : DialogFragment() {
} }
} }
var dateNotChosen = true private var dateNotChosen = true
var circular: Circular? = null var circular: Circular? = null
override fun onCreateView( override fun onCreateView(

2
app/src/main/java/net/underdesk/circolapp/server/DataFetcher.kt
View File

@@ -34,7 +34,7 @@ class DataFetcher {
} }
@Throws(IOException::class) @Throws(IOException::class)
public fun getCircularsFromServer(): List<Circular> { fun getCircularsFromServer(): List<Circular> {
val json = gson.fromJson(retrieveDataFromServer(), Response::class.java) val json = gson.fromJson(retrieveDataFromServer(), Response::class.java)
val document = Jsoup.parseBodyFragment(json.content!!.rendered) val document = Jsoup.parseBodyFragment(json.content!!.rendered)

5
app/src/main/java/net/underdesk/circolapp/works/PollWork.kt
View File

@@ -96,8 +96,9 @@ class PollWork(appContext: Context, workerParams: WorkerParameters) :
val summaryNotification = NotificationCompat.Builder(applicationContext, CHANNEL_ID) val summaryNotification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
.setContentTitle(applicationContext.getString(R.string.notification_summary_title)) .setContentTitle(applicationContext.getString(R.string.notification_summary_title))
.setContentText( .setContentText(
applicationContext.getString( applicationContext.resources.getQuantityString(
R.string.notification_summary_text, R.plurals.notification_summary_text,
circularCount,
circularCount circularCount
) )
) )

9
app/src/main/res/drawable/ic_dashboard_black_24dp.xml
View File

@@ -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>

4
app/src/main/res/navigation/mobile_navigation.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/navigation_circular_letters" android:id="@+id/navigation_circular_letters"
android:name="net.underdesk.circolapp.fragments.CircularLetterFragment" android:name="net.underdesk.circolapp.fragments.CircularLetterFragment"
android:label="@string/title_circular_letters" android:label="@string/title_circular_letters"
tools:layout="@layout/fragment_favourites" /> tools:layout="@layout/fragment_circular_letters" />
<fragment <fragment
android:id="@+id/navigation_favourites" android:id="@+id/navigation_favourites"
@@ -21,5 +21,5 @@
android:id="@+id/navigation_reminders" android:id="@+id/navigation_reminders"
android:name="net.underdesk.circolapp.fragments.RemindersFragment" android:name="net.underdesk.circolapp.fragments.RemindersFragment"
android:label="@string/title_reminders" android:label="@string/title_reminders"
tools:layout="@layout/fragment_reminders" /> tools:layout="@layout/fragment_circular_letters" />
</navigation> </navigation>

5
app/src/main/res/values/dimens.xml
View File

@@ -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>

5
app/src/main/res/values/strings.xml
View File

@@ -7,7 +7,10 @@
<string name="notification_title">Circular letter number %1$d</string> <string name="notification_title">Circular letter number %1$d</string>
<string name="notification_summary_title">New circulars published</string> <string name="notification_summary_title">New circulars published</string>
<string name="notification_summary">New circulars</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> <string name="notification_title_reminder">Reminder</string>

2
build.gradle
View File

@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.3.41' ext.kotlin_version = '1.3.50'
repositories { repositories {
google() google()
jcenter() jcenter()