fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-06-05 22:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting and unused imports

Browse Source
This commit is contained in:
Ensar Sarajčić
2023-08-04 16:39:57 +02:00
parent 04a173501d
commit c50dc814ac
16 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/com/simplemobiletools/clock/activities/SplashActivity.kt
View File

@ -13,6 +13,7 @@ class SplashActivity : BaseSplashActivity() {
startActivity(this) startActivity(this)
} }
} }
intent?.action == STOPWATCH_TOGGLE_ACTION -> { intent?.action == STOPWATCH_TOGGLE_ACTION -> {
Intent(this, MainActivity::class.java).apply { Intent(this, MainActivity::class.java).apply {
putExtra(OPEN_TAB, TAB_STOPWATCH) putExtra(OPEN_TAB, TAB_STOPWATCH)
@ -20,6 +21,7 @@ class SplashActivity : BaseSplashActivity() {
startActivity(this) startActivity(this)
} }
} }
intent.extras?.containsKey(OPEN_TAB) == true -> { intent.extras?.containsKey(OPEN_TAB) == true -> {
Intent(this, MainActivity::class.java).apply { Intent(this, MainActivity::class.java).apply {
putExtra(OPEN_TAB, intent.getIntExtra(OPEN_TAB, TAB_CLOCK)) putExtra(OPEN_TAB, intent.getIntExtra(OPEN_TAB, TAB_CLOCK))
@ -27,6 +29,7 @@ class SplashActivity : BaseSplashActivity() {
startActivity(this) startActivity(this)
} }
} }
else -> startActivity(Intent(this, MainActivity::class.java)) else -> startActivity(Intent(this, MainActivity::class.java))
} }
finish() finish()

7
app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt
View File

@ -143,8 +143,11 @@ class TimerAdapter(
val state = timer.state val state = timer.state
val resetPossible = state is TimerState.Running || state is TimerState.Paused || state is TimerState.Finished val resetPossible = state is TimerState.Running || state is TimerState.Paused || state is TimerState.Finished
timerReset.beInvisibleIf(!resetPossible) timerReset.beInvisibleIf(!resetPossible)
val drawableId = val drawableId = if (state is TimerState.Running) {
if (state is TimerState.Running) com.simplemobiletools.commons.R.drawable.ic_pause_vector else com.simplemobiletools.commons.R.drawable.ic_play_vector com.simplemobiletools.commons.R.drawable.ic_pause_vector
} else {
com.simplemobiletools.commons.R.drawable.ic_play_vector
}
timerPlayPause.setImageDrawable(simpleActivity.resources.getColoredDrawableWithColor(drawableId, textColor)) timerPlayPause.setImageDrawable(simpleActivity.resources.getColoredDrawableWithColor(drawableId, textColor))
} }
} }

6
app/src/main/kotlin/com/simplemobiletools/clock/adapters/ViewPagerAdapter.kt
View File

