diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..3b863ba --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +[*.{kt, kts}] + +disabled_rules = no-wildcard-imports \ No newline at end of file diff --git a/app/src/main/java/net/underdesk/circolapp/AlarmBroadcastReceiver.kt b/app/src/main/java/net/underdesk/circolapp/AlarmBroadcastReceiver.kt index a7cb779..988bef3 100644 --- a/app/src/main/java/net/underdesk/circolapp/AlarmBroadcastReceiver.kt +++ b/app/src/main/java/net/underdesk/circolapp/AlarmBroadcastReceiver.kt @@ -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( diff --git a/app/src/main/java/net/underdesk/circolapp/BootCompleteReceiver.kt b/app/src/main/java/net/underdesk/circolapp/BootCompleteReceiver.kt index 3a59cbf..818a752 100644 --- a/app/src/main/java/net/underdesk/circolapp/BootCompleteReceiver.kt +++ b/app/src/main/java/net/underdesk/circolapp/BootCompleteReceiver.kt @@ -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) } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/MainActivity.kt b/app/src/main/java/net/underdesk/circolapp/MainActivity.kt index 97b3820..90569f4 100644 --- a/app/src/main/java/net/underdesk/circolapp/MainActivity.kt +++ b/app/src/main/java/net/underdesk/circolapp/MainActivity.kt @@ -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, grantResults: IntArray + permissions: Array, + grantResults: IntArray ) { when (requestCode) { PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE -> { diff --git a/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt b/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt index 63664fc..b033287 100644 --- a/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt +++ b/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt @@ -75,4 +75,4 @@ class SettingsActivity : AppCompatActivity() { notificationPreference?.onPreferenceChangeListener = notificationPrefChangedListener } } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/adapters/AttachmentAdapter.kt b/app/src/main/java/net/underdesk/circolapp/adapters/AttachmentAdapter.kt index e56fc9e..89cafa8 100644 --- a/app/src/main/java/net/underdesk/circolapp/adapters/AttachmentAdapter.kt +++ b/app/src/main/java/net/underdesk/circolapp/adapters/AttachmentAdapter.kt @@ -91,4 +91,4 @@ class AttachmentAdapter( } override fun getItemCount() = attachmentsNames.size -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt b/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt index 4c54d37..3702f79 100644 --- a/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt +++ b/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt @@ -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, 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() } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/data/AppDatabase.kt b/app/src/main/java/net/underdesk/circolapp/data/AppDatabase.kt index b770769..754fd16 100644 --- a/app/src/main/java/net/underdesk/circolapp/data/AppDatabase.kt +++ b/app/src/main/java/net/underdesk/circolapp/data/AppDatabase.kt @@ -46,4 +46,4 @@ abstract class AppDatabase : RoomDatabase() { } } } -} \ No newline at end of file +} 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 775945a..511c633 100644 --- a/app/src/main/java/net/underdesk/circolapp/data/Circular.kt +++ b/app/src/main/java/net/underdesk/circolapp/data/Circular.kt @@ -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( } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/data/CircularDao.kt b/app/src/main/java/net/underdesk/circolapp/data/CircularDao.kt index 07bf11a..16c1d6f 100644 --- a/app/src/main/java/net/underdesk/circolapp/data/CircularDao.kt +++ b/app/src/main/java/net/underdesk/circolapp/data/CircularDao.kt @@ -55,4 +55,4 @@ interface CircularDao { @Query("DELETE FROM circulars") fun deleteAll() -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/data/Converters.kt b/app/src/main/java/net/underdesk/circolapp/data/Converters.kt index 6f73c68..a7db408 100644 --- a/app/src/main/java/net/underdesk/circolapp/data/Converters.kt +++ b/app/src/main/java/net/underdesk/circolapp/data/Converters.kt @@ -46,4 +46,3 @@ class Converters { return string } } - diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt index dbcc46a..b342a3b 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt @@ -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() @@ -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(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(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() } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt index 346eb16..d52ad0c 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt @@ -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) } -} \ No newline at end of file +} 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 4a11043..181884c 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt @@ -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 } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt index 3541777..96368ab 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt @@ -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) } -} \ No newline at end of file +} 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 1973231..af63e78 100644 --- a/app/src/main/java/net/underdesk/circolapp/server/DataFetcher.kt +++ b/app/src/main/java/net/underdesk/circolapp/server/DataFetcher.kt @@ -77,4 +77,4 @@ class DataFetcher { )!! } } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt b/app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt index d083501..9e8fae8 100644 --- a/app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt +++ b/app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt @@ -74,4 +74,4 @@ class CircularLetterViewModel(application: Application) : AndroidViewModel(appli } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt b/app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt index 0d95e45..f45115d 100644 --- a/app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt +++ b/app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt @@ -35,4 +35,4 @@ class FavouritesViewModel(application: Application) : AndroidViewModel(applicati AppDatabase.getInstance(getApplication()).circularDao().searchFavourites("%$input%") } } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt b/app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt index ec1086d..c0a1b5e 100644 --- a/app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt +++ b/app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt @@ -35,4 +35,4 @@ class RemindersViewModel(application: Application) : AndroidViewModel(applicatio AppDatabase.getInstance(getApplication()).circularDao().searchReminders("%$input%") } } -} \ No newline at end of file +} 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 b73bb5b..7386339 100644 --- a/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt +++ b/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt @@ -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) } } - }