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

Fix ktlint issues

Browse Source
This commit is contained in:
Matteo Schiff
2020-09-22 19:32:29 +02:00
committed by Matte23
parent b3ecd74600
commit f5fe6c1396
20 changed files with 81 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/net/underdesk/circolapp/AlarmBroadcastReceiver.kt
View File

@@ -45,7 +45,8 @@ class AlarmBroadcastReceiver : BroadcastReceiver() {
createNotificationChannel(context)
val circular = AppDatabase.getInstance(context).circularDao().getCircular(
intent.getLongExtra(
CIRCULAR_ID, 0
CIRCULAR_ID,
0
)
)
createNotification(

3
app/src/main/java/net/underdesk/circolapp/BootCompleteReceiver.kt
View File

@@ -23,10 +23,9 @@ import android.content.Context
import android.content.Intent
import net.underdesk.circolapp.works.PollWork
class BootCompleteReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
if (intent.action == null || intent.action != "android.intent.action.BOOT_COMPLETED") return
PollWork.enqueue(context)
}
}
}

6
app/src/main/java/net/underdesk/circolapp/MainActivity.kt
View File

@@ -100,7 +100,8 @@ class MainActivity : AppCompatActivity(), CircularLetterAdapter.AdapterCallback
searchCallback?.search(query)
return false
}
})
}
)
return true
}
@@ -126,7 +127,8 @@ class MainActivity : AppCompatActivity(), CircularLetterAdapter.AdapterCallback
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<String>, grantResults: IntArray
permissions: Array<String>,
grantResults: IntArray
) {
when (requestCode) {
PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE -> {

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

@@ -75,4 +75,4 @@ class SettingsActivity : AppCompatActivity() {
notificationPreference?.onPreferenceChangeListener = notificationPrefChangedListener
}
}
}
}

2
app/src/main/java/net/underdesk/circolapp/adapters/AttachmentAdapter.kt
View File

@@ -91,4 +91,4 @@ class AttachmentAdapter(
}
override fun getItemCount() = attachmentsNames.size
}
}

4
app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt
View File

@@ -46,7 +46,6 @@ import net.underdesk.circolapp.data.AppDatabase
import net.underdesk.circolapp.data.Circular
import net.underdesk.circolapp.fragments.NewReminderFragment
class CircularLetterAdapter(
private var circulars: List<Circular>,
private val adapterCallback: AdapterCallback
@@ -199,7 +198,6 @@ class CircularLetterAdapter(
MainActivity.PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE
)
}
}
builder.create().show()
@@ -279,4 +277,4 @@ class CircularLetterAdapter(
var circularToDownload: Circular?
fun downloadCircular()
}
}
}

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

@@ -46,4 +46,4 @@ abstract class AppDatabase : RoomDatabase() {
}
}
}
}
}

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

@@ -38,12 +38,14 @@ data class Circular(
) : Parcelable {
companion object {
fun generateFromString(string: String, url: String): Circular {
val idRegex = """(\d+)"""
val idRegex =
"""(\d+)"""
val matcherId = Pattern.compile(idRegex).matcher(string)
matcherId.find()
val id = matcherId.group(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")
@@ -60,4 +62,4 @@ data class Circular(
}
}
}
}
}

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

@@ -55,4 +55,4 @@ interface CircularDao {
@Query("DELETE FROM circulars")
fun deleteAll()
}
}

1
app/src/main/java/net/underdesk/circolapp/data/Converters.kt
View File

@@ -46,4 +46,3 @@ class Converters {
return string
}
}

56
app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt
View File

