Merge pull request #320 from ebraminio/master

Update Simple-Commons and remove useless annotations
This commit is contained in:
Tibor Kaputa 2021-12-08 14:49:26 +01:00 committed by GitHub
commit 79e3aa09fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 18 deletions

View File

@ -67,7 +67,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:307941253d' implementation 'com.github.SimpleMobileTools:Simple-Commons:eee4809d37'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2' implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
implementation 'com.shawnlin:number-picker:2.4.6' implementation 'com.shawnlin:number-picker:2.4.6'

View File

@ -77,7 +77,7 @@ class ReminderActivity : SimpleActivity() {
} }
} }
@SuppressLint("NewApi") @SuppressLint("ClickableViewAccessibility")
private fun setupAlarmButtons() { private fun setupAlarmButtons() {
reminder_stop.beGone() reminder_stop.beGone()
reminder_draggable_background.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulsing_animation)) reminder_draggable_background.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulsing_animation))

View File

@ -1,6 +1,5 @@
package com.simplemobiletools.clock.extensions package com.simplemobiletools.clock.extensions
import android.annotation.SuppressLint
import android.app.* import android.app.*
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
import android.content.ComponentName import android.content.ComponentName
@ -182,7 +181,6 @@ fun Context.updateWidgets() {
} }
} }
@SuppressLint("NewApi")
fun Context.scheduleNextWidgetUpdate() { fun Context.scheduleNextWidgetUpdate() {
val widgetsCnt = val widgetsCnt =
AppWidgetManager.getInstance(applicationContext)?.getAppWidgetIds(ComponentName(applicationContext, MyWidgetDateTimeProvider::class.java)) ?: return AppWidgetManager.getInstance(applicationContext)?.getAppWidgetIds(ComponentName(applicationContext, MyWidgetDateTimeProvider::class.java)) ?: return
@ -267,7 +265,6 @@ fun Context.showAlarmNotification(alarm: Alarm) {
} }
} }
@SuppressLint("NewApi")
fun Context.getTimerNotification(timer: Timer, pendingIntent: PendingIntent, addDeleteIntent: Boolean): Notification { fun Context.getTimerNotification(timer: Timer, pendingIntent: PendingIntent, addDeleteIntent: Boolean): Notification {
var soundUri = timer.soundUri var soundUri = timer.soundUri
if (soundUri == SILENT) { if (soundUri == SILENT) {
@ -351,7 +348,6 @@ fun Context.getHideAlarmPendingIntent(alarm: Alarm): PendingIntent {
return PendingIntent.getBroadcast(this, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT) return PendingIntent.getBroadcast(this, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
} }
@SuppressLint("NewApi")
fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): Notification { fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): Notification {
val soundUri = alarm.soundUri val soundUri = alarm.soundUri
if (soundUri != SILENT) { if (soundUri != SILENT) {

View File

@ -1,6 +1,5 @@
package com.simplemobiletools.clock.receivers package com.simplemobiletools.clock.receivers
import android.annotation.SuppressLint
import android.app.NotificationChannel import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.app.PendingIntent import android.app.PendingIntent
@ -21,7 +20,6 @@ import com.simplemobiletools.commons.helpers.isOreoPlus
class AlarmReceiver : BroadcastReceiver() { class AlarmReceiver : BroadcastReceiver() {
@SuppressLint("NewApi")
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
val id = intent.getIntExtra(ALARM_ID, -1) val id = intent.getIntExtra(ALARM_ID, -1)
val alarm = context.dbHelper.getAlarmWithId(id) ?: return val alarm = context.dbHelper.getAlarmWithId(id) ?: return

View File

@ -1,16 +1,14 @@
package com.simplemobiletools.clock.services package com.simplemobiletools.clock.services
import android.annotation.TargetApi
import android.app.Notification import android.app.Notification
import android.app.NotificationChannel import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.app.Service import android.app.Service
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build
import android.os.IBinder import android.os.IBinder
import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.content.ContextCompat
import com.simplemobiletools.clock.R import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.extensions.getFormattedDuration import com.simplemobiletools.clock.extensions.getFormattedDuration
import com.simplemobiletools.clock.extensions.getOpenTimerTabIntent import com.simplemobiletools.clock.extensions.getOpenTimerTabIntent
@ -86,7 +84,6 @@ class TimerService : Service() {
bus.unregister(this) bus.unregister(this)
} }
@TargetApi(Build.VERSION_CODES.O)
private fun notification(title: String, contentText: String, firstRunningTimerId: Int): Notification { private fun notification(title: String, contentText: String, firstRunningTimerId: Int): Notification {
val channelId = "simple_alarm_timer" val channelId = "simple_alarm_timer"
val label = getString(R.string.timer) val label = getString(R.string.timer)
@ -118,13 +115,8 @@ class TimerService : Service() {
} }
} }
@RequiresApi(Build.VERSION_CODES.O)
fun startTimerService(context: Context) { fun startTimerService(context: Context) {
if (isOreoPlus()) { ContextCompat.startForegroundService(context, Intent(context, TimerService::class.java))
context.startForegroundService(Intent(context, TimerService::class.java))
} else {
context.startService(Intent(context, TimerService::class.java))
}
} }
object TimerStopService object TimerStopService