@ -8,11 +8,7 @@ import com.simplemobiletools.clock.fragments.AlarmFragment
import com.simplemobiletools.clock.fragments.ClockFragment import com.simplemobiletools.clock.fragments.ClockFragment
import com.simplemobiletools.clock.fragments.StopwatchFragment import com.simplemobiletools.clock.fragments.StopwatchFragment
import com.simplemobiletools.clock.fragments.TimerFragment import com.simplemobiletools.clock.fragments.TimerFragment
import com.simplemobiletools.clock.helpers.TABS_COUNT import com.simplemobiletools.clock.helpers.*
import com.simplemobiletools.clock.helpers.TAB_ALARM
import com.simplemobiletools.clock.helpers.TAB_CLOCK
import com.simplemobiletools.clock.helpers.TAB_TIMER
import com.simplemobiletools.clock.helpers.TAB_STOPWATCH
import com.simplemobiletools.commons.models.AlarmSound import com.simplemobiletools.commons.models.AlarmSound
class ViewPagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) { class ViewPagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) {

1
app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimerDialog.kt
View File

@ -3,7 +3,6 @@ package com.simplemobiletools.clock.dialogs
import android.media.AudioManager import android.media.AudioManager
import android.media.RingtoneManager import android.media.RingtoneManager
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.activities.SimpleActivity import com.simplemobiletools.clock.activities.SimpleActivity
import com.simplemobiletools.clock.databinding.DialogEditTimerBinding import com.simplemobiletools.clock.databinding.DialogEditTimerBinding
import com.simplemobiletools.clock.extensions.* import com.simplemobiletools.clock.extensions.*

6
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
View File

@ -490,7 +490,11 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No
.setDefaults(Notification.DEFAULT_LIGHTS) .setDefaults(Notification.DEFAULT_LIGHTS)
.setAutoCancel(true) .setAutoCancel(true)
.setChannelId(channelId) .setChannelId(channelId)
.addAction(com.simplemobiletools.commons.R.drawable.ic_snooze_vector, getString(com.simplemobiletools.commons.R.string.snooze), getSnoozePendingIntent(alarm)) .addAction(
com.simplemobiletools.commons.R.drawable.ic_snooze_vector,
getString(com.simplemobiletools.commons.R.string.snooze),
getSnoozePendingIntent(alarm)
)
.addAction(com.simplemobiletools.commons.R.drawable.ic_cross_vector, getString(com.simplemobiletools.commons.R.string.dismiss), dismissIntent) .addAction(com.simplemobiletools.commons.R.drawable.ic_cross_vector, getString(com.simplemobiletools.commons.R.string.dismiss), dismissIntent)
.setDeleteIntent(dismissIntent) .setDeleteIntent(dismissIntent)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)

5
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Long.kt
View File

@ -2,7 +2,8 @@ package com.simplemobiletools.clock.extensions
import android.text.format.DateFormat import android.text.format.DateFormat
import com.simplemobiletools.commons.extensions.getFormattedDuration import com.simplemobiletools.commons.extensions.getFormattedDuration
import java.util.* import java.util.Calendar
import java.util.Locale
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.math.roundToInt import kotlin.math.roundToInt
@ -21,10 +22,12 @@ fun Long.formatStopwatchTime(useLongerMSFormat: Boolean): String {
val format = "%02d:%02d:%02d.$MSFormat" val format = "%02d:%02d:%02d.$MSFormat"
String.format(format, hours, minutes, seconds, ms) String.format(format, hours, minutes, seconds, ms)
} }
minutes > 0 -> { minutes > 0 -> {
val format = "%02d:%02d.$MSFormat" val format = "%02d:%02d.$MSFormat"
String.format(format, minutes, seconds, ms) String.format(format, minutes, seconds, ms)
} }
else -> { else -> {
val format = "%d.$MSFormat" val format = "%d.$MSFormat"
String.format(format, seconds, ms) String.format(format, seconds, ms)

4
app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
View File

@ -3,7 +3,9 @@ package com.simplemobiletools.clock.helpers
import com.simplemobiletools.clock.extensions.isBitSet import com.simplemobiletools.clock.extensions.isBitSet
import com.simplemobiletools.clock.models.MyTimeZone import com.simplemobiletools.clock.models.MyTimeZone
import com.simplemobiletools.commons.extensions.addBit import com.simplemobiletools.commons.extensions.addBit
import java.util.* import java.util.Calendar
import java.util.Date
import java.util.TimeZone
import kotlin.math.pow import kotlin.math.pow
// shared preferences // shared preferences

7
app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt
View File

@ -12,7 +12,6 @@ import com.simplemobiletools.clock.models.Alarm
import com.simplemobiletools.commons.extensions.getIntValue import com.simplemobiletools.commons.extensions.getIntValue
import com.simplemobiletools.commons.extensions.getStringValue import com.simplemobiletools.commons.extensions.getStringValue
import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.helpers.*
import java.util.*
class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) { class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) {
private val ALARMS_TABLE_NAME = "contacts" // wrong table name, ignore it private val ALARMS_TABLE_NAME = "contacts" // wrong table name, ignore it
@ -41,8 +40,10 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} }
override fun onCreate(db: SQLiteDatabase) { override fun onCreate(db: SQLiteDatabase) {
db.execSQL("CREATE TABLE IF NOT EXISTS $ALARMS_TABLE_NAME ($COL_ID INTEGER PRIMARY KEY AUTOINCREMENT, $COL_TIME_IN_MINUTES INTEGER, $COL_DAYS INTEGER, " + db.execSQL(
"$COL_IS_ENABLED INTEGER, $COL_VIBRATE INTEGER, $COL_SOUND_TITLE TEXT, $COL_SOUND_URI TEXT, $COL_LABEL TEXT)") "CREATE TABLE IF NOT EXISTS $ALARMS_TABLE_NAME ($COL_ID INTEGER PRIMARY KEY AUTOINCREMENT, $COL_TIME_IN_MINUTES INTEGER, $COL_DAYS INTEGER, " +
"$COL_IS_ENABLED INTEGER, $COL_VIBRATE INTEGER, $COL_SOUND_TITLE TEXT, $COL_SOUND_URI TEXT, $COL_LABEL TEXT)"
)
insertInitialAlarms(db) insertInitialAlarms(db)
} }