@@ -34,7 +34,9 @@ import net.underdesk.circolapp.R
import net.underdesk.circolapp.adapters.CircularLetterAdapter
import net.underdesk.circolapp.viewmodels.CircularLetterViewModel
class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
class CircularLetterFragment :
Fragment(),
MainActivity.SearchCallback,
MainActivity.RefreshCallback {
private val circularLetterViewModel by viewModels<CircularLetterViewModel>()
@@ -48,31 +50,41 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
root.circulars_list.layoutManager = LinearLayoutManager(context)
circularLetterViewModel.circulars.observe(viewLifecycleOwner, {
if (root.circulars_list.adapter == null) {
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
} else {
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
circularLetterViewModel.circulars.observe(
viewLifecycleOwner,
{
if (root.circulars_list.adapter == null) {
root.circulars_list.adapter =
CircularLetterAdapter(it, activity as MainActivity)
} else {
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
}
}
})
circularLetterViewModel.showMessage.observe(viewLifecycleOwner, {
if (it) activity?.findViewById<ConstraintLayout>(R.id.container)?.let { view ->
Snackbar.make(
view,
getString(R.string.snackbar_connection_not_available),
Snackbar.LENGTH_LONG
).show()
)
circularLetterViewModel.showMessage.observe(
viewLifecycleOwner,
{
if (it) activity?.findViewById<ConstraintLayout>(R.id.container)?.let { view ->
Snackbar.make(
view,
getString(R.string.snackbar_connection_not_available),
Snackbar.LENGTH_LONG
).show()
circularLetterViewModel.showMessage.postValue(false)
circularLetterViewModel.showMessage.postValue(false)
}
}
})
circularLetterViewModel.circularsUpdated.observe(viewLifecycleOwner, {
if (it) {
root.circulars_refresh.isRefreshing = false
)
circularLetterViewModel.circularsUpdated.observe(
viewLifecycleOwner,
{
if (it) {
root.circulars_refresh.isRefreshing = false
circularLetterViewModel.showMessage.postValue(false)
circularLetterViewModel.showMessage.postValue(false)
}
}
})
)
root.circulars_refresh.setOnRefreshListener { circularLetterViewModel.updateCirculars() }
@@ -89,4 +101,4 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
circulars_refresh.isRefreshing = true
circularLetterViewModel.updateCirculars()
}
}
}

18
app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt
View File

@@ -45,13 +45,17 @@ class FavouritesFragment : Fragment(), MainActivity.SearchCallback {
root.circulars_list.layoutManager = LinearLayoutManager(context)
root.circulars_refresh.isEnabled = false
favouritesViewModel.circulars.observe(viewLifecycleOwner, {
if (root.circulars_list.adapter == null) {
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
} else {
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
favouritesViewModel.circulars.observe(
viewLifecycleOwner,
{
if (root.circulars_list.adapter == null) {
root.circulars_list.adapter =
CircularLetterAdapter(it, activity as MainActivity)
} else {
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
}
}
})
)
(activity as MainActivity).searchCallback = this
(activity as MainActivity).refreshCallback = null
@@ -61,4 +65,4 @@ class FavouritesFragment : Fragment(), MainActivity.SearchCallback {
override fun search(query: String) {
favouritesViewModel.query.postValue(query)
}
}
}

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

@@ -36,7 +36,6 @@ import net.underdesk.circolapp.data.AppDatabase
import net.underdesk.circolapp.data.Circular
import java.util.*
class NewReminderFragment : DialogFragment() {
companion object {
@@ -138,4 +137,4 @@ class NewReminderFragment : DialogFragment() {
dialog_ok_button.text = getString(R.string.dialog_next)
dateNotChosen = true
}
}
}

18
app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt
View File

@@ -45,13 +45,17 @@ class RemindersFragment : Fragment(), MainActivity.SearchCallback {
root.circulars_list.layoutManager = LinearLayoutManager(context)
root.circulars_refresh.isEnabled = false
remindersViewModel.circulars.observe(viewLifecycleOwner, {
if (root.circulars_list.adapter == null) {
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
} else {
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
remindersViewModel.circulars.observe(
viewLifecycleOwner,
{
if (root.circulars_list.adapter == null) {
root.circulars_list.adapter =
CircularLetterAdapter(it, activity as MainActivity)
} else {
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
}
}
})
)
(activity as MainActivity).searchCallback = this
(activity as MainActivity).refreshCallback = null
@@ -61,4 +65,4 @@ class RemindersFragment : Fragment(), MainActivity.SearchCallback {
override fun search(query: String) {
remindersViewModel.query.postValue(query)
}
}
}

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

@@ -77,4 +77,4 @@ class DataFetcher {
)!!
}
}
}
}

2
app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt
View File

@@ -74,4 +74,4 @@ class CircularLetterViewModel(application: Application) : AndroidViewModel(appli
}
}
}
}
}

2
app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt
View File

@@ -35,4 +35,4 @@ class FavouritesViewModel(application: Application) : AndroidViewModel(applicati
AppDatabase.getInstance(getApplication()).circularDao().searchFavourites("%$input%")
}
}
}
}

2
app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt
View File

@@ -35,4 +35,4 @@ class RemindersViewModel(application: Application) : AndroidViewModel(applicatio
AppDatabase.getInstance(getApplication()).circularDao().searchReminders("%$input%")
}
}
}
}

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

@@ -41,7 +41,6 @@ import net.underdesk.circolapp.server.DataFetcher
import java.io.IOException
import java.util.concurrent.TimeUnit
class PollWork(appContext: Context, workerParams: WorkerParameters) :
CoroutineWorker(appContext, workerParams) {
@@ -196,5 +195,4 @@ class PollWork(appContext: Context, workerParams: WorkerParameters) :
notificationManager.createNotificationChannel(channel)
}
}
}