mirror of
https://github.com/Matte23/circolapp.git
synced 2025-12-05 23:19:10 +00:00
Fix ktlint issues
This commit is contained in:
3
.editorconfig
Normal file
3
.editorconfig
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[*.{kt, kts}]
|
||||||
|
|
||||||
|
disabled_rules = no-wildcard-imports
|
||||||
@@ -45,7 +45,8 @@ class AlarmBroadcastReceiver : BroadcastReceiver() {
|
|||||||
createNotificationChannel(context)
|
createNotificationChannel(context)
|
||||||
val circular = AppDatabase.getInstance(context).circularDao().getCircular(
|
val circular = AppDatabase.getInstance(context).circularDao().getCircular(
|
||||||
intent.getLongExtra(
|
intent.getLongExtra(
|
||||||
CIRCULAR_ID, 0
|
CIRCULAR_ID,
|
||||||
|
0
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
createNotification(
|
createNotification(
|
||||||
|
|||||||
@@ -23,10 +23,9 @@ import android.content.Context
|
|||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import net.underdesk.circolapp.works.PollWork
|
import net.underdesk.circolapp.works.PollWork
|
||||||
|
|
||||||
|
|
||||||
class BootCompleteReceiver : BroadcastReceiver() {
|
class BootCompleteReceiver : BroadcastReceiver() {
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
if (intent.action == null || intent.action != "android.intent.action.BOOT_COMPLETED") return
|
if (intent.action == null || intent.action != "android.intent.action.BOOT_COMPLETED") return
|
||||||
PollWork.enqueue(context)
|
PollWork.enqueue(context)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,7 +100,8 @@ class MainActivity : AppCompatActivity(), CircularLetterAdapter.AdapterCallback
|
|||||||
searchCallback?.search(query)
|
searchCallback?.search(query)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
)
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -126,7 +127,8 @@ class MainActivity : AppCompatActivity(), CircularLetterAdapter.AdapterCallback
|
|||||||
|
|
||||||
override fun onRequestPermissionsResult(
|
override fun onRequestPermissionsResult(
|
||||||
requestCode: Int,
|
requestCode: Int,
|
||||||
permissions: Array<String>, grantResults: IntArray
|
permissions: Array<String>,
|
||||||
|
grantResults: IntArray
|
||||||
) {
|
) {
|
||||||
when (requestCode) {
|
when (requestCode) {
|
||||||
PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE -> {
|
PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE -> {
|
||||||
|
|||||||
@@ -75,4 +75,4 @@ class SettingsActivity : AppCompatActivity() {
|
|||||||
notificationPreference?.onPreferenceChangeListener = notificationPrefChangedListener
|
notificationPreference?.onPreferenceChangeListener = notificationPrefChangedListener
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,4 +91,4 @@ class AttachmentAdapter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun getItemCount() = attachmentsNames.size
|
override fun getItemCount() = attachmentsNames.size
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ import net.underdesk.circolapp.data.AppDatabase
|
|||||||
import net.underdesk.circolapp.data.Circular
|
import net.underdesk.circolapp.data.Circular
|
||||||
import net.underdesk.circolapp.fragments.NewReminderFragment
|
import net.underdesk.circolapp.fragments.NewReminderFragment
|
||||||
|
|
||||||
|
|
||||||
class CircularLetterAdapter(
|
class CircularLetterAdapter(
|
||||||
private var circulars: List<Circular>,
|
private var circulars: List<Circular>,
|
||||||
private val adapterCallback: AdapterCallback
|
private val adapterCallback: AdapterCallback
|
||||||
@@ -199,7 +198,6 @@ class CircularLetterAdapter(
|
|||||||
MainActivity.PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE
|
MainActivity.PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
builder.create().show()
|
builder.create().show()
|
||||||
@@ -279,4 +277,4 @@ class CircularLetterAdapter(
|
|||||||
var circularToDownload: Circular?
|
var circularToDownload: Circular?
|
||||||
fun downloadCircular()
|
fun downloadCircular()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,4 +46,4 @@ abstract class AppDatabase : RoomDatabase() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,12 +38,14 @@ data class Circular(
|
|||||||
) : Parcelable {
|
) : Parcelable {
|
||||||
companion object {
|
companion object {
|
||||||
fun generateFromString(string: String, url: String): Circular {
|
fun generateFromString(string: String, url: String): Circular {
|
||||||
val idRegex = """(\d+)"""
|
val idRegex =
|
||||||
|
"""(\d+)"""
|
||||||
val matcherId = Pattern.compile(idRegex).matcher(string)
|
val matcherId = Pattern.compile(idRegex).matcher(string)
|
||||||
matcherId.find()
|
matcherId.find()
|
||||||
val id = matcherId.group(1)
|
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)
|
val matcherDate = Pattern.compile(dateRegex).matcher(string)
|
||||||
|
|
||||||
var title = string.removeSuffix("-signed")
|
var title = string.removeSuffix("-signed")
|
||||||
@@ -60,4 +62,4 @@ data class Circular(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,4 +55,4 @@ interface CircularDao {
|
|||||||
|
|
||||||
@Query("DELETE FROM circulars")
|
@Query("DELETE FROM circulars")
|
||||||
fun deleteAll()
|
fun deleteAll()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,4 +46,3 @@ class Converters {
|
|||||||
return string
|
return string
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,9 @@ import net.underdesk.circolapp.R
|
|||||||
import net.underdesk.circolapp.adapters.CircularLetterAdapter
|
import net.underdesk.circolapp.adapters.CircularLetterAdapter
|
||||||
import net.underdesk.circolapp.viewmodels.CircularLetterViewModel
|
import net.underdesk.circolapp.viewmodels.CircularLetterViewModel
|
||||||
|
|
||||||
class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
|
class CircularLetterFragment :
|
||||||
|
Fragment(),
|
||||||
|
MainActivity.SearchCallback,
|
||||||
MainActivity.RefreshCallback {
|
MainActivity.RefreshCallback {
|
||||||
|
|
||||||
private val circularLetterViewModel by viewModels<CircularLetterViewModel>()
|
private val circularLetterViewModel by viewModels<CircularLetterViewModel>()
|
||||||
@@ -48,31 +50,41 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
|
|||||||
|
|
||||||
root.circulars_list.layoutManager = LinearLayoutManager(context)
|
root.circulars_list.layoutManager = LinearLayoutManager(context)
|
||||||
|
|
||||||
circularLetterViewModel.circulars.observe(viewLifecycleOwner, {
|
circularLetterViewModel.circulars.observe(
|
||||||
if (root.circulars_list.adapter == null) {
|
viewLifecycleOwner,
|
||||||
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
|
{
|
||||||
} else {
|
if (root.circulars_list.adapter == null) {
|
||||||
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
|
root.circulars_list.adapter =
|
||||||
|
CircularLetterAdapter(it, activity as MainActivity)
|
||||||
|
} else {
|
||||||
|
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
)
|
||||||
circularLetterViewModel.showMessage.observe(viewLifecycleOwner, {
|
circularLetterViewModel.showMessage.observe(
|
||||||
if (it) activity?.findViewById<ConstraintLayout>(R.id.container)?.let { view ->
|
viewLifecycleOwner,
|
||||||
Snackbar.make(
|
{
|
||||||
view,
|
if (it) activity?.findViewById<ConstraintLayout>(R.id.container)?.let { view ->
|
||||||
getString(R.string.snackbar_connection_not_available),
|
Snackbar.make(
|
||||||
Snackbar.LENGTH_LONG
|
view,
|
||||||
).show()
|
getString(R.string.snackbar_connection_not_available),
|
||||||
|
Snackbar.LENGTH_LONG
|
||||||
|
).show()
|
||||||
|
|
||||||
circularLetterViewModel.showMessage.postValue(false)
|
circularLetterViewModel.showMessage.postValue(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
)
|
||||||
circularLetterViewModel.circularsUpdated.observe(viewLifecycleOwner, {
|
circularLetterViewModel.circularsUpdated.observe(
|
||||||
if (it) {
|
viewLifecycleOwner,
|
||||||
root.circulars_refresh.isRefreshing = false
|
{
|
||||||
|
if (it) {
|
||||||
|
root.circulars_refresh.isRefreshing = false
|
||||||
|
|
||||||
circularLetterViewModel.showMessage.postValue(false)
|
circularLetterViewModel.showMessage.postValue(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
)
|
||||||
|
|
||||||
root.circulars_refresh.setOnRefreshListener { circularLetterViewModel.updateCirculars() }
|
root.circulars_refresh.setOnRefreshListener { circularLetterViewModel.updateCirculars() }
|
||||||
|
|
||||||
@@ -89,4 +101,4 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
|
|||||||
circulars_refresh.isRefreshing = true
|
circulars_refresh.isRefreshing = true
|
||||||
circularLetterViewModel.updateCirculars()
|
circularLetterViewModel.updateCirculars()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,13 +45,17 @@ class FavouritesFragment : Fragment(), MainActivity.SearchCallback {
|
|||||||
root.circulars_list.layoutManager = LinearLayoutManager(context)
|
root.circulars_list.layoutManager = LinearLayoutManager(context)
|
||||||
root.circulars_refresh.isEnabled = false
|
root.circulars_refresh.isEnabled = false
|
||||||
|
|
||||||
favouritesViewModel.circulars.observe(viewLifecycleOwner, {
|
favouritesViewModel.circulars.observe(
|
||||||
if (root.circulars_list.adapter == null) {
|
viewLifecycleOwner,
|
||||||
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
|
{
|
||||||
} else {
|
if (root.circulars_list.adapter == null) {
|
||||||
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
|
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).searchCallback = this
|
||||||
(activity as MainActivity).refreshCallback = null
|
(activity as MainActivity).refreshCallback = null
|
||||||
@@ -61,4 +65,4 @@ class FavouritesFragment : Fragment(), MainActivity.SearchCallback {
|
|||||||
override fun search(query: String) {
|
override fun search(query: String) {
|
||||||
favouritesViewModel.query.postValue(query)
|
favouritesViewModel.query.postValue(query)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ import net.underdesk.circolapp.data.AppDatabase
|
|||||||
import net.underdesk.circolapp.data.Circular
|
import net.underdesk.circolapp.data.Circular
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
|
|
||||||
class NewReminderFragment : DialogFragment() {
|
class NewReminderFragment : DialogFragment() {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@@ -138,4 +137,4 @@ class NewReminderFragment : DialogFragment() {
|
|||||||
dialog_ok_button.text = getString(R.string.dialog_next)
|
dialog_ok_button.text = getString(R.string.dialog_next)
|
||||||
dateNotChosen = true
|
dateNotChosen = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,13 +45,17 @@ class RemindersFragment : Fragment(), MainActivity.SearchCallback {
|
|||||||
root.circulars_list.layoutManager = LinearLayoutManager(context)
|
root.circulars_list.layoutManager = LinearLayoutManager(context)
|
||||||
root.circulars_refresh.isEnabled = false
|
root.circulars_refresh.isEnabled = false
|
||||||
|
|
||||||
remindersViewModel.circulars.observe(viewLifecycleOwner, {
|
remindersViewModel.circulars.observe(
|
||||||
if (root.circulars_list.adapter == null) {
|
viewLifecycleOwner,
|
||||||
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
|
{
|
||||||
} else {
|
if (root.circulars_list.adapter == null) {
|
||||||
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
|
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).searchCallback = this
|
||||||
(activity as MainActivity).refreshCallback = null
|
(activity as MainActivity).refreshCallback = null
|
||||||
@@ -61,4 +65,4 @@ class RemindersFragment : Fragment(), MainActivity.SearchCallback {
|
|||||||
override fun search(query: String) {
|
override fun search(query: String) {
|
||||||
remindersViewModel.query.postValue(query)
|
remindersViewModel.query.postValue(query)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,4 +77,4 @@ class DataFetcher {
|
|||||||
)!!
|
)!!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,4 +74,4 @@ class CircularLetterViewModel(application: Application) : AndroidViewModel(appli
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,4 +35,4 @@ class FavouritesViewModel(application: Application) : AndroidViewModel(applicati
|
|||||||
AppDatabase.getInstance(getApplication()).circularDao().searchFavourites("%$input%")
|
AppDatabase.getInstance(getApplication()).circularDao().searchFavourites("%$input%")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,4 +35,4 @@ class RemindersViewModel(application: Application) : AndroidViewModel(applicatio
|
|||||||
AppDatabase.getInstance(getApplication()).circularDao().searchReminders("%$input%")
|
AppDatabase.getInstance(getApplication()).circularDao().searchReminders("%$input%")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ import net.underdesk.circolapp.server.DataFetcher
|
|||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
|
|
||||||
class PollWork(appContext: Context, workerParams: WorkerParameters) :
|
class PollWork(appContext: Context, workerParams: WorkerParameters) :
|
||||||
CoroutineWorker(appContext, workerParams) {
|
CoroutineWorker(appContext, workerParams) {
|
||||||
|
|
||||||
@@ -196,5 +195,4 @@ class PollWork(appContext: Context, workerParams: WorkerParameters) :
|
|||||||
notificationManager.createNotificationChannel(channel)
|
notificationManager.createNotificationChannel(channel)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user