2
app/src/main/kotlin/com/simplemobiletools/clock/models/Lap.kt
View File

@ -16,11 +16,13 @@ data class Lap(val id: Int, var lapTime: Long, var totalTime: Long) : Comparable
id > other.id -> 1 id > other.id -> 1
else -> -1 else -> -1
} }
sorting and SORT_BY_LAP_TIME != 0 -> when { sorting and SORT_BY_LAP_TIME != 0 -> when {
lapTime == other.lapTime -> 0 lapTime == other.lapTime -> 0
lapTime > other.lapTime -> 1 lapTime > other.lapTime -> 1
else -> -1 else -> -1
} }
else -> when { else -> when {
totalTime == other.totalTime -> 0 totalTime == other.totalTime -> 0
totalTime > other.totalTime -> 1 totalTime > other.totalTime -> 1

2
app/src/main/kotlin/com/simplemobiletools/clock/receivers/AlarmReceiver.kt
View File

@ -1,6 +1,5 @@
package com.simplemobiletools.clock.receivers package com.simplemobiletools.clock.receivers
import android.app.Notification
import android.app.NotificationChannel import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.app.PendingIntent import android.app.PendingIntent
@ -18,7 +17,6 @@ import com.simplemobiletools.clock.helpers.ALARM_ID
import com.simplemobiletools.clock.helpers.ALARM_NOTIFICATION_CHANNEL_ID import com.simplemobiletools.clock.helpers.ALARM_NOTIFICATION_CHANNEL_ID
import com.simplemobiletools.clock.helpers.ALARM_NOTIF_ID import com.simplemobiletools.clock.helpers.ALARM_NOTIF_ID
import com.simplemobiletools.clock.helpers.EARLY_ALARM_NOTIF_ID import com.simplemobiletools.clock.helpers.EARLY_ALARM_NOTIF_ID
import com.simplemobiletools.commons.extensions.canUseFullScreenIntent
import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.helpers.isOreoPlus import com.simplemobiletools.commons.helpers.isOreoPlus

2
app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideTimerReceiver.kt
View File

@ -13,6 +13,6 @@ class HideTimerReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
val timerId = intent.getIntExtra(TIMER_ID, INVALID_TIMER_ID) val timerId = intent.getIntExtra(TIMER_ID, INVALID_TIMER_ID)
context.hideTimerNotification(timerId) context.hideTimerNotification(timerId)
EventBus.getDefault().post(TimerEvent.Reset(timerId, )) EventBus.getDefault().post(TimerEvent.Reset(timerId))
} }
} }