diff --git a/README.md b/README.md index e5fd160e..748c9021 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,42 @@ -# Simple Clock -Logo +# Fossify Clock +Logo -This clock app has multiple functions related to timing. It can be used as a clock widget or as a alarm clock. It is made to help you regulate your daily life and sleep better. You can also use the stopwatch in this app to count your time when you are running for healthy lifestyle or for any other purpose. This app can also be placed on your home screen for easy navigation. +Introducing Fossify Clock – the ultimate timekeeping companion designed to enhance your daily routines and promote better sleep habits. With a multitude of functions tailored to your needs, Fossify Clock seamlessly integrates into your life, offering unparalleled convenience and versatility. -As a clock widget you can enable displaying times from other time zones, or use the simple, but customizable and resizable clock widget. The text color of the clock widget can be customized, as well as the color and the alpha of the background. You can also change the shape of clock widget according to your choice and show it on the home screen. +**⌚ MULTIFUNCTIONAL TIMEKEEPING:** +Experience the power of versatile time management with Fossify Clock. From serving as a clock widget to functioning as an alarm clock and stopwatch, this app is your go-to tool for regulating your daily activities and improving your overall lifestyle. -The alarm contains all the expected features as day selecting, vibration toggling, ringtone selecting, snooze or adding a custom label. Waking up will be a pleasure. It supports as many alarms as you want, so there won't be any more excuses for not waking up and sleep better :) Gradual volume increasing is supported too, enabled by default. A customizable Snooze button is available too, just in case you really had a good reason for using it. The alarm clock provided by this app as simple as it can get. You simply have to add how many times you want and turn them on. During this, you can also take help from a guide built in this alarm clock app to help you navigate through this app to sleep better. You can sleep better so this app can wake you up on the set time without disturbing your lifestyle. This alarm can be placed on the home screen to make it easy for you to access the alarm while you can work on other things on your device. The main goal of keeping the alarm in this clock widget is to help you schedule your time more effectively. +**⏰ FEATURE-RICH ALARM:** +Wake up refreshed with Fossify Clock's comprehensive alarm features. Set multiple alarms with options like day selection, vibration toggle, custom labels and ringtone customization. Enjoy gradual volume increase and a customizable snooze button for a pleasant waking experience. With a user-friendly interface, setting up alarms has never been easier. -With the stopwatch you can easily measure a longer period of time, or individual laps. You can sort the laps in a few different ways. It contains optional vibrations on button presses too, just to let you know that the button was pressed in case you cannot look at the device for some reason, or you are in a hurry. This stopwatch can help you getting in shape if you are doing yoga or having a run in the park. You can put the stopwatch on home screen so that you can easily access it and alter it according to your needs without opening the menu and finding it. +**⏱️ CONVENIENT STOPWATCH:** +Track your activities with precision using Fossify Clock's stopwatch function. Measure longer periods or individual laps effortlessly. You can also sort your laps in ascending or descending order. -You can easily setup a timer to be notified of some events. You can both change its ringtone, or toggle vibrations. You will never burn that pizza again. The timer countdown can be paused too, not just stopped. +**⏳ PRECISE TIMER FUNCTIONALITY:** +Stay on top of your tasks with Fossify Clock's versatile timer feature. Customize ringtone preferences, toggle vibrations, and pause countdowns to suit your needs. Whether you're timing cooking intervals, managing study sessions, or ensuring timely breaks, Fossify Clock has you covered with precision and ease. -Additional features include for example preventing the device from falling asleep while the app is in foreground or toggling between 12 or 24 hour time format. Last but not least you can decide if the week should start on Sunday, or Monday. +**🌈 CLOCK WIDGET WITH CUSTOMIZABLE FEATURES:** +Transform your home screen with Fossify Clock's customizable clock widget. Adjust text color, background color, and transparency. Choose between analog or digital clock to suit your style and easily access essential time information at a glance. -It comes with material design and dark theme by default, provides great user experience for easy usage. The lack of internet access gives you more privacy, security and stability than other apps. The dark theme in this clock widget can help you setting your alarm clock at night without blinding your eyes with sharp color of your mobile alarm. +**🎨 CUSTOMIZABLE INTERFACE AND THEMES:** +Enjoy a personalized experience with Fossify Clock's material design and dark theme options. Tailor the app to your preferences with customizable colors and themes, enhancing usability and reducing eye strain, especially in low-light environments. -It comes with material design and dark theme by default, provides great user experience for easy usage. The lack of internet access gives you more privacy, security and stability than other apps. +**🔒 PRIVACY-FIRST APPROACH:** +Rest assured knowing your privacy is protected with Fossify Clock's offline operation. Experience maximum privacy, security, and stability without sacrificing functionality or convenience. -Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors. +**🌐 AD-FREE & OPEN-SOURCE:** +Say goodbye to intrusive ads and unnecessary permissions. Fossify Clock is ad-free, fully open-source, and grants you complete control over your timekeeping experience. -Check out the full suite of apps here: -https://github.com/FossifyOrg +Upgrade your time management skills, optimize your routines, and prioritize better sleep with Fossify Clock. Download now and take control of your time like never before. -
-App image -App image -App image +➡️ Explore more Fossify apps: https://www.fossify.org
+➡️ Open-Source Code: https://www.github.com/FossifyOrg
+➡️ Join the community on Reddit: https://www.reddit.com/r/Fossify
+➡️ Connect on Telegram: https://t.me/Fossify + +
+App image +App image +App image
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 60b21102..f0bcf6df 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.konan.properties.Properties import java.io.FileInputStream @@ -6,7 +7,6 @@ plugins { alias(libs.plugins.android) alias(libs.plugins.kotlinAndroid) alias(libs.plugins.ksp) - base } val keystorePropertiesFile: File = rootProject.file("keystore.properties") @@ -15,10 +15,6 @@ if (keystorePropertiesFile.exists()) { keystoreProperties.load(FileInputStream(keystorePropertiesFile)) } -base { - archivesName.set("clock") -} - android { compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt() @@ -28,6 +24,7 @@ android { targetSdk = project.libs.versions.app.build.targetSDK.get().toInt() versionName = project.libs.versions.app.version.versionName.get() versionCode = project.libs.versions.app.version.versionCode.get().toInt() + archivesName.set("clock-$versionCode") ksp { arg("room.schemaLocation", "$projectDir/schemas") } @@ -68,7 +65,7 @@ android { flavorDimensions.add("variants") productFlavors { register("core") - register("fdroid") + register("foss") register("prepaid") } @@ -77,11 +74,15 @@ android { } compileOptions { - val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get().toString()) + val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get()) sourceCompatibility = currentJavaVersionFromLibs targetCompatibility = currentJavaVersionFromLibs } + dependenciesInfo { + includeInApk = false + } + tasks.withType { kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get() } @@ -95,7 +96,7 @@ android { } dependencies { - implementation(libs.simple.tools.commons) + implementation(libs.fossify.commons) implementation(libs.bundles.lifecycle) implementation(libs.androidx.constraintlayout) diff --git a/app/schemas/com.simplemobiletools.clock.databases.AppDatabase/1.json b/app/schemas/com.simplemobiletools.clock.databases.AppDatabase/1.json deleted file mode 100644 index f3d9358a..00000000 --- a/app/schemas/com.simplemobiletools.clock.databases.AppDatabase/1.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "d1a9a1d39e0899af980c9ddc7632dd8f", - "entities": [ - { - "tableName": "timers", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `seconds` INTEGER NOT NULL, `state` TEXT NOT NULL, `vibrate` INTEGER NOT NULL, `soundUri` TEXT NOT NULL, `soundTitle` TEXT NOT NULL, `label` TEXT NOT NULL, `createdAt` INTEGER NOT NULL, `channelId` TEXT)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "seconds", - "columnName": "seconds", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "state", - "columnName": "state", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "vibrate", - "columnName": "vibrate", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "soundUri", - "columnName": "soundUri", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "soundTitle", - "columnName": "soundTitle", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "label", - "columnName": "label", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "createdAt", - "columnName": "createdAt", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "channelId", - "columnName": "channelId", - "affinity": "TEXT", - "notNull": false - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd1a9a1d39e0899af980c9ddc7632dd8f')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/com.simplemobiletools.clock.databases.AppDatabase/2.json b/app/schemas/org.fossify.clock.databases.AppDatabase/2.json similarity index 100% rename from app/schemas/com.simplemobiletools.clock.databases.AppDatabase/2.json rename to app/schemas/org.fossify.clock.databases.AppDatabase/2.json diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml index 3e532939..b57e3024 100644 --- a/app/src/debug/res/values/strings.xml +++ b/app/src/debug/res/values/strings.xml @@ -1,4 +1,4 @@ - Clock_debug + Clock_debug diff --git a/app/src/fdroid/res/values/bools.xml b/app/src/foss/res/values/bools.xml similarity index 100% rename from app/src/fdroid/res/values/bools.xml rename to app/src/foss/res/values/bools.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 42426730..905e3c79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,7 +41,7 @@ android:theme="@style/SplashTheme"> - + @@ -102,14 +102,14 @@ @@ -418,10 +418,10 @@ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 00000000..cb50e565 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/services/SnoozeService.kt b/app/src/main/kotlin/com/simplemobiletools/clock/services/SnoozeService.kt deleted file mode 100644 index 051872e0..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/clock/services/SnoozeService.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.simplemobiletools.clock.services - -import android.app.IntentService -import android.content.Intent -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.extensions.dbHelper -import com.simplemobiletools.clock.extensions.hideNotification -import com.simplemobiletools.clock.extensions.setupAlarmClock -import com.simplemobiletools.clock.helpers.ALARM_ID -import com.simplemobiletools.commons.helpers.MINUTE_SECONDS - -class SnoozeService : IntentService("Snooze") { - override fun onHandleIntent(intent: Intent?) { - val id = intent!!.getIntExtra(ALARM_ID, -1) - val alarm = dbHelper.getAlarmWithId(id) ?: return - hideNotification(id) - setupAlarmClock(alarm, config.snoozeTime * MINUTE_SECONDS) - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/App.kt b/app/src/main/kotlin/org/fossify/clock/App.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/clock/App.kt rename to app/src/main/kotlin/org/fossify/clock/App.kt index 709be876..a572a25b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/App.kt +++ b/app/src/main/kotlin/org/fossify/clock/App.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock +package org.fossify.clock import android.app.Application import android.app.NotificationManager @@ -11,17 +11,17 @@ import androidx.lifecycle.LifecycleObserver import androidx.lifecycle.OnLifecycleEvent import androidx.lifecycle.ProcessLifecycleOwner import com.facebook.stetho.Stetho -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.Stopwatch -import com.simplemobiletools.clock.helpers.Stopwatch.State -import com.simplemobiletools.clock.models.TimerEvent -import com.simplemobiletools.clock.models.TimerState -import com.simplemobiletools.clock.services.StopwatchStopService -import com.simplemobiletools.clock.services.TimerStopService -import com.simplemobiletools.clock.services.startStopwatchService -import com.simplemobiletools.clock.services.startTimerService -import com.simplemobiletools.commons.extensions.checkUseEnglish -import com.simplemobiletools.commons.extensions.showErrorToast +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.Stopwatch +import org.fossify.clock.helpers.Stopwatch.State +import org.fossify.clock.models.TimerEvent +import org.fossify.clock.models.TimerState +import org.fossify.clock.services.StopwatchStopService +import org.fossify.clock.services.TimerStopService +import org.fossify.clock.services.startStopwatchService +import org.fossify.clock.services.startTimerService +import org.fossify.commons.extensions.checkUseEnglish +import org.fossify.commons.extensions.showErrorToast import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/IntentHandlerActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/IntentHandlerActivity.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/IntentHandlerActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/IntentHandlerActivity.kt index 5b6e375a..b8bbb8a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/IntentHandlerActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/IntentHandlerActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities import android.annotation.SuppressLint import android.app.AlarmManager @@ -8,20 +8,20 @@ import android.media.RingtoneManager import android.net.Uri import android.os.Bundle import android.provider.AlarmClock -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.dialogs.EditAlarmDialog -import com.simplemobiletools.clock.dialogs.EditTimerDialog -import com.simplemobiletools.clock.dialogs.SelectAlarmDialog -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.* -import com.simplemobiletools.clock.models.* -import com.simplemobiletools.commons.dialogs.PermissionRequiredDialog -import com.simplemobiletools.commons.extensions.getDefaultAlarmSound -import com.simplemobiletools.commons.extensions.getFilenameFromUri -import com.simplemobiletools.commons.extensions.openNotificationSettings -import com.simplemobiletools.commons.helpers.SILENT -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.AlarmSound +import org.fossify.clock.R +import org.fossify.clock.dialogs.EditAlarmDialog +import org.fossify.clock.dialogs.EditTimerDialog +import org.fossify.clock.dialogs.SelectAlarmDialog +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.* +import org.fossify.clock.models.* +import org.fossify.commons.dialogs.PermissionRequiredDialog +import org.fossify.commons.extensions.getDefaultAlarmSound +import org.fossify.commons.extensions.getFilenameFromUri +import org.fossify.commons.extensions.openNotificationSettings +import org.fossify.commons.helpers.SILENT +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.AlarmSound import org.greenrobot.eventbus.EventBus import java.util.concurrent.TimeUnit @@ -78,13 +78,13 @@ class IntentHandlerActivity : SimpleActivity() { } val soundToUse = ringtone?.let { if (it == AlarmClock.VALUE_RINGTONE_SILENT) { - AlarmSound(0, getString(com.simplemobiletools.commons.R.string.no_sound), SILENT) + AlarmSound(0, getString(org.fossify.commons.R.string.no_sound), SILENT) } else { try { val uri = Uri.parse(it) var filename = getFilenameFromUri(uri) if (filename.isEmpty()) { - filename = getString(com.simplemobiletools.commons.R.string.alarm) + filename = getString(org.fossify.commons.R.string.alarm) } AlarmSound(0, filename, it) } catch (e: Exception) { @@ -188,7 +188,8 @@ class IntentHandlerActivity : SimpleActivity() { // We don't want to accidentally edit existing timer, so allow reuse only when skipping UI if (existingTimer != null && skipUi - && (existingTimer.state is TimerState.Idle || (existingTimer.state is TimerState.Finished && !existingTimer.oneShot))) { + && (existingTimer.state is TimerState.Idle || (existingTimer.state is TimerState.Finished && !existingTimer.oneShot)) + ) { startTimer(existingTimer) } else { createAndStartNewTimer() @@ -358,7 +359,7 @@ class IntentHandlerActivity : SimpleActivity() { } else { PermissionRequiredDialog( this, - com.simplemobiletools.commons.R.string.allow_notifications_reminders, + org.fossify.commons.R.string.allow_notifications_reminders, positiveActionCallback = { openNotificationSettings() timerHelper.insertOrUpdateTimer(newTimer) { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt index 312ff993..6f33aa8d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities import android.annotation.SuppressLint import android.content.Intent @@ -8,17 +8,20 @@ import android.graphics.drawable.Icon import android.graphics.drawable.LayerDrawable import android.os.Bundle import android.view.WindowManager -import com.simplemobiletools.clock.BuildConfig -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.adapters.ViewPagerAdapter -import com.simplemobiletools.clock.databinding.ActivityMainBinding -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.* -import com.simplemobiletools.commons.databinding.BottomTablayoutItemBinding -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.FAQItem import me.grantland.widget.AutofitHelper +import org.fossify.clock.BuildConfig +import org.fossify.clock.R +import org.fossify.clock.adapters.ViewPagerAdapter +import org.fossify.clock.databinding.ActivityMainBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.extensions.getEnabledAlarms +import org.fossify.clock.extensions.rescheduleEnabledAlarms +import org.fossify.clock.extensions.updateWidgets +import org.fossify.clock.helpers.* +import org.fossify.commons.databinding.BottomTablayoutItemBinding +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.FAQItem class MainActivity : SimpleActivity() { private var storedTextColor = 0 @@ -139,7 +142,7 @@ class MainActivity : SimpleActivity() { private fun refreshMenuItems() { binding.mainToolbar.menu.apply { findItem(R.id.sort).isVisible = binding.viewPager.currentItem == TAB_ALARM - findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations) + findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations) } } @@ -214,15 +217,15 @@ class MainActivity : SimpleActivity() { private fun setupTabs() { binding.mainTabsHolder.removeAllTabs() val tabDrawables = arrayOf( - com.simplemobiletools.commons.R.drawable.ic_clock_vector, + org.fossify.commons.R.drawable.ic_clock_vector, R.drawable.ic_alarm_vector, R.drawable.ic_stopwatch_vector, R.drawable.ic_hourglass_vector ) - val tabLabels = arrayOf(R.string.clock, com.simplemobiletools.commons.R.string.alarm, R.string.stopwatch, R.string.timer) + val tabLabels = arrayOf(R.string.clock, org.fossify.commons.R.string.alarm, R.string.stopwatch, R.string.timer) tabDrawables.forEachIndexed { i, drawableId -> - binding.mainTabsHolder.newTab().setCustomView(com.simplemobiletools.commons.R.layout.bottom_tablayout_item).apply tab@{ + binding.mainTabsHolder.newTab().setCustomView(org.fossify.commons.R.layout.bottom_tablayout_item).apply tab@{ customView?.let { BottomTablayoutItemBinding.bind(it) }?.apply { tabItemIcon.setImageDrawable(getDrawable(drawableId)) tabItemLabel.setText(tabLabels[i]) @@ -261,14 +264,14 @@ class MainActivity : SimpleActivity() { private fun getInactiveTabIndexes(activeIndex: Int) = arrayListOf(0, 1, 2, 3).filter { it != activeIndex } private fun getSelectedTabDrawableIds() = arrayOf( - com.simplemobiletools.commons.R.drawable.ic_clock_filled_vector, + org.fossify.commons.R.drawable.ic_clock_filled_vector, R.drawable.ic_alarm_filled_vector, R.drawable.ic_stopwatch_filled_vector, R.drawable.ic_hourglass_filled_vector ) private fun getDeselectedTabDrawableIds() = arrayOf( - com.simplemobiletools.commons.R.drawable.ic_clock_vector, + org.fossify.commons.R.drawable.ic_clock_vector, R.drawable.ic_alarm_vector, R.drawable.ic_stopwatch_vector, R.drawable.ic_hourglass_vector @@ -283,14 +286,14 @@ class MainActivity : SimpleActivity() { val faqItems = arrayListOf( FAQItem(R.string.faq_1_title, R.string.faq_1_text), - FAQItem(com.simplemobiletools.commons.R.string.faq_1_title_commons, com.simplemobiletools.commons.R.string.faq_1_text_commons), - FAQItem(com.simplemobiletools.commons.R.string.faq_4_title_commons, com.simplemobiletools.commons.R.string.faq_4_text_commons), - FAQItem(com.simplemobiletools.commons.R.string.faq_9_title_commons, com.simplemobiletools.commons.R.string.faq_9_text_commons) + FAQItem(org.fossify.commons.R.string.faq_1_title_commons, org.fossify.commons.R.string.faq_1_text_commons), + FAQItem(org.fossify.commons.R.string.faq_4_title_commons, org.fossify.commons.R.string.faq_4_text_commons), + FAQItem(org.fossify.commons.R.string.faq_9_title_commons, org.fossify.commons.R.string.faq_9_text_commons) ) - if (!resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)) { - faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_2_title_commons, com.simplemobiletools.commons.R.string.faq_2_text_commons)) - faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_6_title_commons, com.simplemobiletools.commons.R.string.faq_6_text_commons)) + if (!resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)) { + faqItems.add(FAQItem(org.fossify.commons.R.string.faq_2_title_commons, org.fossify.commons.R.string.faq_2_text_commons)) + faqItems.add(FAQItem(org.fossify.commons.R.string.faq_6_title_commons, org.fossify.commons.R.string.faq_6_text_commons)) } startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/ReminderActivity.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/ReminderActivity.kt index 578f3d36..b1f01ee7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/ReminderActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities import android.annotation.SuppressLint import android.content.Context @@ -11,15 +11,18 @@ import android.provider.AlarmClock import android.view.MotionEvent import android.view.WindowManager import android.view.animation.AnimationUtils -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.databinding.ActivityReminderBinding -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.ALARM_ID -import com.simplemobiletools.clock.helpers.ALARM_NOTIF_ID -import com.simplemobiletools.clock.helpers.getPassedSeconds -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* +import org.fossify.clock.R +import org.fossify.clock.databinding.ActivityReminderBinding +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.ALARM_ID +import org.fossify.clock.helpers.ALARM_NOTIF_ID +import org.fossify.clock.helpers.getPassedSeconds +import org.fossify.clock.models.Alarm +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.MINUTE_SECONDS +import org.fossify.commons.helpers.SILENT +import org.fossify.commons.helpers.isOreoMr1Plus +import org.fossify.commons.helpers.isOreoPlus class ReminderActivity : SimpleActivity() { companion object { @@ -59,7 +62,7 @@ class ReminderActivity : SimpleActivity() { val label = if (isAlarmReminder) { if (alarm!!.label.isEmpty()) { - getString(com.simplemobiletools.commons.R.string.alarm) + getString(org.fossify.commons.R.string.alarm) } else { alarm!!.label } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt index 93f0a0c0..79413d6b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities import android.content.Intent import android.os.Bundle -import com.simplemobiletools.clock.databinding.ActivitySettingsBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.helpers.DEFAULT_MAX_ALARM_REMINDER_SECS -import com.simplemobiletools.clock.helpers.DEFAULT_MAX_TIMER_REMINDER_SECS -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS -import com.simplemobiletools.commons.helpers.MINUTE_SECONDS -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.commons.helpers.isTiramisuPlus +import org.fossify.clock.databinding.ActivitySettingsBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.helpers.DEFAULT_MAX_ALARM_REMINDER_SECS +import org.fossify.clock.helpers.DEFAULT_MAX_TIMER_REMINDER_SECS +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS +import org.fossify.commons.helpers.MINUTE_SECONDS +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.isTiramisuPlus import java.util.Locale import kotlin.system.exitProcess diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/SimpleActivity.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/SimpleActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/SimpleActivity.kt index d39f35c5..5d46cb04 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/SimpleActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities -import com.simplemobiletools.clock.R -import com.simplemobiletools.commons.activities.BaseSimpleActivity +import org.fossify.clock.R +import org.fossify.commons.activities.BaseSimpleActivity open class SimpleActivity : BaseSimpleActivity() { override fun getAppIconIDs() = arrayListOf( @@ -14,12 +14,12 @@ open class SimpleActivity : BaseSimpleActivity() { R.mipmap.ic_launcher_light_blue, R.mipmap.ic_launcher_cyan, R.mipmap.ic_launcher_teal, - R.mipmap.ic_launcher_green, + R.mipmap.ic_launcher, R.mipmap.ic_launcher_light_green, R.mipmap.ic_launcher_lime, R.mipmap.ic_launcher_yellow, R.mipmap.ic_launcher_amber, - R.mipmap.ic_launcher, + R.mipmap.ic_launcher_orange, R.mipmap.ic_launcher_deep_orange, R.mipmap.ic_launcher_brown, R.mipmap.ic_launcher_blue_grey, diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SnoozeReminderActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/SnoozeReminderActivity.kt similarity index 62% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/SnoozeReminderActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/SnoozeReminderActivity.kt index a13be8be..17f40d60 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SnoozeReminderActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/SnoozeReminderActivity.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.extensions.dbHelper -import com.simplemobiletools.clock.extensions.hideNotification -import com.simplemobiletools.clock.extensions.setupAlarmClock -import com.simplemobiletools.clock.helpers.ALARM_ID -import com.simplemobiletools.commons.extensions.showPickSecondsDialog -import com.simplemobiletools.commons.helpers.MINUTE_SECONDS +import org.fossify.clock.extensions.config +import org.fossify.clock.extensions.dbHelper +import org.fossify.clock.extensions.hideNotification +import org.fossify.clock.extensions.setupAlarmClock +import org.fossify.clock.helpers.ALARM_ID +import org.fossify.commons.extensions.showPickSecondsDialog +import org.fossify.commons.helpers.MINUTE_SECONDS class SnoozeReminderActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SplashActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/SplashActivity.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/SplashActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/SplashActivity.kt index ef91431a..09082edf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SplashActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/SplashActivity.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities import android.content.Intent -import com.simplemobiletools.clock.helpers.* -import com.simplemobiletools.commons.activities.BaseSplashActivity +import org.fossify.clock.helpers.* +import org.fossify.commons.activities.BaseSplashActivity class SplashActivity : BaseSplashActivity() { override fun initActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt index 381aa0ed..eea684f3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities import android.app.Activity import android.appwidget.AppWidgetManager @@ -7,13 +7,13 @@ import android.content.res.ColorStateList import android.graphics.Color import android.os.Bundle import android.widget.SeekBar -import com.simplemobiletools.clock.databinding.WidgetConfigAnalogueBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.helpers.MyAnalogueTimeWidgetProvider -import com.simplemobiletools.commons.dialogs.ColorPickerDialog -import com.simplemobiletools.commons.dialogs.FeatureLockedDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS +import org.fossify.clock.databinding.WidgetConfigAnalogueBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.helpers.MyAnalogueTimeWidgetProvider +import org.fossify.commons.dialogs.ColorPickerDialog +import org.fossify.commons.dialogs.FeatureLockedDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS class WidgetAnalogueConfigureActivity : SimpleActivity() { private var mBgAlpha = 0f @@ -62,8 +62,8 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() { private fun initVariables() { mBgColor = config.widgetBgColor - if (mBgColor == resources.getColor(com.simplemobiletools.commons.R.color.default_widget_bg_color) && config.isUsingSystemTheme) { - mBgColor = resources.getColor(com.simplemobiletools.commons.R.color.you_primary_color, theme) + if (mBgColor == resources.getColor(org.fossify.commons.R.color.default_widget_bg_color) && config.isUsingSystemTheme) { + mBgColor = resources.getColor(org.fossify.commons.R.color.you_primary_color, theme) } mBgAlpha = Color.alpha(mBgColor) / 255.toFloat() diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt rename to app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt index d8d3a7c5..22036a12 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.activities +package org.fossify.clock.activities import android.app.Activity import android.appwidget.AppWidgetManager @@ -8,14 +8,14 @@ import android.graphics.Color import android.os.Build import android.os.Bundle import android.widget.SeekBar -import com.simplemobiletools.clock.databinding.WidgetConfigDigitalBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.helpers.MyDigitalTimeWidgetProvider -import com.simplemobiletools.clock.helpers.SIMPLE_PHONE -import com.simplemobiletools.commons.dialogs.ColorPickerDialog -import com.simplemobiletools.commons.dialogs.FeatureLockedDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS +import org.fossify.clock.databinding.WidgetConfigDigitalBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.helpers.MyDigitalTimeWidgetProvider +import org.fossify.clock.helpers.SIMPLE_PHONE +import org.fossify.commons.dialogs.ColorPickerDialog +import org.fossify.commons.dialogs.FeatureLockedDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS class WidgetDigitalConfigureActivity : SimpleActivity() { private var mBgAlpha = 0f @@ -79,8 +79,8 @@ class WidgetDigitalConfigureActivity : SimpleActivity() { updateBackgroundColor() mTextColor = config.widgetTextColor - if (mTextColor == resources.getColor(com.simplemobiletools.commons.R.color.default_widget_text_color) && config.isUsingSystemTheme) { - mTextColor = resources.getColor(com.simplemobiletools.commons.R.color.you_primary_color, theme) + if (mTextColor == resources.getColor(org.fossify.commons.R.color.default_widget_text_color) && config.isUsingSystemTheme) { + mTextColor = resources.getColor(org.fossify.commons.R.color.you_primary_color, theme) } updateTextColor() diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/AlarmsAdapter.kt b/app/src/main/kotlin/org/fossify/clock/adapters/AlarmsAdapter.kt similarity index 73% rename from app/src/main/kotlin/com/simplemobiletools/clock/adapters/AlarmsAdapter.kt rename to app/src/main/kotlin/org/fossify/clock/adapters/AlarmsAdapter.kt index 3be92003..49d85ae7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/AlarmsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/clock/adapters/AlarmsAdapter.kt @@ -1,28 +1,26 @@ -package com.simplemobiletools.clock.adapters +package org.fossify.clock.adapters import android.view.Menu import android.view.View import android.view.ViewGroup -import android.widget.RelativeLayout -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.ItemAlarmBinding -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.TODAY_BIT -import com.simplemobiletools.clock.helpers.TOMORROW_BIT -import com.simplemobiletools.clock.helpers.getCurrentDayMinutes -import com.simplemobiletools.clock.interfaces.ToggleAlarmInterface -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.isVisible -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.views.MyRecyclerView +import org.fossify.clock.R +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.ItemAlarmBinding +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.TODAY_BIT +import org.fossify.clock.helpers.TOMORROW_BIT +import org.fossify.clock.helpers.getCurrentDayMinutes +import org.fossify.clock.interfaces.ToggleAlarmInterface +import org.fossify.clock.models.Alarm +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.toast +import org.fossify.commons.views.MyRecyclerView class AlarmsAdapter( activity: SimpleActivity, var alarms: ArrayList, val toggleAlarmInterface: ToggleAlarmInterface, - recyclerView: MyRecyclerView, itemClick: (Any) -> Unit + recyclerView: MyRecyclerView, itemClick: (Any) -> Unit, ) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { init { @@ -92,7 +90,7 @@ class AlarmsAdapter( private fun setupView(view: View, alarm: Alarm) { val isSelected = selectedKeys.contains(alarm.id) ItemAlarmBinding.bind(view).apply { - alarmFrame.isSelected = isSelected + alarmHolder.isSelected = isSelected alarmTime.text = activity.getFormattedTime(alarm.timeInMinutes * 60, false, true) alarmTime.setTextColor(textColor) @@ -112,8 +110,8 @@ class AlarmsAdapter( } else { ConfirmationDialog( activity, - messageId = com.simplemobiletools.commons.R.string.alarm_warning, - positive = com.simplemobiletools.commons.R.string.ok, + messageId = org.fossify.commons.R.string.alarm_warning, + positive = org.fossify.commons.R.string.ok, negative = 0 ) { activity.config.wasAlarmWarningShown = true @@ -123,7 +121,7 @@ class AlarmsAdapter( } else if (alarm.days == TODAY_BIT) { if (alarm.timeInMinutes <= getCurrentDayMinutes()) { alarm.days = TOMORROW_BIT - alarmDays.text = resources.getString(com.simplemobiletools.commons.R.string.tomorrow) + alarmDays.text = resources.getString(org.fossify.commons.R.string.tomorrow) } activity.dbHelper.updateAlarm(alarm) root.context.scheduleNextAlarm(alarm, true) @@ -137,9 +135,6 @@ class AlarmsAdapter( toggleAlarmInterface.alarmToggled(alarm.id, alarmSwitch.isChecked) } } - - val layoutParams = alarmSwitch.layoutParams as RelativeLayout.LayoutParams - layoutParams.addRule(RelativeLayout.ALIGN_BOTTOM, if (alarmLabel.isVisible()) alarmLabel.id else alarmLabel.id) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/SelectTimeZonesAdapter.kt b/app/src/main/kotlin/org/fossify/clock/adapters/SelectTimeZonesAdapter.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/clock/adapters/SelectTimeZonesAdapter.kt rename to app/src/main/kotlin/org/fossify/clock/adapters/SelectTimeZonesAdapter.kt index f4b5520f..c55ad928 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/SelectTimeZonesAdapter.kt +++ b/app/src/main/kotlin/org/fossify/clock/adapters/SelectTimeZonesAdapter.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.clock.adapters +package org.fossify.clock.adapters import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.ItemAddTimeZoneBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.models.MyTimeZone -import com.simplemobiletools.commons.extensions.getProperBackgroundColor -import com.simplemobiletools.commons.extensions.getProperPrimaryColor -import com.simplemobiletools.commons.extensions.getProperTextColor +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.ItemAddTimeZoneBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.models.MyTimeZone +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.getProperPrimaryColor +import org.fossify.commons.extensions.getProperTextColor class SelectTimeZonesAdapter(val activity: SimpleActivity, val timeZones: ArrayList) : RecyclerView.Adapter() { private val config = activity.config diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/StopwatchAdapter.kt b/app/src/main/kotlin/org/fossify/clock/adapters/StopwatchAdapter.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/clock/adapters/StopwatchAdapter.kt rename to app/src/main/kotlin/org/fossify/clock/adapters/StopwatchAdapter.kt index a478a296..7624ab94 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/StopwatchAdapter.kt +++ b/app/src/main/kotlin/org/fossify/clock/adapters/StopwatchAdapter.kt @@ -1,18 +1,18 @@ -package com.simplemobiletools.clock.adapters +package org.fossify.clock.adapters import android.view.Menu import android.view.View import android.view.ViewGroup import android.widget.TextView -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.ItemLapBinding -import com.simplemobiletools.clock.extensions.formatStopwatchTime -import com.simplemobiletools.clock.helpers.SORT_BY_LAP -import com.simplemobiletools.clock.helpers.SORT_BY_LAP_TIME -import com.simplemobiletools.clock.helpers.SORT_BY_TOTAL_TIME -import com.simplemobiletools.clock.models.Lap -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.views.MyRecyclerView +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.ItemLapBinding +import org.fossify.clock.extensions.formatStopwatchTime +import org.fossify.clock.helpers.SORT_BY_LAP +import org.fossify.clock.helpers.SORT_BY_LAP_TIME +import org.fossify.clock.helpers.SORT_BY_TOTAL_TIME +import org.fossify.clock.models.Lap +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.views.MyRecyclerView class StopwatchAdapter(activity: SimpleActivity, var laps: ArrayList, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimeZonesAdapter.kt b/app/src/main/kotlin/org/fossify/clock/adapters/TimeZonesAdapter.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimeZonesAdapter.kt rename to app/src/main/kotlin/org/fossify/clock/adapters/TimeZonesAdapter.kt index e9b9da82..94f2abfd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimeZonesAdapter.kt +++ b/app/src/main/kotlin/org/fossify/clock/adapters/TimeZonesAdapter.kt @@ -1,19 +1,19 @@ -package com.simplemobiletools.clock.adapters +package org.fossify.clock.adapters import android.view.Menu import android.view.View import android.view.ViewGroup -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.ItemTimeZoneBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.extensions.getFormattedDate -import com.simplemobiletools.clock.extensions.getFormattedTime -import com.simplemobiletools.clock.models.MyTimeZone -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.beGone -import com.simplemobiletools.commons.extensions.beVisible -import com.simplemobiletools.commons.views.MyRecyclerView +import org.fossify.clock.R +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.ItemTimeZoneBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.extensions.getFormattedDate +import org.fossify.clock.extensions.getFormattedTime +import org.fossify.clock.models.MyTimeZone +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.extensions.beGone +import org.fossify.commons.extensions.beVisible +import org.fossify.commons.views.MyRecyclerView import java.util.Calendar import java.util.Date import java.util.TimeZone diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt b/app/src/main/kotlin/org/fossify/clock/adapters/TimerAdapter.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt rename to app/src/main/kotlin/org/fossify/clock/adapters/TimerAdapter.kt index d5bbe9ab..3c76a798 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt +++ b/app/src/main/kotlin/org/fossify/clock/adapters/TimerAdapter.kt @@ -1,23 +1,23 @@ -package com.simplemobiletools.clock.adapters +package org.fossify.clock.adapters import android.view.Menu import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.ItemTimerBinding -import com.simplemobiletools.clock.extensions.getFormattedDuration -import com.simplemobiletools.clock.extensions.hideTimerNotification -import com.simplemobiletools.clock.extensions.secondsToMillis -import com.simplemobiletools.clock.models.Timer -import com.simplemobiletools.clock.models.TimerEvent -import com.simplemobiletools.clock.models.TimerState -import com.simplemobiletools.commons.adapters.MyRecyclerViewListAdapter -import com.simplemobiletools.commons.dialogs.PermissionRequiredDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.views.MyRecyclerView import me.grantland.widget.AutofitHelper +import org.fossify.clock.R +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.ItemTimerBinding +import org.fossify.clock.extensions.getFormattedDuration +import org.fossify.clock.extensions.hideTimerNotification +import org.fossify.clock.extensions.secondsToMillis +import org.fossify.clock.models.Timer +import org.fossify.clock.models.TimerEvent +import org.fossify.clock.models.TimerState +import org.fossify.commons.adapters.MyRecyclerViewListAdapter +import org.fossify.commons.dialogs.PermissionRequiredDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.views.MyRecyclerView import org.greenrobot.eventbus.EventBus class TimerAdapter( @@ -134,7 +134,7 @@ class TimerAdapter( } else { PermissionRequiredDialog( activity, - com.simplemobiletools.commons.R.string.allow_notifications_reminders, + org.fossify.commons.R.string.allow_notifications_reminders, { activity.openNotificationSettings() }) } } @@ -144,9 +144,9 @@ class TimerAdapter( val resetPossible = state is TimerState.Running || state is TimerState.Paused || state is TimerState.Finished timerReset.beInvisibleIf(!resetPossible) val drawableId = if (state is TimerState.Running) { - com.simplemobiletools.commons.R.drawable.ic_pause_vector + org.fossify.commons.R.drawable.ic_pause_vector } else { - com.simplemobiletools.commons.R.drawable.ic_play_vector + org.fossify.commons.R.drawable.ic_play_vector } timerPlayPause.setImageDrawable(simpleActivity.resources.getColoredDrawableWithColor(drawableId, textColor)) } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/ViewPagerAdapter.kt b/app/src/main/kotlin/org/fossify/clock/adapters/ViewPagerAdapter.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/clock/adapters/ViewPagerAdapter.kt rename to app/src/main/kotlin/org/fossify/clock/adapters/ViewPagerAdapter.kt index 9a452e35..17c8a0f8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/ViewPagerAdapter.kt +++ b/app/src/main/kotlin/org/fossify/clock/adapters/ViewPagerAdapter.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.clock.adapters +package org.fossify.clock.adapters import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter -import com.simplemobiletools.clock.fragments.AlarmFragment -import com.simplemobiletools.clock.fragments.ClockFragment -import com.simplemobiletools.clock.fragments.StopwatchFragment -import com.simplemobiletools.clock.fragments.TimerFragment -import com.simplemobiletools.clock.helpers.* -import com.simplemobiletools.commons.models.AlarmSound +import org.fossify.clock.fragments.AlarmFragment +import org.fossify.clock.fragments.ClockFragment +import org.fossify.clock.fragments.StopwatchFragment +import org.fossify.clock.fragments.TimerFragment +import org.fossify.clock.helpers.* +import org.fossify.commons.models.AlarmSound class ViewPagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) { private val fragments = HashMap() diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/databases/AppDatabase.kt b/app/src/main/kotlin/org/fossify/clock/databases/AppDatabase.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/clock/databases/AppDatabase.kt rename to app/src/main/kotlin/org/fossify/clock/databases/AppDatabase.kt index 4fb9950b..8ce4669f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/databases/AppDatabase.kt +++ b/app/src/main/kotlin/org/fossify/clock/databases/AppDatabase.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.databases +package org.fossify.clock.databases import android.content.Context import androidx.room.Database @@ -7,11 +7,11 @@ import androidx.room.RoomDatabase import androidx.room.TypeConverters import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.helpers.Converters -import com.simplemobiletools.clock.interfaces.TimerDao -import com.simplemobiletools.clock.models.Timer -import com.simplemobiletools.clock.models.TimerState +import org.fossify.clock.extensions.config +import org.fossify.clock.helpers.Converters +import org.fossify.clock.interfaces.TimerDao +import org.fossify.clock.models.Timer +import org.fossify.clock.models.TimerState import java.util.concurrent.Executors @Database(entities = [Timer::class], version = 2) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/AddTimeZonesDialog.kt b/app/src/main/kotlin/org/fossify/clock/dialogs/AddTimeZonesDialog.kt similarity index 52% rename from app/src/main/kotlin/com/simplemobiletools/clock/dialogs/AddTimeZonesDialog.kt rename to app/src/main/kotlin/org/fossify/clock/dialogs/AddTimeZonesDialog.kt index e2cf4366..77d890b3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/AddTimeZonesDialog.kt +++ b/app/src/main/kotlin/org/fossify/clock/dialogs/AddTimeZonesDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.clock.dialogs +package org.fossify.clock.dialogs -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.adapters.SelectTimeZonesAdapter -import com.simplemobiletools.clock.databinding.DialogSelectTimeZonesBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.helpers.getAllTimeZones -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.adapters.SelectTimeZonesAdapter +import org.fossify.clock.databinding.DialogSelectTimeZonesBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.helpers.getAllTimeZones +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff class AddTimeZonesDialog(val activity: SimpleActivity, private val callback: () -> Unit) { private val binding = DialogSelectTimeZonesBinding.inflate(activity.layoutInflater) @@ -15,8 +15,8 @@ class AddTimeZonesDialog(val activity: SimpleActivity, private val callback: () binding.selectTimeZonesList.adapter = SelectTimeZonesAdapter(activity, getAllTimeZones()) activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/ChangeAlarmSortDialog.kt b/app/src/main/kotlin/org/fossify/clock/dialogs/ChangeAlarmSortDialog.kt similarity index 51% rename from app/src/main/kotlin/com/simplemobiletools/clock/dialogs/ChangeAlarmSortDialog.kt rename to app/src/main/kotlin/org/fossify/clock/dialogs/ChangeAlarmSortDialog.kt index 9b97ee5a..073d00e3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/ChangeAlarmSortDialog.kt +++ b/app/src/main/kotlin/org/fossify/clock/dialogs/ChangeAlarmSortDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.clock.dialogs +package org.fossify.clock.dialogs -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.databinding.DialogChangeAlarmSortBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.helpers.SORT_BY_ALARM_TIME -import com.simplemobiletools.clock.helpers.SORT_BY_CREATION_ORDER -import com.simplemobiletools.clock.helpers.SORT_BY_DATE_AND_TIME -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff +import org.fossify.clock.R +import org.fossify.clock.databinding.DialogChangeAlarmSortBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.helpers.SORT_BY_ALARM_TIME +import org.fossify.clock.helpers.SORT_BY_CREATION_ORDER +import org.fossify.clock.helpers.SORT_BY_DATE_AND_TIME +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff class ChangeAlarmSortDialog(val activity: BaseSimpleActivity, val callback: () -> Unit) { private val binding = DialogChangeAlarmSortBinding.inflate(activity.layoutInflater).apply { @@ -22,10 +22,10 @@ class ChangeAlarmSortDialog(val activity: BaseSimpleActivity, val callback: () - init { activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { - activity.setupDialogStuff(binding.root, this, com.simplemobiletools.commons.R.string.sort_by) + activity.setupDialogStuff(binding.root, this, org.fossify.commons.R.string.sort_by) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt b/app/src/main/kotlin/org/fossify/clock/dialogs/EditAlarmDialog.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt rename to app/src/main/kotlin/org/fossify/clock/dialogs/EditAlarmDialog.kt index 67ca762e..e470246a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt +++ b/app/src/main/kotlin/org/fossify/clock/dialogs/EditAlarmDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.dialogs +package org.fossify.clock.dialogs import android.app.TimePickerDialog import android.graphics.drawable.Drawable @@ -9,19 +9,19 @@ import android.widget.TextView import androidx.appcompat.app.AlertDialog import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.DialogEditAlarmBinding -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.PICK_AUDIO_FILE_INTENT_ID -import com.simplemobiletools.clock.helpers.TODAY_BIT -import com.simplemobiletools.clock.helpers.TOMORROW_BIT -import com.simplemobiletools.clock.helpers.getCurrentDayMinutes -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.SelectAlarmSoundDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.models.AlarmSound +import org.fossify.clock.R +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.DialogEditAlarmBinding +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.PICK_AUDIO_FILE_INTENT_ID +import org.fossify.clock.helpers.TODAY_BIT +import org.fossify.clock.helpers.TOMORROW_BIT +import org.fossify.clock.helpers.getCurrentDayMinutes +import org.fossify.clock.models.Alarm +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.SelectAlarmSoundDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.models.AlarmSound class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val onDismiss: () -> Unit = {}, val callback: (alarmId: Int) -> Unit) { private val binding = DialogEditAlarmBinding.inflate(activity.layoutInflater) @@ -91,7 +91,7 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val onDism editAlarmLabelImage.applyColorFilter(textColor) editAlarm.setText(alarm.label) - val dayLetters = activity.resources.getStringArray(com.simplemobiletools.commons.R.array.week_day_letters).toList() as ArrayList + val dayLetters = activity.resources.getStringArray(org.fossify.commons.R.array.week_day_letters).toList() as ArrayList val dayIndexes = arrayListOf(0, 1, 2, 3, 4, 5, 6) if (activity.config.isSundayFirst) { dayIndexes.moveLastItemToFront() @@ -128,16 +128,16 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val onDism activity.getAlertDialogBuilder() .setOnDismissListener { onDismiss() } - .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { if (!activity.config.wasAlarmWarningShown) { ConfirmationDialog( activity, - messageId = com.simplemobiletools.commons.R.string.alarm_warning, - positive = com.simplemobiletools.commons.R.string.ok, + messageId = org.fossify.commons.R.string.alarm_warning, + positive = org.fossify.commons.R.string.ok, negative = 0 ) { activity.config.wasAlarmWarningShown = true @@ -165,11 +165,11 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val onDism if (alarm.id == 0) { alarmId = activity.dbHelper.insertAlarm(alarm) if (alarmId == -1) { - activity.toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + activity.toast(org.fossify.commons.R.string.unknown_error_occurred) } } else { if (!activity.dbHelper.updateAlarm(alarm)) { - activity.toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + activity.toast(org.fossify.commons.R.string.unknown_error_occurred) } } @@ -213,9 +213,9 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val onDism private fun checkDaylessAlarm() { if (alarm.days <= 0) { val textId = if (alarm.timeInMinutes > getCurrentDayMinutes()) { - com.simplemobiletools.commons.R.string.today + org.fossify.commons.R.string.today } else { - com.simplemobiletools.commons.R.string.tomorrow + org.fossify.commons.R.string.tomorrow } binding.editAlarmDaylessLabel.text = "(${activity.getString(textId)})" diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimeZoneDialog.kt b/app/src/main/kotlin/org/fossify/clock/dialogs/EditTimeZoneDialog.kt similarity index 53% rename from app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimeZoneDialog.kt rename to app/src/main/kotlin/org/fossify/clock/dialogs/EditTimeZoneDialog.kt index 230cfe72..3f3154bc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimeZoneDialog.kt +++ b/app/src/main/kotlin/org/fossify/clock/dialogs/EditTimeZoneDialog.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.clock.dialogs +package org.fossify.clock.dialogs -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.DialogEditTimeZoneBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.extensions.getEditedTimeZonesMap -import com.simplemobiletools.clock.extensions.getModifiedTimeZoneTitle -import com.simplemobiletools.clock.helpers.EDITED_TIME_ZONE_SEPARATOR -import com.simplemobiletools.clock.helpers.getDefaultTimeZoneTitle -import com.simplemobiletools.clock.models.MyTimeZone -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.extensions.showKeyboard -import com.simplemobiletools.commons.extensions.value +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.DialogEditTimeZoneBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.extensions.getEditedTimeZonesMap +import org.fossify.clock.extensions.getModifiedTimeZoneTitle +import org.fossify.clock.helpers.EDITED_TIME_ZONE_SEPARATOR +import org.fossify.clock.helpers.getDefaultTimeZoneTitle +import org.fossify.clock.models.MyTimeZone +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.extensions.showKeyboard +import org.fossify.commons.extensions.value class EditTimeZoneDialog(val activity: SimpleActivity, val myTimeZone: MyTimeZone, val callback: () -> Unit) { @@ -22,8 +22,8 @@ class EditTimeZoneDialog(val activity: SimpleActivity, val myTimeZone: MyTimeZon } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed(binding.editTimeZoneTitle.value) } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed(binding.editTimeZoneTitle.value) } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> alertDialog.showKeyboard(binding.editTimeZoneTitle) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimerDialog.kt b/app/src/main/kotlin/org/fossify/clock/dialogs/EditTimerDialog.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimerDialog.kt rename to app/src/main/kotlin/org/fossify/clock/dialogs/EditTimerDialog.kt index 183b653b..8cc85d6a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimerDialog.kt +++ b/app/src/main/kotlin/org/fossify/clock/dialogs/EditTimerDialog.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.clock.dialogs +package org.fossify.clock.dialogs import android.media.AudioManager import android.media.RingtoneManager import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.DialogEditTimerBinding -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.PICK_AUDIO_FILE_INTENT_ID -import com.simplemobiletools.clock.models.Timer -import com.simplemobiletools.commons.dialogs.SelectAlarmSoundDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.models.AlarmSound +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.DialogEditTimerBinding +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.PICK_AUDIO_FILE_INTENT_ID +import org.fossify.clock.models.Timer +import org.fossify.commons.dialogs.SelectAlarmSoundDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.models.AlarmSound class EditTimerDialog(val activity: SimpleActivity, val timer: Timer, val callback: (id: Long) -> Unit) { private val binding = DialogEditTimerBinding.inflate(activity.layoutInflater) @@ -62,8 +62,8 @@ class EditTimerDialog(val activity: SimpleActivity, val timer: Timer, val callba } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null) - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok, null) + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) { alertDialog -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/MyTimePickerDialogDialog.kt b/app/src/main/kotlin/org/fossify/clock/dialogs/MyTimePickerDialogDialog.kt similarity index 67% rename from app/src/main/kotlin/com/simplemobiletools/clock/dialogs/MyTimePickerDialogDialog.kt rename to app/src/main/kotlin/org/fossify/clock/dialogs/MyTimePickerDialogDialog.kt index 8f0cd68a..92f7d592 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/MyTimePickerDialogDialog.kt +++ b/app/src/main/kotlin/org/fossify/clock/dialogs/MyTimePickerDialogDialog.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.clock.dialogs +package org.fossify.clock.dialogs -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.databinding.DialogMyTimePickerBinding -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.extensions.setupDialogStuff +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.databinding.DialogMyTimePickerBinding +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.setupDialogStuff class MyTimePickerDialogDialog(val activity: SimpleActivity, val initialSeconds: Int, val callback: (result: Int) -> Unit) { private val binding = DialogMyTimePickerBinding.inflate(activity.layoutInflater) @@ -24,8 +24,8 @@ class MyTimePickerDialogDialog(val activity: SimpleActivity, val initialSeconds: } activity.getAlertDialogBuilder() - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { dialog, which -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { dialog, which -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this) } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/SelectAlarmDialog.kt b/app/src/main/kotlin/org/fossify/clock/dialogs/SelectAlarmDialog.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/clock/dialogs/SelectAlarmDialog.kt rename to app/src/main/kotlin/org/fossify/clock/dialogs/SelectAlarmDialog.kt index af8df7c6..9fa4f31a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/SelectAlarmDialog.kt +++ b/app/src/main/kotlin/org/fossify/clock/dialogs/SelectAlarmDialog.kt @@ -1,19 +1,19 @@ -package com.simplemobiletools.clock.dialogs +package org.fossify.clock.dialogs import android.view.ViewGroup import android.widget.RadioGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.clock.databinding.DialogSelectAlarmBinding -import com.simplemobiletools.clock.databinding.ItemRadioButtonBinding -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* +import org.fossify.clock.databinding.DialogSelectAlarmBinding +import org.fossify.clock.databinding.ItemRadioButtonBinding +import org.fossify.clock.models.Alarm +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* class SelectAlarmDialog( val activity: BaseSimpleActivity, val alarms: List, val titleResId: Int, - val onAlarmPicked: (alarm: Alarm?) -> Unit + val onAlarmPicked: (alarm: Alarm?) -> Unit, ) { private val binding = DialogSelectAlarmBinding.inflate(activity.layoutInflater, null, false) private var dialog: AlertDialog? = null @@ -23,8 +23,8 @@ class SelectAlarmDialog( activity.getAlertDialogBuilder() .setOnDismissListener { onAlarmPicked(null) } - .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> dialogConfirmed() } - .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null) + .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> dialogConfirmed() } + .setNegativeButton(org.fossify.commons.R.string.cancel, null) .apply { activity.setupDialogStuff(binding.root, this, titleResId) { alertDialog -> dialog = alertDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Activity.kt b/app/src/main/kotlin/org/fossify/clock/extensions/Activity.kt similarity index 60% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/Activity.kt rename to app/src/main/kotlin/org/fossify/clock/extensions/Activity.kt index f3ec893b..9b27fde0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Activity.kt +++ b/app/src/main/kotlin/org/fossify/clock/extensions/Activity.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.clock.extensions +package org.fossify.clock.extensions -import com.simplemobiletools.clock.BuildConfig -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.dialogs.PermissionRequiredDialog -import com.simplemobiletools.commons.extensions.canUseFullScreenIntent -import com.simplemobiletools.commons.extensions.openFullScreenIntentSettings -import com.simplemobiletools.commons.extensions.openNotificationSettings +import org.fossify.clock.BuildConfig +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.dialogs.PermissionRequiredDialog +import org.fossify.commons.extensions.canUseFullScreenIntent +import org.fossify.commons.extensions.openFullScreenIntentSettings +import org.fossify.commons.extensions.openNotificationSettings fun BaseSimpleActivity.handleFullScreenNotificationsPermission( notificationsCallback: (granted: Boolean) -> Unit, @@ -17,7 +17,7 @@ fun BaseSimpleActivity.handleFullScreenNotificationsPermission( } else { PermissionRequiredDialog( activity = this, - textId = com.simplemobiletools.commons.R.string.allow_full_screen_notifications_reminders, + textId = org.fossify.commons.R.string.allow_full_screen_notifications_reminders, positiveActionCallback = { openFullScreenIntentSettings(BuildConfig.APPLICATION_ID) }, @@ -29,7 +29,7 @@ fun BaseSimpleActivity.handleFullScreenNotificationsPermission( } else { PermissionRequiredDialog( activity = this, - textId = com.simplemobiletools.commons.R.string.allow_notifications_reminders, + textId = org.fossify.commons.R.string.allow_notifications_reminders, positiveActionCallback = { openNotificationSettings() }, diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/org/fossify/clock/extensions/Context.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt rename to app/src/main/kotlin/org/fossify/clock/extensions/Context.kt index 1f392eab..95057827 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/clock/extensions/Context.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.extensions +package org.fossify.clock.extensions import android.app.* import android.appwidget.AppWidgetManager @@ -18,21 +18,21 @@ import android.text.style.RelativeSizeSpan import android.widget.Toast import androidx.core.app.AlarmManagerCompat import androidx.core.app.NotificationCompat -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.ReminderActivity -import com.simplemobiletools.clock.activities.SnoozeReminderActivity -import com.simplemobiletools.clock.activities.SplashActivity -import com.simplemobiletools.clock.databases.AppDatabase -import com.simplemobiletools.clock.helpers.* -import com.simplemobiletools.clock.interfaces.TimerDao -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.clock.models.MyTimeZone -import com.simplemobiletools.clock.models.Timer -import com.simplemobiletools.clock.models.TimerState -import com.simplemobiletools.clock.receivers.* -import com.simplemobiletools.clock.services.SnoozeService -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* +import org.fossify.clock.R +import org.fossify.clock.activities.ReminderActivity +import org.fossify.clock.activities.SnoozeReminderActivity +import org.fossify.clock.activities.SplashActivity +import org.fossify.clock.databases.AppDatabase +import org.fossify.clock.helpers.* +import org.fossify.clock.interfaces.TimerDao +import org.fossify.clock.models.Alarm +import org.fossify.clock.models.MyTimeZone +import org.fossify.clock.models.Timer +import org.fossify.clock.models.TimerState +import org.fossify.clock.receivers.* +import org.fossify.clock.services.SnoozeService +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale @@ -50,8 +50,8 @@ fun Context.getFormattedDate(calendar: Calendar): String { val dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH) val month = calendar.get(Calendar.MONTH) - val dayString = resources.getStringArray(com.simplemobiletools.commons.R.array.week_days_short)[dayOfWeek] - val monthString = resources.getStringArray(com.simplemobiletools.commons.R.array.months)[month] + val dayString = resources.getStringArray(org.fossify.commons.R.array.week_days_short)[dayOfWeek] + val monthString = resources.getStringArray(org.fossify.commons.R.array.months)[month] return "$dayString, $dayOfMonth $monthString" } @@ -138,7 +138,7 @@ fun Context.scheduleNextAlarm(alarm: Alarm, showToast: Boolean) { } fun Context.showRemainingTimeMessage(totalMinutes: Int) { - val fullString = String.format(getString(com.simplemobiletools.commons.R.string.time_remaining), formatMinutesToTimeString(totalMinutes)) + val fullString = String.format(getString(org.fossify.commons.R.string.time_remaining), formatMinutesToTimeString(totalMinutes)) toast(fullString, Toast.LENGTH_LONG) } @@ -265,7 +265,7 @@ fun Context.getFormattedTime(passedSeconds: Int, showSeconds: Boolean, makeAmPmS } fun Context.formatTo12HourFormat(showSeconds: Boolean, hours: Int, minutes: Int, seconds: Int): String { - val appendable = getString(if (hours >= 12) com.simplemobiletools.commons.R.string.p_m else com.simplemobiletools.commons.R.string.a_m) + val appendable = getString(if (hours >= 12) org.fossify.commons.R.string.p_m else org.fossify.commons.R.string.a_m) val newHours = if (hours == 0 || hours == 12) 12 else hours % 12 return "${formatTime(showSeconds, false, newHours, minutes, seconds)} $appendable" } @@ -298,7 +298,7 @@ fun Context.getClosestEnabledAlarmString(callback: (result: String) -> Unit) { val calendar = Calendar.getInstance().apply { firstDayOfWeek = Calendar.MONDAY } calendar.add(Calendar.MINUTE, closestAlarmTime) val dayOfWeekIndex = (calendar.get(Calendar.DAY_OF_WEEK) + 5) % 7 - val dayOfWeek = resources.getStringArray(com.simplemobiletools.commons.R.array.week_days_short)[dayOfWeekIndex] + val dayOfWeek = resources.getStringArray(org.fossify.commons.R.array.week_days_short)[dayOfWeekIndex] val pattern = if (DateFormat.is24HourFormat(this)) { "HH:mm" } else { @@ -404,8 +404,8 @@ fun Context.getTimerNotification(timer: Timer, pendingIntent: PendingIntent, add .setSound(Uri.parse(soundUri), STREAM_ALARM) .setChannelId(channelId) .addAction( - com.simplemobiletools.commons.R.drawable.ic_cross_vector, - getString(com.simplemobiletools.commons.R.string.dismiss), + org.fossify.commons.R.drawable.ic_cross_vector, + getString(org.fossify.commons.R.string.dismiss), if (addDeleteIntent) { reminderActivityIntent } else { @@ -458,7 +458,7 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No } val channelId = "simple_alarm_channel_${soundUri}_${alarm.vibrate}" val label = alarm.label.ifEmpty { - getString(com.simplemobiletools.commons.R.string.alarm) + getString(org.fossify.commons.R.string.alarm) } if (isOreoPlus()) { @@ -492,11 +492,11 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No .setAutoCancel(true) .setChannelId(channelId) .addAction( - com.simplemobiletools.commons.R.drawable.ic_snooze_vector, - getString(com.simplemobiletools.commons.R.string.snooze), + org.fossify.commons.R.drawable.ic_snooze_vector, + getString(org.fossify.commons.R.string.snooze), getSnoozePendingIntent(alarm) ) - .addAction(com.simplemobiletools.commons.R.drawable.ic_cross_vector, getString(com.simplemobiletools.commons.R.string.dismiss), dismissIntent) + .addAction(org.fossify.commons.R.drawable.ic_cross_vector, getString(org.fossify.commons.R.string.dismiss), dismissIntent) .setDeleteIntent(dismissIntent) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) @@ -541,9 +541,9 @@ fun Context.checkAlarmsWithDeletedSoundUri(uri: String) { fun Context.getAlarmSelectedDaysString(bitMask: Int): String { return when (bitMask) { - TODAY_BIT -> getString(com.simplemobiletools.commons.R.string.today) - TOMORROW_BIT -> getString(com.simplemobiletools.commons.R.string.tomorrow) - EVERY_DAY_BIT -> getString(com.simplemobiletools.commons.R.string.every_day) + TODAY_BIT -> getString(org.fossify.commons.R.string.today) + TOMORROW_BIT -> getString(org.fossify.commons.R.string.tomorrow) + EVERY_DAY_BIT -> getString(org.fossify.commons.R.string.every_day) else -> getSelectedDaysString(bitMask) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Fragment.kt b/app/src/main/kotlin/org/fossify/clock/extensions/Fragment.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/Fragment.kt rename to app/src/main/kotlin/org/fossify/clock/extensions/Fragment.kt index 6fe261a6..9faba8ab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Fragment.kt +++ b/app/src/main/kotlin/org/fossify/clock/extensions/Fragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.extensions +package org.fossify.clock.extensions import android.content.SharedPreferences import androidx.fragment.app.Fragment diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Int.kt b/app/src/main/kotlin/org/fossify/clock/extensions/Int.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/Int.kt rename to app/src/main/kotlin/org/fossify/clock/extensions/Int.kt index dcf929e4..5de1f01f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Int.kt +++ b/app/src/main/kotlin/org/fossify/clock/extensions/Int.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.extensions +package org.fossify.clock.extensions import java.util.concurrent.TimeUnit diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Logs.kt b/app/src/main/kotlin/org/fossify/clock/extensions/Logs.kt similarity index 69% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/Logs.kt rename to app/src/main/kotlin/org/fossify/clock/extensions/Logs.kt index 4638f6f9..53ba9384 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Logs.kt +++ b/app/src/main/kotlin/org/fossify/clock/extensions/Logs.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.clock.extensions +package org.fossify.clock.extensions import android.util.Log -import com.simplemobiletools.clock.BuildConfig +import org.fossify.clock.BuildConfig fun A.log(tag: String) = apply { if (BuildConfig.DEBUG) Log.wtf(tag, this.toString()) } fun A.log(first: String, tag: String) = apply { if (BuildConfig.DEBUG) Log.wtf(tag, first) } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Long.kt b/app/src/main/kotlin/org/fossify/clock/extensions/Long.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/Long.kt rename to app/src/main/kotlin/org/fossify/clock/extensions/Long.kt index 6d8c546e..8376a89c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Long.kt +++ b/app/src/main/kotlin/org/fossify/clock/extensions/Long.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.clock.extensions +package org.fossify.clock.extensions import android.text.format.DateFormat -import com.simplemobiletools.commons.extensions.getFormattedDuration +import org.fossify.commons.extensions.getFormattedDuration import java.util.Calendar import java.util.Locale import java.util.concurrent.TimeUnit diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/TextView.kt b/app/src/main/kotlin/org/fossify/clock/extensions/TextView.kt similarity index 68% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/TextView.kt rename to app/src/main/kotlin/org/fossify/clock/extensions/TextView.kt index a85194aa..59b6d8bc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/TextView.kt +++ b/app/src/main/kotlin/org/fossify/clock/extensions/TextView.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.clock.extensions +package org.fossify.clock.extensions import android.widget.TextView -import com.simplemobiletools.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.applyColorFilter fun TextView.colorCompoundDrawable(color: Int) { compoundDrawables.filterNotNull().forEach { drawable -> diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/gson/RuntimeTypeAdapterFactory.java b/app/src/main/kotlin/org/fossify/clock/extensions/gson/RuntimeTypeAdapterFactory.java similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/gson/RuntimeTypeAdapterFactory.java rename to app/src/main/kotlin/org/fossify/clock/extensions/gson/RuntimeTypeAdapterFactory.java index 66097d89..076b28a5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/gson/RuntimeTypeAdapterFactory.java +++ b/app/src/main/kotlin/org/fossify/clock/extensions/gson/RuntimeTypeAdapterFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.simplemobiletools.clock.extensions.gson; +package org.fossify.clock.extensions.gson; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/gson/TypeAdapter.kt b/app/src/main/kotlin/org/fossify/clock/extensions/gson/TypeAdapter.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/clock/extensions/gson/TypeAdapter.kt rename to app/src/main/kotlin/org/fossify/clock/extensions/gson/TypeAdapter.kt index 86e2c63e..1350f7e2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/gson/TypeAdapter.kt +++ b/app/src/main/kotlin/org/fossify/clock/extensions/gson/TypeAdapter.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.clock.extensions.gson +package org.fossify.clock.extensions.gson import com.google.gson.Gson import com.google.gson.GsonBuilder import com.google.gson.TypeAdapterFactory -import com.simplemobiletools.clock.models.TimerState +import org.fossify.clock.models.TimerState val timerStates = valueOf() .registerSubtype(TimerState.Idle::class.java) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt b/app/src/main/kotlin/org/fossify/clock/fragments/AlarmFragment.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt rename to app/src/main/kotlin/org/fossify/clock/fragments/AlarmFragment.kt index 02fb355f..de83517e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt +++ b/app/src/main/kotlin/org/fossify/clock/fragments/AlarmFragment.kt @@ -1,28 +1,28 @@ -package com.simplemobiletools.clock.fragments +package org.fossify.clock.fragments import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.simplemobiletools.clock.activities.MainActivity -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.adapters.AlarmsAdapter -import com.simplemobiletools.clock.databinding.FragmentAlarmBinding -import com.simplemobiletools.clock.dialogs.ChangeAlarmSortDialog -import com.simplemobiletools.clock.dialogs.EditAlarmDialog -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.* -import com.simplemobiletools.clock.interfaces.ToggleAlarmInterface -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.clock.models.AlarmEvent -import com.simplemobiletools.commons.extensions.getProperBackgroundColor -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.extensions.updateTextColors -import com.simplemobiletools.commons.helpers.SORT_BY_DATE_CREATED -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.AlarmSound +import org.fossify.clock.activities.MainActivity +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.adapters.AlarmsAdapter +import org.fossify.clock.databinding.FragmentAlarmBinding +import org.fossify.clock.dialogs.ChangeAlarmSortDialog +import org.fossify.clock.dialogs.EditAlarmDialog +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.* +import org.fossify.clock.interfaces.ToggleAlarmInterface +import org.fossify.clock.models.Alarm +import org.fossify.clock.models.AlarmEvent +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.toast +import org.fossify.commons.extensions.updateTextColors +import org.fossify.commons.helpers.SORT_BY_DATE_CREATED +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.AlarmSound import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -144,7 +144,7 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface { setupAlarms() } } else { - requireActivity().toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) + requireActivity().toast(org.fossify.commons.R.string.unknown_error_occurred) } requireContext().updateWidgets() } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt b/app/src/main/kotlin/org/fossify/clock/fragments/ClockFragment.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt rename to app/src/main/kotlin/org/fossify/clock/fragments/ClockFragment.kt index 5a20153e..d63d12f4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt +++ b/app/src/main/kotlin/org/fossify/clock/fragments/ClockFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.fragments +package org.fossify.clock.fragments import android.os.Bundle import android.os.Handler @@ -7,19 +7,19 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.adapters.TimeZonesAdapter -import com.simplemobiletools.clock.databinding.FragmentClockBinding -import com.simplemobiletools.clock.dialogs.AddTimeZonesDialog -import com.simplemobiletools.clock.dialogs.EditTimeZoneDialog -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.getPassedSeconds -import com.simplemobiletools.clock.models.MyTimeZone -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getProperBackgroundColor -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.extensions.updateTextColors +import org.fossify.clock.R +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.adapters.TimeZonesAdapter +import org.fossify.clock.databinding.FragmentClockBinding +import org.fossify.clock.dialogs.AddTimeZonesDialog +import org.fossify.clock.dialogs.EditTimeZoneDialog +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.getPassedSeconds +import org.fossify.clock.models.MyTimeZone +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.updateTextColors import java.util.Calendar class ClockFragment : Fragment() { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt b/app/src/main/kotlin/org/fossify/clock/fragments/StopwatchFragment.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt rename to app/src/main/kotlin/org/fossify/clock/fragments/StopwatchFragment.kt index 05ee77f7..37daea32 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt +++ b/app/src/main/kotlin/org/fossify/clock/fragments/StopwatchFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.fragments +package org.fossify.clock.fragments import android.graphics.Bitmap import android.graphics.Color @@ -8,20 +8,20 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.adapters.StopwatchAdapter -import com.simplemobiletools.clock.databinding.FragmentStopwatchBinding -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.extensions.formatStopwatchTime -import com.simplemobiletools.clock.helpers.SORT_BY_LAP -import com.simplemobiletools.clock.helpers.SORT_BY_LAP_TIME -import com.simplemobiletools.clock.helpers.SORT_BY_TOTAL_TIME -import com.simplemobiletools.clock.helpers.Stopwatch -import com.simplemobiletools.clock.models.Lap -import com.simplemobiletools.commons.dialogs.PermissionRequiredDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.SORT_DESCENDING +import org.fossify.clock.R +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.adapters.StopwatchAdapter +import org.fossify.clock.databinding.FragmentStopwatchBinding +import org.fossify.clock.extensions.config +import org.fossify.clock.extensions.formatStopwatchTime +import org.fossify.clock.helpers.SORT_BY_LAP +import org.fossify.clock.helpers.SORT_BY_LAP_TIME +import org.fossify.clock.helpers.SORT_BY_TOTAL_TIME +import org.fossify.clock.helpers.Stopwatch +import org.fossify.clock.models.Lap +import org.fossify.commons.dialogs.PermissionRequiredDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.SORT_DESCENDING class StopwatchFragment : Fragment() { @@ -107,7 +107,7 @@ class StopwatchFragment : Fragment() { private fun updateIcons(state: Stopwatch.State) { val drawableId = - if (state == Stopwatch.State.RUNNING) com.simplemobiletools.commons.R.drawable.ic_pause_vector else com.simplemobiletools.commons.R.drawable.ic_play_vector + if (state == Stopwatch.State.RUNNING) org.fossify.commons.R.drawable.ic_pause_vector else org.fossify.commons.R.drawable.ic_play_vector val iconColor = if (requireContext().getProperPrimaryColor() == Color.WHITE) Color.BLACK else Color.WHITE binding.stopwatchPlayPause.setImageDrawable(resources.getColoredDrawableWithColor(drawableId, iconColor)) } @@ -119,7 +119,7 @@ class StopwatchFragment : Fragment() { } else { PermissionRequiredDialog( activity as SimpleActivity, - com.simplemobiletools.commons.R.string.allow_notifications_reminders, + org.fossify.commons.R.string.allow_notifications_reminders, { (activity as SimpleActivity).openNotificationSettings() }) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt b/app/src/main/kotlin/org/fossify/clock/fragments/TimerFragment.kt similarity index 80% rename from app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt rename to app/src/main/kotlin/org/fossify/clock/fragments/TimerFragment.kt index f41f6250..7c449b7b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt +++ b/app/src/main/kotlin/org/fossify/clock/fragments/TimerFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.fragments +package org.fossify.clock.fragments import android.os.Bundle import android.os.Handler @@ -7,21 +7,21 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.simplemobiletools.clock.activities.SimpleActivity -import com.simplemobiletools.clock.adapters.TimerAdapter -import com.simplemobiletools.clock.databinding.FragmentTimerBinding -import com.simplemobiletools.clock.dialogs.EditTimerDialog -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.extensions.createNewTimer -import com.simplemobiletools.clock.extensions.timerHelper -import com.simplemobiletools.clock.helpers.DisabledItemChangeAnimator -import com.simplemobiletools.clock.models.Timer -import com.simplemobiletools.clock.models.TimerEvent -import com.simplemobiletools.commons.extensions.getProperBackgroundColor -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.extensions.hideKeyboard -import com.simplemobiletools.commons.extensions.updateTextColors -import com.simplemobiletools.commons.models.AlarmSound +import org.fossify.clock.activities.SimpleActivity +import org.fossify.clock.adapters.TimerAdapter +import org.fossify.clock.databinding.FragmentTimerBinding +import org.fossify.clock.dialogs.EditTimerDialog +import org.fossify.clock.extensions.config +import org.fossify.clock.extensions.createNewTimer +import org.fossify.clock.extensions.timerHelper +import org.fossify.clock.helpers.DisabledItemChangeAnimator +import org.fossify.clock.models.Timer +import org.fossify.clock.models.TimerEvent +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.hideKeyboard +import org.fossify.commons.extensions.updateTextColors +import org.fossify.commons.models.AlarmSound import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -89,7 +89,7 @@ class TimerFragment : Fragment() { activity?.timerHelper?.getTimers { timers -> activity?.runOnUiThread { timerAdapter.submitList(timers) { - getView()?.post { + view?.post { if (timerPositionToScrollTo != INVALID_POSITION && timerAdapter.itemCount > timerPositionToScrollTo) { binding.timersList.scrollToPosition(timerPositionToScrollTo) timerPositionToScrollTo = INVALID_POSITION diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt b/app/src/main/kotlin/org/fossify/clock/helpers/Config.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/Config.kt index b3eaa42b..2dbf8cdc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/Config.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers import android.content.Context import android.media.RingtoneManager -import com.simplemobiletools.clock.extensions.gson.gson -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.clock.models.ObfuscatedAlarm -import com.simplemobiletools.clock.models.ObfuscatedTimer -import com.simplemobiletools.clock.models.Timer -import com.simplemobiletools.commons.extensions.getDefaultAlarmSound -import com.simplemobiletools.commons.extensions.getDefaultAlarmTitle -import com.simplemobiletools.commons.helpers.BaseConfig -import com.simplemobiletools.commons.helpers.SORT_DESCENDING +import org.fossify.clock.extensions.gson.gson +import org.fossify.clock.models.Alarm +import org.fossify.clock.models.ObfuscatedAlarm +import org.fossify.clock.models.ObfuscatedTimer +import org.fossify.clock.models.Timer +import org.fossify.commons.extensions.getDefaultAlarmSound +import org.fossify.commons.extensions.getDefaultAlarmTitle +import org.fossify.commons.helpers.BaseConfig +import org.fossify.commons.helpers.SORT_DESCENDING class Config(context: Context) : BaseConfig(context) { companion object { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/clock/helpers/Constants.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/Constants.kt index 9d0235b1..99fd99c4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/Constants.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers -import com.simplemobiletools.clock.extensions.isBitSet -import com.simplemobiletools.clock.models.MyTimeZone -import com.simplemobiletools.commons.helpers.* +import org.fossify.clock.extensions.isBitSet +import org.fossify.clock.models.MyTimeZone +import org.fossify.commons.helpers.* import java.util.Calendar import java.util.Date import java.util.TimeZone @@ -72,7 +72,7 @@ const val TOMORROW_BIT = -2 // stopwatch shortcut const val STOPWATCH_SHORTCUT_ID = "stopwatch_shortcut_id" -const val STOPWATCH_TOGGLE_ACTION = "com.simplemobiletools.clock.TOGGLE_STOPWATCH" +const val STOPWATCH_TOGGLE_ACTION = "org.fossify.clock.TOGGLE_STOPWATCH" val DAY_BIT_MAP = mapOf( Calendar.SUNDAY to SUNDAY_BIT, diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Converters.kt b/app/src/main/kotlin/org/fossify/clock/helpers/Converters.kt similarity index 65% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/Converters.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/Converters.kt index 9b6a16f0..bbf7e2aa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Converters.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/Converters.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers import androidx.room.TypeConverter -import com.simplemobiletools.clock.extensions.gson.gson -import com.simplemobiletools.clock.models.StateWrapper -import com.simplemobiletools.clock.models.TimerState +import org.fossify.clock.extensions.gson.gson +import org.fossify.clock.models.StateWrapper +import org.fossify.clock.models.TimerState class Converters { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt b/app/src/main/kotlin/org/fossify/clock/helpers/DBHelper.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/DBHelper.kt index dac63f65..2351d3a4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/DBHelper.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers import android.content.ContentValues import android.content.Context @@ -6,12 +6,12 @@ import android.database.Cursor import android.database.sqlite.SQLiteDatabase import android.database.sqlite.SQLiteOpenHelper import android.text.TextUtils -import com.simplemobiletools.clock.extensions.cancelAlarmClock -import com.simplemobiletools.clock.extensions.createNewAlarm -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.commons.extensions.getIntValue -import com.simplemobiletools.commons.extensions.getStringValue -import com.simplemobiletools.commons.helpers.* +import org.fossify.clock.extensions.cancelAlarmClock +import org.fossify.clock.extensions.createNewAlarm +import org.fossify.clock.models.Alarm +import org.fossify.commons.extensions.getIntValue +import org.fossify.commons.extensions.getStringValue +import org.fossify.commons.helpers.* 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 diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/DisabledItemChangeAnimator.kt b/app/src/main/kotlin/org/fossify/clock/helpers/DisabledItemChangeAnimator.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/DisabledItemChangeAnimator.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/DisabledItemChangeAnimator.kt index 7a627afe..7502cb37 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/DisabledItemChangeAnimator.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/DisabledItemChangeAnimator.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.RecyclerView @@ -11,7 +11,7 @@ class DisabledItemChangeAnimator : DefaultItemAnimator() { oldHolder: RecyclerView.ViewHolder, newHolder: RecyclerView.ViewHolder, preInfo: ItemHolderInfo, - postInfo: ItemHolderInfo + postInfo: ItemHolderInfo, ): Boolean { dispatchChangeFinished(oldHolder, false) return false @@ -23,7 +23,7 @@ class DisabledItemChangeAnimator : DefaultItemAnimator() { fromX: Int, fromY: Int, toX: Int, - toY: Int + toY: Int, ): Boolean { dispatchChangeFinished(oldHolder, false) return false diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyAnalogueTimeWidgetProvider.kt b/app/src/main/kotlin/org/fossify/clock/helpers/MyAnalogueTimeWidgetProvider.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyAnalogueTimeWidgetProvider.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/MyAnalogueTimeWidgetProvider.kt index f8a79b2f..fd6429f6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyAnalogueTimeWidgetProvider.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/MyAnalogueTimeWidgetProvider.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -8,11 +8,11 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.widget.RemoteViews -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.SplashActivity -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.getLaunchIntent +import org.fossify.clock.R +import org.fossify.clock.activities.SplashActivity +import org.fossify.clock.extensions.config +import org.fossify.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.getLaunchIntent class MyAnalogueTimeWidgetProvider : AppWidgetProvider() { override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyDigitalTimeWidgetProvider.kt b/app/src/main/kotlin/org/fossify/clock/helpers/MyDigitalTimeWidgetProvider.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyDigitalTimeWidgetProvider.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/MyDigitalTimeWidgetProvider.kt index 53e1b42c..6254eb25 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyDigitalTimeWidgetProvider.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/MyDigitalTimeWidgetProvider.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -9,14 +9,14 @@ import android.content.Intent import android.graphics.* import android.os.Bundle import android.widget.RemoteViews -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.SplashActivity -import com.simplemobiletools.clock.extensions.config -import com.simplemobiletools.clock.extensions.getClosestEnabledAlarmString -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.getLaunchIntent -import com.simplemobiletools.commons.extensions.setText -import com.simplemobiletools.commons.extensions.setVisibleIf +import org.fossify.clock.R +import org.fossify.clock.activities.SplashActivity +import org.fossify.clock.extensions.config +import org.fossify.clock.extensions.getClosestEnabledAlarmString +import org.fossify.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.getLaunchIntent +import org.fossify.commons.extensions.setText +import org.fossify.commons.extensions.setVisibleIf class MyDigitalTimeWidgetProvider : AppWidgetProvider() { override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Stopwatch.kt b/app/src/main/kotlin/org/fossify/clock/helpers/Stopwatch.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/Stopwatch.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/Stopwatch.kt index 47e85f82..a6deeb47 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Stopwatch.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/Stopwatch.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers import android.os.SystemClock -import com.simplemobiletools.clock.models.Lap +import org.fossify.clock.models.Lap import java.util.Timer import java.util.TimerTask import java.util.concurrent.CopyOnWriteArraySet diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/TimerHelper.kt b/app/src/main/kotlin/org/fossify/clock/helpers/TimerHelper.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/clock/helpers/TimerHelper.kt rename to app/src/main/kotlin/org/fossify/clock/helpers/TimerHelper.kt index 4f69e844..de7c4353 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/TimerHelper.kt +++ b/app/src/main/kotlin/org/fossify/clock/helpers/TimerHelper.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.clock.helpers +package org.fossify.clock.helpers import android.content.Context -import com.simplemobiletools.clock.extensions.timerDb -import com.simplemobiletools.clock.models.Timer -import com.simplemobiletools.commons.helpers.ensureBackgroundThread +import org.fossify.clock.extensions.timerDb +import org.fossify.clock.models.Timer +import org.fossify.commons.helpers.ensureBackgroundThread class TimerHelper(val context: Context) { private val timerDao = context.timerDb diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/interfaces/TimerDao.kt b/app/src/main/kotlin/org/fossify/clock/interfaces/TimerDao.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/clock/interfaces/TimerDao.kt rename to app/src/main/kotlin/org/fossify/clock/interfaces/TimerDao.kt index 96e01286..93997da0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/interfaces/TimerDao.kt +++ b/app/src/main/kotlin/org/fossify/clock/interfaces/TimerDao.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.clock.interfaces +package org.fossify.clock.interfaces import androidx.room.* -import com.simplemobiletools.clock.models.Timer +import org.fossify.clock.models.Timer @Dao interface TimerDao { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/interfaces/ToggleAlarmInterface.kt b/app/src/main/kotlin/org/fossify/clock/interfaces/ToggleAlarmInterface.kt similarity index 64% rename from app/src/main/kotlin/com/simplemobiletools/clock/interfaces/ToggleAlarmInterface.kt rename to app/src/main/kotlin/org/fossify/clock/interfaces/ToggleAlarmInterface.kt index 5037397b..5e53d10a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/interfaces/ToggleAlarmInterface.kt +++ b/app/src/main/kotlin/org/fossify/clock/interfaces/ToggleAlarmInterface.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.interfaces +package org.fossify.clock.interfaces interface ToggleAlarmInterface { fun alarmToggled(id: Int, isEnabled: Boolean) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/Alarm.kt b/app/src/main/kotlin/org/fossify/clock/models/Alarm.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/clock/models/Alarm.kt rename to app/src/main/kotlin/org/fossify/clock/models/Alarm.kt index 3a7a34b9..fc939900 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/models/Alarm.kt +++ b/app/src/main/kotlin/org/fossify/clock/models/Alarm.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.models +package org.fossify.clock.models import androidx.annotation.Keep @@ -12,7 +12,7 @@ data class Alarm( var soundTitle: String, var soundUri: String, var label: String, - var oneShot: Boolean = false + var oneShot: Boolean = false, ) @Keep @@ -25,7 +25,7 @@ data class ObfuscatedAlarm( var f: String, var g: String, var h: String, - var i: Boolean = false + var i: Boolean = false, ) { fun toAlarm() = Alarm(a, b, c, d, e, f, g, h, i) } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/AlarmEvent.kt b/app/src/main/kotlin/org/fossify/clock/models/AlarmEvent.kt similarity index 60% rename from app/src/main/kotlin/com/simplemobiletools/clock/models/AlarmEvent.kt rename to app/src/main/kotlin/org/fossify/clock/models/AlarmEvent.kt index 5d440f9e..6d98634a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/models/AlarmEvent.kt +++ b/app/src/main/kotlin/org/fossify/clock/models/AlarmEvent.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.models +package org.fossify.clock.models sealed interface AlarmEvent { object Refresh : AlarmEvent diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/Lap.kt b/app/src/main/kotlin/org/fossify/clock/models/Lap.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/clock/models/Lap.kt rename to app/src/main/kotlin/org/fossify/clock/models/Lap.kt index 8c7914f0..a1b2795a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/models/Lap.kt +++ b/app/src/main/kotlin/org/fossify/clock/models/Lap.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.clock.models +package org.fossify.clock.models -import com.simplemobiletools.clock.helpers.SORT_BY_LAP -import com.simplemobiletools.clock.helpers.SORT_BY_LAP_TIME -import com.simplemobiletools.commons.helpers.SORT_DESCENDING +import org.fossify.clock.helpers.SORT_BY_LAP +import org.fossify.clock.helpers.SORT_BY_LAP_TIME +import org.fossify.commons.helpers.SORT_DESCENDING data class Lap(val id: Int, var lapTime: Long, var totalTime: Long) : Comparable { companion object { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/MyTimeZone.kt b/app/src/main/kotlin/org/fossify/clock/models/MyTimeZone.kt similarity index 64% rename from app/src/main/kotlin/com/simplemobiletools/clock/models/MyTimeZone.kt rename to app/src/main/kotlin/org/fossify/clock/models/MyTimeZone.kt index a205419a..c35d4e6c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/models/MyTimeZone.kt +++ b/app/src/main/kotlin/org/fossify/clock/models/MyTimeZone.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.clock.models +package org.fossify.clock.models data class MyTimeZone(val id: Int, var title: String, val zoneName: String) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/StateWrapper.kt b/app/src/main/kotlin/org/fossify/clock/models/StateWrapper.kt similarity index 52% rename from app/src/main/kotlin/com/simplemobiletools/clock/models/StateWrapper.kt rename to app/src/main/kotlin/org/fossify/clock/models/StateWrapper.kt index 0c453764..08e56e4c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/models/StateWrapper.kt +++ b/app/src/main/kotlin/org/fossify/clock/models/StateWrapper.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.clock.models +package org.fossify.clock.models data class StateWrapper(val state: TimerState) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/Timer.kt b/app/src/main/kotlin/org/fossify/clock/models/Timer.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/clock/models/Timer.kt rename to app/src/main/kotlin/org/fossify/clock/models/Timer.kt index 0b5a5d45..f20dbe18 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/models/Timer.kt +++ b/app/src/main/kotlin/org/fossify/clock/models/Timer.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.models +package org.fossify.clock.models import androidx.annotation.Keep import androidx.room.Entity @@ -16,7 +16,7 @@ data class Timer( var label: String, var createdAt: Long, var channelId: String? = null, - var oneShot: Boolean = false + var oneShot: Boolean = false, ) @Keep @@ -31,7 +31,7 @@ data class ObfuscatedTimer( var g: String, var h: Long, var i: String? = null, - var j: Boolean = false + var j: Boolean = false, ) { fun toTimer() = Timer(a, b, TimerState.Idle, d, e, f, g, h, i, j) } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/TimerEvent.kt b/app/src/main/kotlin/org/fossify/clock/models/TimerEvent.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/clock/models/TimerEvent.kt rename to app/src/main/kotlin/org/fossify/clock/models/TimerEvent.kt index a9732eb0..1a8cd3a5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/models/TimerEvent.kt +++ b/app/src/main/kotlin/org/fossify/clock/models/TimerEvent.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.clock.models +package org.fossify.clock.models -import com.simplemobiletools.clock.helpers.INVALID_TIMER_ID +import org.fossify.clock.helpers.INVALID_TIMER_ID sealed class TimerEvent(open val timerId: Int) { data class Delete(override val timerId: Int) : TimerEvent(timerId) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/TimerState.kt b/app/src/main/kotlin/org/fossify/clock/models/TimerState.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/clock/models/TimerState.kt rename to app/src/main/kotlin/org/fossify/clock/models/TimerState.kt index a8a5e9c8..1737e9d4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/models/TimerState.kt +++ b/app/src/main/kotlin/org/fossify/clock/models/TimerState.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.models +package org.fossify.clock.models import androidx.annotation.Keep @@ -6,10 +6,13 @@ import androidx.annotation.Keep sealed class TimerState { @Keep object Idle : TimerState() + @Keep data class Running(val duration: Long, val tick: Long) : TimerState() + @Keep data class Paused(val duration: Long, val tick: Long) : TimerState() + @Keep object Finished : TimerState() } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/AlarmReceiver.kt b/app/src/main/kotlin/org/fossify/clock/receivers/AlarmReceiver.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/clock/receivers/AlarmReceiver.kt rename to app/src/main/kotlin/org/fossify/clock/receivers/AlarmReceiver.kt index e14e2eb5..b06459c0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/AlarmReceiver.kt +++ b/app/src/main/kotlin/org/fossify/clock/receivers/AlarmReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.receivers +package org.fossify.clock.receivers import android.app.NotificationChannel import android.app.NotificationManager @@ -10,15 +10,15 @@ import android.os.Build import android.os.Handler import androidx.annotation.RequiresApi import androidx.core.app.NotificationCompat -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.activities.ReminderActivity -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.ALARM_ID -import com.simplemobiletools.clock.helpers.ALARM_NOTIFICATION_CHANNEL_ID -import com.simplemobiletools.clock.helpers.ALARM_NOTIF_ID -import com.simplemobiletools.clock.helpers.EARLY_ALARM_NOTIF_ID -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.helpers.isOreoPlus +import org.fossify.clock.R +import org.fossify.clock.activities.ReminderActivity +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.ALARM_ID +import org.fossify.clock.helpers.ALARM_NOTIFICATION_CHANNEL_ID +import org.fossify.clock.helpers.ALARM_NOTIF_ID +import org.fossify.clock.helpers.EARLY_ALARM_NOTIF_ID +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.helpers.isOreoPlus class AlarmReceiver : BroadcastReceiver() { @@ -53,7 +53,7 @@ class AlarmReceiver : BroadcastReceiver() { val builder = NotificationCompat.Builder(context, ALARM_NOTIFICATION_CHANNEL_ID) .setSmallIcon(R.drawable.ic_alarm_vector) - .setContentTitle(context.getString(com.simplemobiletools.commons.R.string.alarm)) + .setContentTitle(context.getString(org.fossify.commons.R.string.alarm)) .setAutoCancel(true) .setPriority(NotificationCompat.PRIORITY_HIGH) .setCategory(NotificationCompat.CATEGORY_ALARM) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/BootCompletedReceiver.kt b/app/src/main/kotlin/org/fossify/clock/receivers/BootCompletedReceiver.kt similarity index 69% rename from app/src/main/kotlin/com/simplemobiletools/clock/receivers/BootCompletedReceiver.kt rename to app/src/main/kotlin/org/fossify/clock/receivers/BootCompletedReceiver.kt index 4c12425d..e4b40e0c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/BootCompletedReceiver.kt +++ b/app/src/main/kotlin/org/fossify/clock/receivers/BootCompletedReceiver.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.clock.receivers +package org.fossify.clock.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.clock.extensions.rescheduleEnabledAlarms +import org.fossify.clock.extensions.rescheduleEnabledAlarms class BootCompletedReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/DismissAlarmReceiver.kt b/app/src/main/kotlin/org/fossify/clock/receivers/DismissAlarmReceiver.kt similarity index 81% rename from app/src/main/kotlin/com/simplemobiletools/clock/receivers/DismissAlarmReceiver.kt rename to app/src/main/kotlin/org/fossify/clock/receivers/DismissAlarmReceiver.kt index 76e8ecdc..8bf5076c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/DismissAlarmReceiver.kt +++ b/app/src/main/kotlin/org/fossify/clock/receivers/DismissAlarmReceiver.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.clock.receivers +package org.fossify.clock.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.clock.extensions.* -import com.simplemobiletools.clock.helpers.ALARM_ID -import com.simplemobiletools.clock.helpers.NOTIFICATION_ID -import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.commons.extensions.removeBit -import com.simplemobiletools.commons.helpers.ensureBackgroundThread +import org.fossify.clock.extensions.* +import org.fossify.clock.helpers.ALARM_ID +import org.fossify.clock.helpers.NOTIFICATION_ID +import org.fossify.clock.models.Alarm +import org.fossify.commons.extensions.removeBit +import org.fossify.commons.helpers.ensureBackgroundThread import java.util.Calendar import kotlin.math.pow diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/EarlyAlarmDismissalReceiver.kt b/app/src/main/kotlin/org/fossify/clock/receivers/EarlyAlarmDismissalReceiver.kt similarity index 75% rename from app/src/main/kotlin/com/simplemobiletools/clock/receivers/EarlyAlarmDismissalReceiver.kt rename to app/src/main/kotlin/org/fossify/clock/receivers/EarlyAlarmDismissalReceiver.kt index 00909356..6db52dab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/EarlyAlarmDismissalReceiver.kt +++ b/app/src/main/kotlin/org/fossify/clock/receivers/EarlyAlarmDismissalReceiver.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.receivers +package org.fossify.clock.receivers import android.app.Notification import android.app.NotificationChannel @@ -7,14 +7,14 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import androidx.core.app.NotificationCompat -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.extensions.getClosestEnabledAlarmString -import com.simplemobiletools.clock.extensions.getDismissAlarmPendingIntent -import com.simplemobiletools.clock.extensions.getOpenAlarmTabIntent -import com.simplemobiletools.clock.helpers.ALARM_ID -import com.simplemobiletools.clock.helpers.EARLY_ALARM_DISMISSAL_CHANNEL_ID -import com.simplemobiletools.clock.helpers.EARLY_ALARM_NOTIF_ID -import com.simplemobiletools.commons.helpers.isOreoPlus +import org.fossify.clock.R +import org.fossify.clock.extensions.getClosestEnabledAlarmString +import org.fossify.clock.extensions.getDismissAlarmPendingIntent +import org.fossify.clock.extensions.getOpenAlarmTabIntent +import org.fossify.clock.helpers.ALARM_ID +import org.fossify.clock.helpers.EARLY_ALARM_DISMISSAL_CHANNEL_ID +import org.fossify.clock.helpers.EARLY_ALARM_NOTIF_ID +import org.fossify.commons.helpers.isOreoPlus class EarlyAlarmDismissalReceiver : BroadcastReceiver() { @@ -48,7 +48,7 @@ class EarlyAlarmDismissalReceiver : BroadcastReceiver() { .setContentText(alarmString) .setSmallIcon(R.drawable.ic_alarm_vector) .setPriority(Notification.PRIORITY_LOW) - .addAction(0, context.getString(com.simplemobiletools.commons.R.string.dismiss), dismissIntent) + .addAction(0, context.getString(org.fossify.commons.R.string.dismiss), dismissIntent) .setContentIntent(contentIntent) .setSound(null) .setAutoCancel(true) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideAlarmReceiver.kt b/app/src/main/kotlin/org/fossify/clock/receivers/HideAlarmReceiver.kt similarity index 65% rename from app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideAlarmReceiver.kt rename to app/src/main/kotlin/org/fossify/clock/receivers/HideAlarmReceiver.kt index 1b0fde4c..257f1ec5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideAlarmReceiver.kt +++ b/app/src/main/kotlin/org/fossify/clock/receivers/HideAlarmReceiver.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.clock.receivers +package org.fossify.clock.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.clock.extensions.dbHelper -import com.simplemobiletools.clock.extensions.deleteNotificationChannel -import com.simplemobiletools.clock.extensions.hideNotification -import com.simplemobiletools.clock.extensions.updateWidgets -import com.simplemobiletools.clock.helpers.ALARM_ID -import com.simplemobiletools.clock.helpers.ALARM_NOTIFICATION_CHANNEL_ID -import com.simplemobiletools.commons.helpers.ensureBackgroundThread +import org.fossify.clock.extensions.dbHelper +import org.fossify.clock.extensions.deleteNotificationChannel +import org.fossify.clock.extensions.hideNotification +import org.fossify.clock.extensions.updateWidgets +import org.fossify.clock.helpers.ALARM_ID +import org.fossify.clock.helpers.ALARM_NOTIFICATION_CHANNEL_ID +import org.fossify.commons.helpers.ensureBackgroundThread class HideAlarmReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideTimerReceiver.kt b/app/src/main/kotlin/org/fossify/clock/receivers/HideTimerReceiver.kt similarity index 61% rename from app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideTimerReceiver.kt rename to app/src/main/kotlin/org/fossify/clock/receivers/HideTimerReceiver.kt index 2207f3eb..14a13052 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideTimerReceiver.kt +++ b/app/src/main/kotlin/org/fossify/clock/receivers/HideTimerReceiver.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.clock.receivers +package org.fossify.clock.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.clock.extensions.hideTimerNotification -import com.simplemobiletools.clock.helpers.INVALID_TIMER_ID -import com.simplemobiletools.clock.helpers.TIMER_ID -import com.simplemobiletools.clock.models.TimerEvent +import org.fossify.clock.extensions.hideTimerNotification +import org.fossify.clock.helpers.INVALID_TIMER_ID +import org.fossify.clock.helpers.TIMER_ID +import org.fossify.clock.models.TimerEvent import org.greenrobot.eventbus.EventBus class HideTimerReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/UpdateWidgetReceiver.kt b/app/src/main/kotlin/org/fossify/clock/receivers/UpdateWidgetReceiver.kt similarity index 70% rename from app/src/main/kotlin/com/simplemobiletools/clock/receivers/UpdateWidgetReceiver.kt rename to app/src/main/kotlin/org/fossify/clock/receivers/UpdateWidgetReceiver.kt index 4baab399..05a68067 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/UpdateWidgetReceiver.kt +++ b/app/src/main/kotlin/org/fossify/clock/receivers/UpdateWidgetReceiver.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.clock.receivers +package org.fossify.clock.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.clock.extensions.updateWidgets +import org.fossify.clock.extensions.updateWidgets class UpdateWidgetReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/app/src/main/kotlin/org/fossify/clock/services/SnoozeService.kt b/app/src/main/kotlin/org/fossify/clock/services/SnoozeService.kt new file mode 100644 index 00000000..9b4024b4 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/clock/services/SnoozeService.kt @@ -0,0 +1,19 @@ +package org.fossify.clock.services + +import android.app.IntentService +import android.content.Intent +import org.fossify.clock.extensions.config +import org.fossify.clock.extensions.dbHelper +import org.fossify.clock.extensions.hideNotification +import org.fossify.clock.extensions.setupAlarmClock +import org.fossify.clock.helpers.ALARM_ID +import org.fossify.commons.helpers.MINUTE_SECONDS + +class SnoozeService : IntentService("Snooze") { + override fun onHandleIntent(intent: Intent?) { + val id = intent!!.getIntExtra(ALARM_ID, -1) + val alarm = dbHelper.getAlarmWithId(id) ?: return + hideNotification(id) + setupAlarmClock(alarm, config.snoozeTime * MINUTE_SECONDS) + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/services/StopwatchService.kt b/app/src/main/kotlin/org/fossify/clock/services/StopwatchService.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/clock/services/StopwatchService.kt rename to app/src/main/kotlin/org/fossify/clock/services/StopwatchService.kt index ffb3871c..3267614e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/services/StopwatchService.kt +++ b/app/src/main/kotlin/org/fossify/clock/services/StopwatchService.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.services +package org.fossify.clock.services import android.app.NotificationChannel import android.app.NotificationManager @@ -11,15 +11,15 @@ import android.os.Looper import androidx.core.app.NotificationCompat import androidx.core.app.ServiceCompat import androidx.core.content.ContextCompat -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.extensions.getFormattedDuration -import com.simplemobiletools.clock.extensions.getOpenStopwatchTabIntent -import com.simplemobiletools.clock.helpers.STOPWATCH_RUNNING_NOTIF_ID -import com.simplemobiletools.clock.helpers.Stopwatch -import com.simplemobiletools.clock.helpers.Stopwatch.State -import com.simplemobiletools.clock.helpers.Stopwatch.UpdateListener -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.helpers.isOreoPlus +import org.fossify.clock.R +import org.fossify.clock.extensions.getFormattedDuration +import org.fossify.clock.extensions.getOpenStopwatchTabIntent +import org.fossify.clock.helpers.STOPWATCH_RUNNING_NOTIF_ID +import org.fossify.clock.helpers.Stopwatch +import org.fossify.clock.helpers.Stopwatch.State +import org.fossify.clock.helpers.Stopwatch.UpdateListener +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.helpers.isOreoPlus import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -67,7 +67,7 @@ class StopwatchService : Service() { private fun getServiceNotificationBuilder( title: String, - contentText: String + contentText: String, ): NotificationCompat.Builder { val channelId = "simple_alarm_stopwatch" val label = getString(R.string.stopwatch) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt b/app/src/main/kotlin/org/fossify/clock/services/TimerService.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt rename to app/src/main/kotlin/org/fossify/clock/services/TimerService.kt index b94e7c72..18afb4ac 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt +++ b/app/src/main/kotlin/org/fossify/clock/services/TimerService.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.clock.services +package org.fossify.clock.services import android.app.Notification import android.app.NotificationChannel @@ -11,16 +11,16 @@ import android.os.IBinder import android.os.Looper import androidx.core.app.NotificationCompat import androidx.core.content.ContextCompat -import com.simplemobiletools.clock.R -import com.simplemobiletools.clock.extensions.getFormattedDuration -import com.simplemobiletools.clock.extensions.getOpenTimerTabIntent -import com.simplemobiletools.clock.extensions.timerHelper -import com.simplemobiletools.clock.helpers.INVALID_TIMER_ID -import com.simplemobiletools.clock.helpers.TIMER_RUNNING_NOTIF_ID -import com.simplemobiletools.clock.models.TimerEvent -import com.simplemobiletools.clock.models.TimerState -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.helpers.isOreoPlus +import org.fossify.clock.R +import org.fossify.clock.extensions.getFormattedDuration +import org.fossify.clock.extensions.getOpenTimerTabIntent +import org.fossify.clock.extensions.timerHelper +import org.fossify.clock.helpers.INVALID_TIMER_ID +import org.fossify.clock.helpers.TIMER_RUNNING_NOTIF_ID +import org.fossify.clock.models.TimerEvent +import org.fossify.clock.models.TimerState +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.helpers.isOreoPlus import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/res/drawable-nodpi/img_digital_widget_preview.png b/app/src/main/res/drawable-nodpi/img_digital_widget_preview.png index 773c2d57..eb3c8999 100644 Binary files a/app/src/main/res/drawable-nodpi/img_digital_widget_preview.png and b/app/src/main/res/drawable-nodpi/img_digital_widget_preview.png differ diff --git a/app/src/main/res/drawable-v26/ic_launcher_foreground.xml b/app/src/main/res/drawable-v26/ic_launcher_foreground.xml deleted file mode 100644 index 42d8837e..00000000 --- a/app/src/main/res/drawable-v26/ic_launcher_foreground.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..c59685b8 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml index 259812dd..c59685b8 100644 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -1,3 +1,3 @@ - - + + diff --git a/app/src/main/res/layout/activity_reminder.xml b/app/src/main/res/layout/activity_reminder.xml index 4a143acd..95403643 100644 --- a/app/src/main/res/layout/activity_reminder.xml +++ b/app/src/main/res/layout/activity_reminder.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/dialog_edit_time_zone.xml b/app/src/main/res/layout/dialog_edit_time_zone.xml index 837ae83f..45640279 100644 --- a/app/src/main/res/layout/dialog_edit_time_zone.xml +++ b/app/src/main/res/layout/dialog_edit_time_zone.xml @@ -7,7 +7,7 @@ android:orientation="vertical" android:padding="@dimen/activity_margin"> - - + - - + diff --git a/app/src/main/res/layout/dialog_edit_timer.xml b/app/src/main/res/layout/dialog_edit_timer.xml index 50f4800a..57c8c1a1 100644 --- a/app/src/main/res/layout/dialog_edit_timer.xml +++ b/app/src/main/res/layout/dialog_edit_timer.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/activity_margin"> - - - - - + diff --git a/app/src/main/res/layout/dialog_my_time_picker.xml b/app/src/main/res/layout/dialog_my_time_picker.xml index e69f7b22..32819500 100644 --- a/app/src/main/res/layout/dialog_my_time_picker.xml +++ b/app/src/main/res/layout/dialog_my_time_picker.xml @@ -18,7 +18,7 @@ app:np_selectedTextSize="@dimen/big_text_size" app:np_textSize="@dimen/big_text_size" /> - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_alarm.xml b/app/src/main/res/layout/fragment_alarm.xml index b2345d36..2a5e0e97 100644 --- a/app/src/main/res/layout/fragment_alarm.xml +++ b/app/src/main/res/layout/fragment_alarm.xml @@ -1,6 +1,7 @@ @@ -10,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" + tools:listitem="@layout/item_alarm" /> - - - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> - - - - - - - - + tools:text="GMT-11:00 Midway" /> - + android:gravity="center" /> diff --git a/app/src/main/res/layout/item_alarm.xml b/app/src/main/res/layout/item_alarm.xml index d266985a..9edabf0e 100644 --- a/app/src/main/res/layout/item_alarm.xml +++ b/app/src/main/res/layout/item_alarm.xml @@ -1,67 +1,65 @@ - + android:foreground="@drawable/selector" + android:paddingHorizontal="@dimen/activity_margin" + android:paddingVertical="@dimen/medium_margin"> - + android:ellipsize="end" + android:includeFontPadding="false" + android:maxLines="1" + android:textSize="@dimen/alarm_text_size" + app:layout_constraintEnd_toStartOf="@id/alarm_switch" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="07:00" /> - + - + - + - - - - + diff --git a/app/src/main/res/layout/item_lap.xml b/app/src/main/res/layout/item_lap.xml index 4e4a0bf0..0cbc79c0 100644 --- a/app/src/main/res/layout/item_lap.xml +++ b/app/src/main/res/layout/item_lap.xml @@ -1,6 +1,5 @@ - - + tools:text="1" /> - + tools:text="0.00" /> - + tools:text="0.00" /> diff --git a/app/src/main/res/layout/item_radio_button.xml b/app/src/main/res/layout/item_radio_button.xml index 7564eeac..ae860c2a 100644 --- a/app/src/main/res/layout/item_radio_button.xml +++ b/app/src/main/res/layout/item_radio_button.xml @@ -1,8 +1,7 @@ - + android:paddingTop="@dimen/activity_margin" + android:paddingBottom="@dimen/activity_margin" /> diff --git a/app/src/main/res/layout/item_time_zone.xml b/app/src/main/res/layout/item_time_zone.xml index d03ed721..5889d583 100644 --- a/app/src/main/res/layout/item_time_zone.xml +++ b/app/src/main/res/layout/item_time_zone.xml @@ -1,6 +1,5 @@ - - + tools:text="GMT-11:00 Midway" /> - + tools:text="11:00" /> - + tools:text="Mon, 1 January" /> diff --git a/app/src/main/res/layout/item_timer.xml b/app/src/main/res/layout/item_timer.xml index c023037d..e2b3c5d5 100644 --- a/app/src/main/res/layout/item_timer.xml +++ b/app/src/main/res/layout/item_timer.xml @@ -29,7 +29,7 @@ app:layout_constraintTop_toTopOf="parent" tools:text="00:00" /> - - - + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="never" /> - - + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml index b9bf82a7..7b4ef572 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml index fe4c0f72..c8173849 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml index 794a0ba8..e5ae9a17 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml index 213d4eca..6c1d2603 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml index 9958c2c4..cc384dc6 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml index 8390cf09..5250a44f 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml index 80e20d58..81ba15b5 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml index 968374cf..c0477c1e 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml index 791c1a46..20f9f44a 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml index c559382f..dd752f85 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml index cb8e9f0f..eee16d21 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml index 77975833..cfe22da4 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml similarity index 60% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml index b73af9bd..af5af0b1 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml @@ -1,6 +1,6 @@ - - + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml index a6163778..00a28a52 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml index c0ce2da8..8c55541a 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml index 64e53a68..f500e3c1 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml index 17b0961f..64fd7f8b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml index 044ebd10..74726f57 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index f3d10971..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..83b930f6 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png deleted file mode 100644 index bb686f85..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..47a40e58 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png deleted file mode 100644 index f22bfcf0..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..c9ff363b Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png deleted file mode 100644 index 6c52a69e..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..8a6cea4e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png deleted file mode 100644 index 726953b4..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..dba6247e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png deleted file mode 100644 index b30c3aa3..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..392af6a9 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 274beaf6..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..ec5acec8 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png deleted file mode 100644 index 014e90c1..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..937905b3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 23329f99..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green.png deleted file mode 100644 index 08f19331..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png deleted file mode 100644 index b9c780aa..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..08e8773e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png deleted file mode 100644 index cfcaa6cb..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..692d7259 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png deleted file mode 100644 index 42f950e3..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..dd105fb9 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png deleted file mode 100644 index df319f62..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..a576cb36 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png deleted file mode 100644 index b9f84302..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..92347c3f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..94de55a6 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png deleted file mode 100644 index c213802c..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..afba0e5d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png deleted file mode 100644 index ceda30ce..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..900df5f2 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red.png deleted file mode 100644 index 0f9fe822..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp new file mode 100644 index 00000000..1a23a4f0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png deleted file mode 100644 index e72fdb79..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..54db34b3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png deleted file mode 100644 index 9fd829e3..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..5bd95de0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..739421b7 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..ebc4bcbd Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..8eabb671 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..bc5890d3 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..58d04f3c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..a5a5fbcf Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..d484b61f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..139c0dbe Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..2a5f11af Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..376fc1b3 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..844a1940 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..ea3ff450 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..81330f80 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..b30ceb9c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..2cc23205 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..7b3e8b64 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp new file mode 100644 index 00000000..b0c76837 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..00d34f34 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..1441db20 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 6e55f1d9..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..eccf28bb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png deleted file mode 100644 index 37e4887c..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..0a53a39b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png deleted file mode 100644 index 9ebed973..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..d6cf803d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index 58362819..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..6674203a Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png deleted file mode 100644 index e286ab7e..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..4f08fdab Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png deleted file mode 100644 index 71015037..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..7c48f77c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 5102121e..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..cec89832 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index 3755d6bd..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..b02a11ca Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 8f7d4564..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png deleted file mode 100644 index 8c90e1e8..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png deleted file mode 100644 index 49a7eba0..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..aefb4487 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png deleted file mode 100644 index e25f0cb4..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..07bcb371 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png deleted file mode 100644 index 1b4f673a..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..ade5aeaf Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png deleted file mode 100644 index 4ad57c33..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..c5d01ba0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png deleted file mode 100644 index 4d6fb1b3..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..53dcbf65 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..1c06f2d0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png deleted file mode 100644 index 8ace1627..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..46ab2013 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png deleted file mode 100644 index 83ba28dd..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..122d1b64 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png deleted file mode 100644 index 6dcf04bd..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..298b3901 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png deleted file mode 100644 index 10a5d116..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..d260d6f9 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png deleted file mode 100644 index e2cba778..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..801ca75c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index b41bdd8d..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..ad4ece62 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png deleted file mode 100644 index 7ac14b2f..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..49f4d0c7 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png deleted file mode 100644 index 5b68bb0b..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..2ae71e71 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index 1501fb05..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..df160660 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png deleted file mode 100644 index 1d0321bf..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..cc12990c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png deleted file mode 100644 index 7528ec80..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..4a0cc3d1 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 760995f2..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..042b7cbd Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index d1a6c5e9..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..694945ee Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 5f0ad198..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png deleted file mode 100644 index 425ccc8b..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png deleted file mode 100644 index cc4cc6fe..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..8e9ea5d3 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png deleted file mode 100644 index b8a69337..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..a0a65157 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png deleted file mode 100644 index 8d7112bb..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..fddab2f3 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png deleted file mode 100644 index 1181e6e2..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..bbebc44c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png deleted file mode 100644 index 07bf88c7..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..f5657057 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..9d874380 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png deleted file mode 100644 index 9b8af04d..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..9dcea60b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png deleted file mode 100644 index 84b0e067..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..62ff19b4 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png deleted file mode 100644 index e90169b8..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..26aeedbd Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png deleted file mode 100644 index eabb7d48..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..d86587b9 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png deleted file mode 100644 index c00e5b9e..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..e405b61d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 172690ff..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..eb2b7f70 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png deleted file mode 100644 index 387cc271..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp new file mode 100644 index 00000000..6e7e492e Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png deleted file mode 100644 index e46eab4e..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp new file mode 100644 index 00000000..5085baf3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png deleted file mode 100644 index a6ec58e2..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp new file mode 100644 index 00000000..4b3dacf8 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png deleted file mode 100644 index 2e491f85..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp new file mode 100644 index 00000000..f3dc45ea Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png deleted file mode 100644 index ac698dde..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp new file mode 100644 index 00000000..08791cfd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png deleted file mode 100644 index 657b3c97..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp new file mode 100644 index 00000000..2215af6d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png deleted file mode 100644 index 3514e7b0..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp new file mode 100644 index 00000000..1f5a1a74 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index ec9276c0..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png deleted file mode 100644 index cd974d16..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png deleted file mode 100644 index fad747a2..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp new file mode 100644 index 00000000..bdf34f3b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png deleted file mode 100644 index 115a9f15..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp new file mode 100644 index 00000000..b6dc8b0c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png deleted file mode 100644 index f50973a6..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp new file mode 100644 index 00000000..ba476021 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png deleted file mode 100644 index c60ba8f9..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp new file mode 100644 index 00000000..b21a69a5 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png deleted file mode 100644 index eed95aec..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp new file mode 100644 index 00000000..8e19e1e6 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp new file mode 100644 index 00000000..dc7793ce Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png deleted file mode 100644 index 6c6faf64..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp new file mode 100644 index 00000000..b48a8272 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png deleted file mode 100644 index 1de503f6..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp new file mode 100644 index 00000000..d6fa1cc7 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png deleted file mode 100644 index 8ddefd82..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp new file mode 100644 index 00000000..eeb6d55a Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png deleted file mode 100644 index a2c2acce..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp new file mode 100644 index 00000000..837f6785 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png deleted file mode 100644 index f7b811ef..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp new file mode 100644 index 00000000..535495c1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp differ diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 7bd9dd88..decd87f9 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -1,6 +1,5 @@ - Sadə Saat Saat Vaxt zonası Titrət @@ -20,4 +19,4 @@ Sayğaç bölməsi Saniyələri göstər Səsi aramla yüksəlt - + diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 65536dc6..66038f3b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,6 +1,5 @@ - Обикновен Часовник Часовник Времева зона Вибрация @@ -48,4 +47,4 @@ Просто кликнете на някоя от колонките, това ще ги сортира по тази колонка. С допълнителни кликвания можете да превключвате между възходящо и низходящо сортиране. Добавяне на таймер Добавяне на аларма - \ No newline at end of file + diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index e22d7fd2..44f79b0b 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -47,4 +47,4 @@ Afegeix un temporitzador Rellotge Afegeix una alarma - \ No newline at end of file + diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-cr/strings.xml b/app/src/main/res/values-cr/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-cr/strings.xml +++ b/app/src/main/res/values-cr/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f8d440fd..8cec438a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,6 +1,5 @@ - Jednoduché hodiny Hodiny Časové pásmo Vibrovat diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 593c8826..75cf899e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -18,5 +18,4 @@ Vis sekunder Hvordan kan jeg ændre sortering af mellemtider i stopuret? Klik på den kolonne der skal sorteres efter. Med flere klik kan du skifte mellem stigende og faldende rækkefølge. - Simpelt Ur - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bb72b677..dd8627dd 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,5 @@ - Fossify Clock Uhr Zeitzone Vibration @@ -46,6 +45,4 @@ Ansteigende Lautstärke Wie kann die Sortierung der Laschen der Stoppuhr geändert werden? Einfach auf eine der Spalten klicken, das wird die Sortierung entsprechend der Spalte anpassen. Weitere Klicks schalten zwischen auf- und absteigender Sortierung um. - Timer - Timer - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 131805c1..75af95e4 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1,6 +1,5 @@ - Απλό Ρολόι Ρολόι Ζώνη ώρας Δόνηση diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-en-rIN/strings.xml b/app/src/main/res/values-en-rIN/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-en-rIN/strings.xml +++ b/app/src/main/res/values-en-rIN/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 0d425090..0575e06e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,6 +1,5 @@ - Simple Clock Reloj Zona horaria Vibrar diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 61f1f446..b41af8ec 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -1,6 +1,5 @@ - Lihtne kell Kell Ajavöönd Vibreeri @@ -48,4 +47,4 @@ Kuidas ma saan stopperis muuta ringiaegade sortimist\? Klõpsi veerul ja sellega määrad, et sortimine toimub selle veeru alusel. Mitme klõpsuga saad vahetada, kas sortimine toimub kasvavas või kahanevas suunas. Kell - \ No newline at end of file + diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index dc82325c..13b21fc0 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -1,6 +1,5 @@ - Ordulari sinplea Ordularia Ordu eremua Bibratu @@ -48,4 +47,4 @@ Nola alda dezaket biren ordena kronometroaren fitxan\? Sakatu zutaberen bat, birak zutabe horren arabera ordenatzeko. Gehiagotan sakatuz ordena gorakor edo beherakorrean sailka dezakezu. Erlojua - \ No newline at end of file + diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 8502995a..6bbf5bbf 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1,6 +1,5 @@ - Yksinkertainen kello Kello Aikavyöhyke Värinä diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ce0e33a7..a9a3b865 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,6 +1,5 @@ - Fossify Clock Horloge Fuseau horaire Vibrer @@ -49,4 +48,4 @@ Augmenter progressivement le volume Comment puis-je modifier le tri des tours dans l\'onglet chronomètre \? Cliquez simplement sur l’une des colonnes afin de trier les tours selon la colonne donnée. Par des clics supplémentaires, vous basculerez entre les tris croissant et décroissant. - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 3d667876..18c1e2c6 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -1,6 +1,5 @@ - Reloxo Simple Reloxo Franxa horaria Vibrar diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c3d551db..b8a67667 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1,7 +1,6 @@ टाइमर - Fossify Clock घड़ी समय क्षेत्र कंपन @@ -48,4 +47,4 @@ टाइमर टैब सेकंड दिखाएँ मैं स्टॉपवॉच टैब पर लैप सॉर्टिंग कैसे बदल सकता हूं? - \ No newline at end of file + diff --git a/app/src/main/res/values-hi@hinglish/strings.xml b/app/src/main/res/values-hi@hinglish/strings.xml deleted file mode 100644 index a6b3daec..00000000 --- a/app/src/main/res/values-hi@hinglish/strings.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index f2522e20..4b1a5b91 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -1,12 +1,10 @@ - Jednostavni sat Sat Vremenska zona Vibriraj Nije odabran nijedan dan Sat - Timer Štoperica Pokreni štopericu Runda @@ -49,4 +47,4 @@ Odaberi alarm za odbacivanje Alarm je stvoren Odaberi timer za odbacivanje - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index fab21c1c..80bbc49a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -47,5 +47,4 @@ Válassza ki az elvetendő ébresztést Ébresztés létrehozva Korai ébresztéselvetés - Egyszerű Óra - \ No newline at end of file + diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 168138d2..bf57cf56 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,6 +1,5 @@ - Orologio Semplice Orologio Fuso orario Vibrazione diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index cf83f781..2bfb0293 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -1,6 +1,5 @@ - שעון פשוט שעון אזור זמן לנדנד diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 45e6d044..483b6c2d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,6 +1,5 @@ - Simple 時計 時計 タイムゾーン バイブレーション diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 626347a6..208c134c 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1,6 +1,5 @@ - Paprastas Laikrodis Laikrodis Laiko juosta Vibruoti diff --git a/app/src/main/res/values-ltg/strings.xml b/app/src/main/res/values-ltg/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-ltg/strings.xml +++ b/app/src/main/res/values-ltg/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 623ddc58..5e3d193b 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -1,6 +1,5 @@ - സിമ്പിൾ ക്ലോക്ക് ക്ലോക്ക് സമയ മേഖല വൈബ്രേറ്റുചെയ്യുക diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index 4b7532b2..8419e4c6 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -1,6 +1,5 @@ - ရိုးရှင်း နာရီ နာရီ အချိန် ဇုန် တုန်ခါမှု diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 51bb05bb..373bfa3e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,6 +1,5 @@ - Eenvoudige Klok Klok Tijdzone Trillen @@ -46,6 +45,4 @@ Volume geleidelijk verhogen Hoe kan ik rondetijden sorteren in de stopwatch? Klik op een van de kolommen om de rondetijden te sorteren op basis van die kolom. Klik nogmaals op dezelfde kolom om de sorteervolgorde om te keren. - Stopwatch - Timer - \ No newline at end of file + diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-or/strings.xml +++ b/app/src/main/res/values-or/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 446d2345..0601ed83 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -2,7 +2,6 @@ گھڑی نواں سماں والا - سادی گھڑی گھڑی سماں کھیتر کوئی دن نہیں چݨے اے @@ -31,4 +30,4 @@ سماں والے دی ٹیب سکنٹ ویکھو ہولی ہولی آواز ودھاؤ - + diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-pa/strings.xml +++ b/app/src/main/res/values-pa/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 55d12020..2f42fddb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,6 +1,5 @@ - Prosty zegar Zegar Strefa czasowa Wibracja diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b496a158..c039c473 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,6 +1,5 @@ - Relógio simples Relógio Fuso horário Vibrar @@ -49,4 +48,4 @@ Alarme criado Descarte antecipado de alarme Selecione o temporizador para descartar - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 076c484b..ad463d37 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,6 +1,5 @@ - Relógio Relógio Fuso horário Vibrar @@ -49,4 +48,4 @@ Como posso alterar a ordem das voltas no Cronómetro\? Basta clicar em qualquer uma das colunas e isso fará com que as voltas sejam ordenadas pela coluna especificada. Com cliques adicionais, pode alternar a ordem de entre crescente e decrescente. Descartar alarme cedo - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 855f8a39..444e31f9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,6 +1,5 @@ - Ceas simplu Ceas Fus Orar Vibrează @@ -49,4 +48,4 @@ Selectează temporizatorul pentru a anula Selectează alama pentru a anula Anulare alarmă timpurie - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8fcef8ab..37499fbd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,6 +1,5 @@ - Простые часы Часы Часовой пояс Вибрация diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-sat/strings.xml +++ b/app/src/main/res/values-sat/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index cb98423a..5ddf0944 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -1,6 +1,5 @@ - Jednoduché hodinky Hodinky Časové pásmo Vibrovanie diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index f5e4ae2d..3cddd978 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -1,6 +1,5 @@ - Enostavna ura Ura Časovne cone Vibrirati diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 69622533..2f0a19fc 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -5,7 +5,6 @@ Сат Штоперица Круг - Једноставан сат Сат Временска зона Вибрирај diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 19d722cb..b3dd0b91 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1,6 +1,5 @@ - Enkel Klocka Klocka Tidszon Vibrera @@ -47,5 +46,4 @@ Höj volymen gradvis Hur kan jag ändra sortering av varv i fliken stoppur\? Klicka bara på någon av kolumnerna för att sortera varven efter den aktuella kolumnen. Med ytterligare klick kan du växla mellan stigande och fallande sortering. - Timer - \ No newline at end of file + diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 32303e60..108681f2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,6 +1,5 @@ - Basit Saat Saat Saat dilimi Titret diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e75e33d5..c2d65623 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,6 +1,5 @@ - Простий Годинник Годинник Часовий пояс Вібрувати diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 148bbbb0..1968a289 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,7 +1,6 @@ Đồng hồ - Đồng hồ Fossify Không có ngày nào được chọn Đồng hồ bấm giờ đã bị dừng Vuốt sang phải để Loại bỏ hoặc sang trái để Tạm ẩn. @@ -47,4 +46,4 @@ Hiển thị giây Tăng âm lượng dần dần Làm cách nào tôi có thể thay đổi cách sắp xếp vòng ở danh mục đồng hồ bấm giờ? - \ No newline at end of file + diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 7fa880f1..8101f61f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,6 +1,5 @@ - 简单时钟 时钟 时区 震动 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a6b3daec..3ea04e70 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 246ccb13..30be952a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,6 +1,5 @@ - 簡易時鐘 簡易時鐘 時區 震動 diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 3526c3fc..3e4c4796 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,3 +1,4 @@ - com.simplemobiletools.clock + org.fossify.clock + Fossify Clock diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2b82e57a..1bcde8ab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,5 @@ - Simple Clock Clock Time zone Vibrate diff --git a/app/src/main/res/xml/widget_analogue_clock_info.xml b/app/src/main/res/xml/widget_analogue_clock_info.xml index c3f0c727..b5ca6c8d 100644 --- a/app/src/main/res/xml/widget_analogue_clock_info.xml +++ b/app/src/main/res/xml/widget_analogue_clock_info.xml @@ -1,6 +1,6 @@ false - true - true + false + false true diff --git a/fastlane/Appfile b/fastlane/Appfile index b60a851c..d2b9ef78 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ json_key_file("fastlane/fastlane.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("com.simplemobiletools.clock") # e.g. com.krausefx.app +package_name("org.fossify.clock") # e.g. com.krausefx.app diff --git a/fastlane/metadata/android/cs-CZ/changelogs/33.txt b/fastlane/metadata/android/cs-CZ/changelogs/33.txt deleted file mode 100644 index 11a1390d..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/33.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Adding a Get Simple Phone button into the About section - * Added some translation, stability and UX improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/34.txt b/fastlane/metadata/android/cs-CZ/changelogs/34.txt deleted file mode 100644 index 96970719..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/34.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Changed the default digital widget colors to White text on transparent background - * Added some stability and translation improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/35.txt b/fastlane/metadata/android/cs-CZ/changelogs/35.txt deleted file mode 100644 index 517be5ba..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/35.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Added a Start Stopwatch shortcut - * Added some translation, stability and UX improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/36.txt b/fastlane/metadata/android/cs-CZ/changelogs/36.txt deleted file mode 100644 index 7d2a4cf4..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/36.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Use Material You theme by default on Android 12+ - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/37.txt b/fastlane/metadata/android/cs-CZ/changelogs/37.txt deleted file mode 100644 index 0240bffa..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/37.txt +++ /dev/null @@ -1 +0,0 @@ -* Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/38.txt b/fastlane/metadata/android/cs-CZ/changelogs/38.txt deleted file mode 100644 index 28c0c325..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/38.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Allow dismissing upcoming alarms early - * Fixed wrong alarm being shown as next in some cases - * Fixed duplicate alarm sound on some devices - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/39.txt b/fastlane/metadata/android/cs-CZ/changelogs/39.txt deleted file mode 100644 index 28c0c325..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/39.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Allow dismissing upcoming alarms early - * Fixed wrong alarm being shown as next in some cases - * Fixed duplicate alarm sound on some devices - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40.txt b/fastlane/metadata/android/cs-CZ/changelogs/40.txt deleted file mode 100644 index f3455612..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/40.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Fixed some alarm related glitches - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/41.txt b/fastlane/metadata/android/cs-CZ/changelogs/41.txt deleted file mode 100644 index f3455612..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/41.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Fixed some alarm related glitches - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/cs-CZ/changelogs/42.txt b/fastlane/metadata/android/cs-CZ/changelogs/42.txt deleted file mode 100644 index f3455612..00000000 --- a/fastlane/metadata/android/cs-CZ/changelogs/42.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Fixed some alarm related glitches - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/cs-CZ/short_description.txt b/fastlane/metadata/android/cs-CZ/short_description.txt deleted file mode 100644 index 28c4d9da..00000000 --- a/fastlane/metadata/android/cs-CZ/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Kombinace nádherného widgetu s hodinami, budíku, stopek a časovače diff --git a/fastlane/metadata/android/cs-CZ/title.txt b/fastlane/metadata/android/cs-CZ/title.txt deleted file mode 100644 index 4c7818ff..00000000 --- a/fastlane/metadata/android/cs-CZ/title.txt +++ /dev/null @@ -1 +0,0 @@ -Jednoduché hodiny diff --git a/fastlane/metadata/android/da-DK/short_description.txt b/fastlane/metadata/android/da-DK/short_description.txt deleted file mode 100644 index a7921ef5..00000000 --- a/fastlane/metadata/android/da-DK/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Kombination af en smuk ur-widget, vækkeur, stopur, timer diff --git a/fastlane/metadata/android/da-DK/title.txt b/fastlane/metadata/android/da-DK/title.txt deleted file mode 100644 index efd23752..00000000 --- a/fastlane/metadata/android/da-DK/title.txt +++ /dev/null @@ -1 +0,0 @@ -Simpelt Ur diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt deleted file mode 100644 index e824e040..00000000 --- a/fastlane/metadata/android/de-DE/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Kombination aus schönem Uhren-Widget, Wecker, Stoppuhr, Timer diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt deleted file mode 100644 index 16fe316b..00000000 --- a/fastlane/metadata/android/de-DE/title.txt +++ /dev/null @@ -1 +0,0 @@ -Fossify Clock diff --git a/fastlane/metadata/android/en-US/changelogs/33.txt b/fastlane/metadata/android/en-US/changelogs/33.txt deleted file mode 100644 index 709c9f70..00000000 --- a/fastlane/metadata/android/en-US/changelogs/33.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Adding a Get Simple Phone button into the About section - * Added some translation, stability and UX improvements diff --git a/fastlane/metadata/android/en-US/changelogs/34.txt b/fastlane/metadata/android/en-US/changelogs/34.txt deleted file mode 100644 index aba2371b..00000000 --- a/fastlane/metadata/android/en-US/changelogs/34.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Changed the default digital widget colors to White text on transparent background - * Added some stability and translation improvements diff --git a/fastlane/metadata/android/en-US/changelogs/35.txt b/fastlane/metadata/android/en-US/changelogs/35.txt deleted file mode 100644 index fde0b4e5..00000000 --- a/fastlane/metadata/android/en-US/changelogs/35.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Added a Start Stopwatch shortcut - * Added some translation, stability and UX improvements diff --git a/fastlane/metadata/android/en-US/changelogs/36.txt b/fastlane/metadata/android/en-US/changelogs/36.txt deleted file mode 100644 index bfcc975a..00000000 --- a/fastlane/metadata/android/en-US/changelogs/36.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Use Material You theme by default on Android 12+ - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/en-US/changelogs/37.txt b/fastlane/metadata/android/en-US/changelogs/37.txt deleted file mode 100644 index 17b882fd..00000000 --- a/fastlane/metadata/android/en-US/changelogs/37.txt +++ /dev/null @@ -1 +0,0 @@ - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/en-US/changelogs/38.txt b/fastlane/metadata/android/en-US/changelogs/38.txt deleted file mode 100644 index c6f8fa14..00000000 --- a/fastlane/metadata/android/en-US/changelogs/38.txt +++ /dev/null @@ -1,4 +0,0 @@ - * Allow dismissing upcoming alarms early - * Fixed wrong alarm being shown as next in some cases - * Fixed duplicate alarm sound on some devices - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/en-US/changelogs/39.txt b/fastlane/metadata/android/en-US/changelogs/39.txt deleted file mode 100644 index c6f8fa14..00000000 --- a/fastlane/metadata/android/en-US/changelogs/39.txt +++ /dev/null @@ -1,4 +0,0 @@ - * Allow dismissing upcoming alarms early - * Fixed wrong alarm being shown as next in some cases - * Fixed duplicate alarm sound on some devices - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/en-US/changelogs/40.txt b/fastlane/metadata/android/en-US/changelogs/40.txt deleted file mode 100644 index 8b1c690b..00000000 --- a/fastlane/metadata/android/en-US/changelogs/40.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Fixed some alarm related glitches - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/en-US/changelogs/41.txt b/fastlane/metadata/android/en-US/changelogs/41.txt deleted file mode 100644 index 8b1c690b..00000000 --- a/fastlane/metadata/android/en-US/changelogs/41.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Fixed some alarm related glitches - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/en-US/changelogs/42.txt b/fastlane/metadata/android/en-US/changelogs/42.txt deleted file mode 100644 index 8b1c690b..00000000 --- a/fastlane/metadata/android/en-US/changelogs/42.txt +++ /dev/null @@ -1,2 +0,0 @@ - * Fixed some alarm related glitches - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 9a1dabf0..b929cc30 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,24 +1,32 @@ -This clock app has multiple functions related to timing. It can be used as a clock widget or as a alarm clock. It is made to help you regulate your daily life and sleep better. You can also use the stopwatch in this app to count your time when you are running for healthy lifestyle or for any other purpose. This app can also be placed on your home screen for easy navigation. +Introducing Fossify Clock – the ultimate timekeeping companion designed to enhance your daily routines and promote better sleep habits. With a multitude of functions tailored to your needs, Fossify Clock seamlessly integrates into your life, offering unparalleled convenience and versatility. -As a clock widget you can enable displaying times from other time zones, or use the simple, but customizable and resizable clock widget. The text color of the clock widget can be customized, as well as the color and the alpha of the background. You can also change the shape of clock widget according to your choice and show it on the home screen. +⌚ MULTIFUNCTIONAL TIMEKEEPING: +Experience the power of versatile time management with Fossify Clock. From serving as a clock widget to functioning as an alarm clock and stopwatch, this app is your go-to tool for regulating your daily activities and improving your overall lifestyle. -The alarm contains all the expected features as day selecting, vibration toggling, ringtone selecting, snooze or adding a custom label. Waking up will be a pleasure. It supports as many alarms as you want, so there won't be any more excuses for not waking up and sleep better :) Gradual volume increasing is supported too, enabled by default. A customizable Snooze button is available too, just in case you really had a good reason for using it. The alarm clock provided by this app as simple as it can get. You simply have to add how many times you want and turn them on. During this, you can also take help from a guide built in this alarm clock app to help you navigate through this app to sleep better. You can sleep better so this app can wake you up on the set time without disturbing your lifestyle. This alarm can be placed on the home screen to make it easy for you to access the alarm while you can work on other things on your device. The main goal of keeping the alarm in this clock widget is to help you schedule your time more effectively. +⏰ FEATURE-RICH ALARM: +Wake up refreshed with Fossify Clock's comprehensive alarm features. Set multiple alarms with options like day selection, vibration toggle, custom labels and ringtone customization. Enjoy gradual volume increase and a customizable snooze button for a pleasant waking experience. With a user-friendly interface, setting up alarms has never been easier. -With the stopwatch you can easily measure a longer period of time, or individual laps. You can sort the laps in a few different ways. It contains optional vibrations on button presses too, just to let you know that the button was pressed in case you cannot look at the device for some reason, or you are in a hurry. This stopwatch can help you getting in shape if you are doing yoga or having a run in the park. You can put the stopwatch on home screen so that you can easily access it and alter it according to your needs without opening the menu and finding it. +⏱️ CONVENIENT STOPWATCH: +Track your activities with precision using Fossify Clock's stopwatch function. Measure longer periods or individual laps effortlessly. You can also sort your laps in ascending or descending order. -You can easily setup a timer to be notified of some events. You can both change its ringtone, or toggle vibrations. You will never burn that pizza again. The timer countdown can be paused too, not just stopped. +⏳ PRECISE TIMER FUNCTIONALITY: +Stay on top of your tasks with Fossify Clock's versatile timer feature. Customize ringtone preferences, toggle vibrations, and pause countdowns to suit your needs. Whether you're timing cooking intervals, managing study sessions, or ensuring timely breaks, Fossify Clock has you covered with precision and ease. -Additional features include for example preventing the device from falling asleep while the app is in foreground or toggling between 12 or 24 hour time format. Last but not least you can decide if the week should start on Sunday, or Monday. +🌈 CLOCK WIDGET WITH CUSTOMIZABLE FEATURES: +Transform your home screen with Fossify Clock's customizable clock widget. Adjust text color, background color, and transparency. Choose between analog or digital clock to suit your style and easily access essential time information at a glance. -It comes with material design and dark theme by default, provides great user experience for easy usage. The lack of internet access gives you more privacy, security and stability than other apps. The dark theme in this clock widget can help you setting your alarm clock at night without blinding your eyes with sharp color of your mobile alarm. +🎨 CUSTOMIZABLE INTERFACE AND THEMES: +Enjoy a personalized experience with Fossify Clock's material design and dark theme options. Tailor the app to your preferences with customizable colors and themes, enhancing usability and reducing eye strain, especially in low-light environments. -Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors. +🔒 PRIVACY-FIRST APPROACH: +Rest assured knowing your privacy is protected with Fossify Clock's offline operation. Experience maximum privacy, security, and stability without sacrificing functionality or convenience. -Check out the full suite of Simple Tools here: -https://www.fossify.org +🌐 AD-FREE & OPEN-SOURCE: +Say goodbye to intrusive ads and unnecessary permissions. Fossify Clock is ad-free, fully open-source, and grants you complete control over your timekeeping experience. -Reddit: -https://www.reddit.com/r/Fossify +Upgrade your time management skills, optimize your routines, and prioritize better sleep with Fossify Clock. Download now and take control of your time like never before. -Telegram: -https://t.me/Fossify +Explore more Fossify apps: https://www.fossify.org +Open-Source Code: https://www.github.com/FossifyOrg +Join the community on Reddit: https://www.reddit.com/r/Fossify +Connect on Telegram: https://t.me/Fossify diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.jpeg b/fastlane/metadata/android/en-US/images/featureGraphic.jpeg deleted file mode 100644 index 8f690691..00000000 Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png new file mode 100644 index 00000000..0e2593fa Binary files /dev/null and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png index 9d2ed96f..cb50e565 100644 Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg deleted file mode 100644 index 934dbc53..00000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png new file mode 100644 index 00000000..3eed9142 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg deleted file mode 100644 index 7a2aab03..00000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png new file mode 100644 index 00000000..45961e13 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg deleted file mode 100644 index e75ad5ef..00000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png new file mode 100644 index 00000000..a6dd93fc Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg deleted file mode 100644 index 0fa5baf7..00000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png new file mode 100644 index 00000000..a633aad9 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png new file mode 100644 index 00000000..5dd97253 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6_en-US.png new file mode 100644 index 00000000..11e42585 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.jpeg deleted file mode 100644 index edbc269a..00000000 Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.jpeg deleted file mode 100644 index 40b0c73f..00000000 Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.jpeg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.jpeg deleted file mode 100644 index edbc269a..00000000 Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png new file mode 100644 index 00000000..a278e619 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.jpeg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.jpeg deleted file mode 100644 index 40b0c73f..00000000 Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.jpeg and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png new file mode 100644 index 00000000..4656a5bc Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/3_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3_en-US.png new file mode 100644 index 00000000..0d7635fc Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4_en-US.png new file mode 100644 index 00000000..363ba6ec Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/5_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/5_en-US.png new file mode 100644 index 00000000..c0c16de9 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/5_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png new file mode 100644 index 00000000..a9e545c3 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/tvBanner.png b/fastlane/metadata/android/en-US/images/tvBanner.png deleted file mode 100644 index fdc214f7..00000000 Binary files a/fastlane/metadata/android/en-US/images/tvBanner.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt index 7d012c14..bbe9238c 100644 --- a/fastlane/metadata/android/en-US/short_description.txt +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -1 +1 @@ -Combination of a beautiful clock widget, alarm clock, stopwatch, timer \ No newline at end of file +Handy, lightweight, open-source clock app with essential features. diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt index 3a365116..16fe316b 100644 --- a/fastlane/metadata/android/en-US/title.txt +++ b/fastlane/metadata/android/en-US/title.txt @@ -1 +1 @@ -Simple Clock \ No newline at end of file +Fossify Clock diff --git a/fastlane/metadata/android/es-ES/changelogs/33.txt b/fastlane/metadata/android/es-ES/changelogs/33.txt deleted file mode 100644 index 4866ff88..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/33.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Añadido un botón Obtener Simple Phone en la sección Acerca de - * Añadido algunas mejoras de traducción, estabilidad y UX diff --git a/fastlane/metadata/android/es-ES/changelogs/34.txt b/fastlane/metadata/android/es-ES/changelogs/34.txt deleted file mode 100644 index 973b986c..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/34.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Cambiados los colores por defecto del widget digital a texto blanco sobre fondo transparente. - * Añadidas algunas mejoras de estabilidad y traducción diff --git a/fastlane/metadata/android/es-ES/changelogs/35.txt b/fastlane/metadata/android/es-ES/changelogs/35.txt deleted file mode 100644 index 8d525f38..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/35.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Añadido un acceso directo al iniciar el cronómetro - * Se han añadido algunas mejoras de traducción, estabilidad y UX diff --git a/fastlane/metadata/android/es-ES/changelogs/36.txt b/fastlane/metadata/android/es-ES/changelogs/36.txt deleted file mode 100644 index a558d236..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/36.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Utilice el tema Material You por defecto en Android 12+ - * Añadido algunas mejoras de interfaz de usuario, traducción y estabilidad diff --git a/fastlane/metadata/android/es-ES/changelogs/37.txt b/fastlane/metadata/android/es-ES/changelogs/37.txt deleted file mode 100644 index d373265d..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/37.txt +++ /dev/null @@ -1 +0,0 @@ -* Se han añadido algunas mejoras en la interfaz de usuario, la traducción y la estabilidad diff --git a/fastlane/metadata/android/es-ES/changelogs/38.txt b/fastlane/metadata/android/es-ES/changelogs/38.txt deleted file mode 100644 index 7c351ac7..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/38.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Permitir descartar alarmas próximas antes de tiempo - * Corregida la alarma incorrecta que aparecía como siguiente en algunos casos. - * Corregido el sonido de alarma duplicado en algunos dispositivos - * Se han añadido algunas mejoras en la interfaz de usuario, la traducción y la estabilidad diff --git a/fastlane/metadata/android/es-ES/changelogs/39.txt b/fastlane/metadata/android/es-ES/changelogs/39.txt deleted file mode 100644 index 7c351ac7..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/39.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Permitir descartar alarmas próximas antes de tiempo - * Corregida la alarma incorrecta que aparecía como siguiente en algunos casos. - * Corregido el sonido de alarma duplicado en algunos dispositivos - * Se han añadido algunas mejoras en la interfaz de usuario, la traducción y la estabilidad diff --git a/fastlane/metadata/android/es-ES/changelogs/40.txt b/fastlane/metadata/android/es-ES/changelogs/40.txt deleted file mode 100644 index 74d48736..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/40.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Corregidos algunos fallos relacionados con las alarmas - * Se han añadido algunas mejoras en la interfaz de usuario, la traducción y la estabilidad diff --git a/fastlane/metadata/android/es-ES/changelogs/41.txt b/fastlane/metadata/android/es-ES/changelogs/41.txt deleted file mode 100644 index 74d48736..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/41.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Corregidos algunos fallos relacionados con las alarmas - * Se han añadido algunas mejoras en la interfaz de usuario, la traducción y la estabilidad diff --git a/fastlane/metadata/android/es-ES/changelogs/42.txt b/fastlane/metadata/android/es-ES/changelogs/42.txt deleted file mode 100644 index 74d48736..00000000 --- a/fastlane/metadata/android/es-ES/changelogs/42.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Corregidos algunos fallos relacionados con las alarmas - * Se han añadido algunas mejoras en la interfaz de usuario, la traducción y la estabilidad diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt deleted file mode 100644 index 229dda7f..00000000 --- a/fastlane/metadata/android/es-ES/full_description.txt +++ /dev/null @@ -1,24 +0,0 @@ -Esta aplicación de reloj tiene múltiples funciones relacionadas con la sincronización. Se puede utilizar como un widget de reloj o como un despertador. Está hecho para ayudarle a regular su vida diaria y dormir mejor. También puedes usar el cronómetro de esta app para contar tu tiempo cuando corres por un estilo de vida saludable o para cualquier otro propósito. Esta aplicación también se puede colocar en la pantalla de inicio para facilitar la navegación. - -Como widget de reloj puede habilitar la visualización de las horas de otras zonas horarias, o utilizar el widget de reloj simple, pero personalizable y redimensionable. El color del texto del widget del reloj se puede personalizar, así como el color y el alfa del fondo. También puede cambiar la forma del widget de reloj de acuerdo a su elección y mostrarlo en la pantalla de inicio. - -La alarma contiene todas las características esperadas como selección de día, alternancia de vibración, selección de tono, snooze o añadir una etiqueta personalizada. Despertar será un placer. Soporta tantas alarmas como quieras, por lo que no habrá más excusas para no despertarte y dormir mejor :) También se admite el aumento gradual del volumen, habilitado por defecto. Un botón de repetición personalizable también está disponible, en caso de que realmente tenía una buena razón para usarlo. El despertador que proporciona esta app es tan sencillo como puede ser. Simplemente tienes que añadir el número de veces que quieras y encenderlos. Durante este tiempo, también puedes tomar ayuda de una guía incorporada en esta aplicación despertador para ayudarte a navegar por ella para dormir mejor. Puedes dormir mejor para que esta aplicación te despierte a la hora establecida sin alterar tu estilo de vida. Esta alarma se puede colocar en la pantalla de inicio para que puedas acceder fácilmente a la alarma mientras trabajas en otras cosas en tu dispositivo. El objetivo principal de mantener la alarma en este widget de reloj es ayudarle a programar su tiempo de manera más eficaz. - -Con el cronómetro puede medir fácilmente un período de tiempo más largo o vueltas individuales. Puedes ordenar las vueltas de varias maneras diferentes. Contiene vibraciones opcionales en las pulsaciones de los botones también, sólo para hacerle saber que el botón se ha pulsado en caso de que no pueda mirar el dispositivo por alguna razón, o tenga prisa. Este cronómetro puede ayudarte a ponerte en forma si estás haciendo yoga o corriendo por el parque. Puedes poner el cronómetro en la pantalla de inicio para acceder fácilmente a él y modificarlo según tus necesidades sin tener que abrir el menú y encontrarlo. - -Usted puede configurar fácilmente un temporizador para ser notificado de algunos eventos. Ambos pueden cambiar su tono de llamada, o alternar las vibraciones. Nunca volverás a quemar esa pizza. La cuenta atrás del temporizador también puede pausarse, no solo detenerse. - -Otras características incluyen, por ejemplo, evitar que el dispositivo se duerma mientras la aplicación está en primer plano o alternar entre el formato de hora de 12 o 24 horas. Por último, pero no menos importante, usted puede decidir si la semana debe comenzar el domingo, o el lunes. - -Viene con material design y tema oscuro por defecto, proporciona una gran experiencia de usuario para un uso fácil. La falta de acceso a Internet te da más privacidad, seguridad y estabilidad que otras aplicaciones. El tema oscuro en este widget de reloj puede ayudarle a configurar su reloj de alarma por la noche sin cegar sus ojos con el color nítido de su alarma móvil. - -No contiene anuncios ni permisos innecesarios. Es totalmente de código abierto, proporciona colores personalizables. - -Echa un vistazo a la suite completa de Simple Tools aquí: -Sitio web: https://www.fossify.org - -En Reddit: -Sitio web: https://www.reddit.com/r/Fossify - -Telegram: -Sitio web: https://t.me/Fossify diff --git a/fastlane/metadata/android/es-ES/short_description.txt b/fastlane/metadata/android/es-ES/short_description.txt deleted file mode 100644 index a36463d3..00000000 --- a/fastlane/metadata/android/es-ES/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Combinación de un bonito widget de reloj, despertador, cronómetro, temporizador diff --git a/fastlane/metadata/android/es-ES/title.txt b/fastlane/metadata/android/es-ES/title.txt deleted file mode 100644 index 72bf5bd8..00000000 --- a/fastlane/metadata/android/es-ES/title.txt +++ /dev/null @@ -1 +0,0 @@ -Reloj sencillo diff --git a/fastlane/metadata/android/et/short_description.txt b/fastlane/metadata/android/et/short_description.txt deleted file mode 100644 index ca21cd9f..00000000 --- a/fastlane/metadata/android/et/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Kauni kellavidina, äratuskella, stopperi ja taimeri kombinatsioon diff --git a/fastlane/metadata/android/et/title.txt b/fastlane/metadata/android/et/title.txt deleted file mode 100644 index e4b29ff5..00000000 --- a/fastlane/metadata/android/et/title.txt +++ /dev/null @@ -1 +0,0 @@ -Fossify Kell diff --git a/fastlane/metadata/android/fr-FR/changelogs/33.txt b/fastlane/metadata/android/fr-FR/changelogs/33.txt deleted file mode 100644 index e06fe714..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/33.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Ajout d'un bouton "Get Simple Phone" dans la section A propos - * Ajout de quelques améliorations au niveau de la traduction, de la stabilité et de l'interface utilisateur diff --git a/fastlane/metadata/android/fr-FR/changelogs/34.txt b/fastlane/metadata/android/fr-FR/changelogs/34.txt deleted file mode 100644 index 5d927889..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/34.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Changement de la couleur par défaut du widget numérique en texte blanc sur fond transparent - * Ajout de quelques améliorations au niveau de la stabilité et de la traduction diff --git a/fastlane/metadata/android/fr-FR/changelogs/35.txt b/fastlane/metadata/android/fr-FR/changelogs/35.txt deleted file mode 100644 index fe689834..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/35.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Ajout d'un raccourci pour démarrer le chronomètre - * Ajout de quelques améliorations au niveau de la traduction, de la stabilité et de l'interface utilisateur diff --git a/fastlane/metadata/android/fr-FR/changelogs/36.txt b/fastlane/metadata/android/fr-FR/changelogs/36.txt deleted file mode 100644 index 1e8686bf..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/36.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Utilisation du thème Material You par défaut sur Android 12+ - * Amélioration de l'interface utilisateur, de la traduction et de la stabilité diff --git a/fastlane/metadata/android/fr-FR/changelogs/37.txt b/fastlane/metadata/android/fr-FR/changelogs/37.txt deleted file mode 100644 index e6e0be9c..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/37.txt +++ /dev/null @@ -1 +0,0 @@ -* Amélioration de l'interface utilisateur, de la traduction et de la stabilité diff --git a/fastlane/metadata/android/fr-FR/changelogs/38.txt b/fastlane/metadata/android/fr-FR/changelogs/38.txt deleted file mode 100644 index 6ea55577..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/38.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Possibilité d'annuler les alarmes à venir plus tôt - * Correction de la mauvaise alarme affichée comme prochaine dans certains cas - * Correction de la duplication du son de l'alarme sur certains appareils - * Amélioration de l'interface utilisateur, de la traduction et de la stabilité diff --git a/fastlane/metadata/android/fr-FR/changelogs/39.txt b/fastlane/metadata/android/fr-FR/changelogs/39.txt deleted file mode 100644 index 6ea55577..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/39.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Possibilité d'annuler les alarmes à venir plus tôt - * Correction de la mauvaise alarme affichée comme prochaine dans certains cas - * Correction de la duplication du son de l'alarme sur certains appareils - * Amélioration de l'interface utilisateur, de la traduction et de la stabilité diff --git a/fastlane/metadata/android/fr-FR/changelogs/40.txt b/fastlane/metadata/android/fr-FR/changelogs/40.txt deleted file mode 100644 index 101f74b5..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/40.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Correction de quelques problèmes liés aux alarmes - * Amélioration de l'interface utilisateur, de la traduction et de la stabilité diff --git a/fastlane/metadata/android/fr-FR/changelogs/41.txt b/fastlane/metadata/android/fr-FR/changelogs/41.txt deleted file mode 100644 index 101f74b5..00000000 --- a/fastlane/metadata/android/fr-FR/changelogs/41.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Correction de quelques problèmes liés aux alarmes - * Amélioration de l'interface utilisateur, de la traduction et de la stabilité diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt deleted file mode 100644 index d63a1fbe..00000000 --- a/fastlane/metadata/android/fr-FR/full_description.txt +++ /dev/null @@ -1,24 +0,0 @@ -Cette application d'horloge a plusieurs fonctions liées au timing. Il peut être utilisé comme widget d’horloge ou comme réveil. Il est conçu pour vous aider à réguler votre vie quotidienne et à mieux dormir. Vous pouvez également utiliser le chronomètre de cette application pour compter votre temps lorsque vous courez pour un mode de vie sain ou à toute autre fin. Cette application peut également être placée sur votre écran d'accueil pour une navigation facile. - -En tant que widget d'horloge, vous pouvez activer l'affichage des heures d'autres fuseaux horaires ou utiliser le widget d'horloge, mais personnalisable et redimensionnable. La couleur du texte du widget horloge peut être personnalisée, ainsi que la couleur et la transparence de l'arrière-plan. Vous pouvez également modifier la forme du widget horloge selon votre choix et l'afficher sur l'écran d'accueil. - -L'alarme contient toutes les fonctionnalités attendues telles que la sélection du jour, le basculement des vibrations, la sélection de la sonnerie, la répétition ou l'ajout d'une étiquette personnalisée. Le réveil sera un plaisir. Il prend en charge autant d'alarmes que vous le souhaitez, il n'y aura donc plus d'excuses pour ne pas vous réveiller et mieux dormir :) L'augmentation progressive du volume est également prise en charge (activée par défaut). Un bouton Snooze personnalisable est également disponible, juste au cas où vous auriez vraiment une bonne raison de l'utiliser. Le réveil fourni par cette application aussi simple que possible. Il vous suffit d'ajouter le nombre de fois que vous souhaitez et de les activer. Pendant ce temps, vous pouvez également bénéficier de l'aide d'un guide intégré à cette application de réveil pour vous aider à naviguer dans cette application pour mieux dormir. Vous pouvez mieux dormir grâce à cette application qui peut vous réveiller à l'heure fixée sans perturber votre style de vie. Cette alarme peut être placée sur l'écran d'accueil pour vous permettre d'y accéder facilement pendant que vous pouvez travailler sur d'autres choses sur votre appareil. L'objectif principal du maintien de l'alarme dans ce widget d'horloge est de vous aider à planifier votre temps plus efficacement. - -Avec le chronomètre, vous pouvez facilement mesurer une période plus longue ou des tours individuels. Vous pouvez trier les tours de différentes manières. Il contient également des vibrations facultatives lors des pressions sur les boutons, juste pour vous informer que le bouton a été enfoncé au cas où vous ne pourriez pas regarder l'appareil pour une raison quelconque ou si vous seriez pressé. Ce chronomètre peut vous aider à vous mettre en forme si vous faites du yoga ou si vous courez dans le parc. Vous pouvez placer le chronomètre sur l'écran d'accueil afin de pouvoir y accéder facilement et le modifier selon vos besoins sans ouvrir le menu ni le trouver. - -Vous pouvez facilement configurer une minuterie pour être averti de certains événements. Vous pouvez à la fois changer sa sonnerie ou activer les vibrations. Vous ne brûlerez plus jamais cette pizza. Le compte à rebours peut également être mis en pause, pas seulement arrêté. - -Des fonctionnalités supplémentaires incluent par exemple le fait d'empêcher l'appareil de s'endormir lorsque l'application est au premier plan ou de basculer entre le format d'heure 12 ou 24 heures. Enfin, vous pouvez décider si la semaine doit commencer le dimanche ou le lundi. - -Il est livré avec une conception matérielle et un thème sombre par défaut, offrant une excellente expérience utilisateur pour une utilisation facile. Le manque d'accès à Internet vous offre plus de confidentialité, de sécurité et de stabilité que les autres applications. Le thème sombre de ce widget d'horloge peut vous aider à régler votre réveil la nuit sans vous aveugler avec les couleurs vives de votre alarme mobile. - -Ne contient aucune publicité ni autorisation inutile. Il est entièrement open source et fournit des couleurs personnalisables. - -Découvrez la suite complète d’outils simples ici : -https://www.fossify.org - -Reddit : -https://www.reddit.com/r/Fossify - -Télégram : -https://t.me/Fossify diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt deleted file mode 100644 index 97b85bc7..00000000 --- a/fastlane/metadata/android/fr-FR/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Combinaison d'un magnifique widget horloge, réveil, chronomètre et minuterie diff --git a/fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt deleted file mode 100644 index ce8962c7..00000000 --- a/fastlane/metadata/android/fr-FR/title.txt +++ /dev/null @@ -1 +0,0 @@ -Horloge simple diff --git a/fastlane/metadata/android/hi-IN/changelogs/33.txt b/fastlane/metadata/android/hi-IN/changelogs/33.txt deleted file mode 100644 index ceeab162..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/33.txt +++ /dev/null @@ -1,2 +0,0 @@ -* अबाउट सेक्शन में गेट Simple Phone बटन जोड़ना - * कुछ अनुवाद, स्थिरता और UX सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/34.txt b/fastlane/metadata/android/hi-IN/changelogs/34.txt deleted file mode 100644 index 7b3dbb44..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/34.txt +++ /dev/null @@ -1,2 +0,0 @@ -* डिफ़ॉल्ट डिजिटल विजेट रंगों को पारदर्शी पृष्ठभूमि पर सफेद टेक्स्ट में बदल दिया गया - * कुछ स्थिरता और अनुवाद सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/35.txt b/fastlane/metadata/android/hi-IN/changelogs/35.txt deleted file mode 100644 index 95162432..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/35.txt +++ /dev/null @@ -1,2 +0,0 @@ -* एक स्टार्ट स्टॉपवॉच शॉर्टकट जोड़ा गया - * कुछ अनुवाद, स्थिरता और UX सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/36.txt b/fastlane/metadata/android/hi-IN/changelogs/36.txt deleted file mode 100644 index 3626a965..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/36.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Android 12+ पर डिफ़ॉल्ट रूप से Material You थीम का उपयोग करें - * कुछ UI, अनुवाद और स्थिरता में सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/37.txt b/fastlane/metadata/android/hi-IN/changelogs/37.txt deleted file mode 100644 index 46151ae4..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/37.txt +++ /dev/null @@ -1 +0,0 @@ -* कुछ UI, अनुवाद और स्थिरता में सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/38.txt b/fastlane/metadata/android/hi-IN/changelogs/38.txt deleted file mode 100644 index f3a5599b..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/38.txt +++ /dev/null @@ -1,4 +0,0 @@ -* आगामी अलार्म को जल्दी खारिज करने की अनुमति दें - * कुछ मामलों में अगले के रूप में दिखाए जा रहे गलत अलार्म को ठीक किया गया - * कुछ उपकरणों पर डुप्लिकेट अलार्म ध्वनि को ठीक किया गया - * कुछ UI, अनुवाद और स्थिरता में सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/39.txt b/fastlane/metadata/android/hi-IN/changelogs/39.txt deleted file mode 100644 index f3a5599b..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/39.txt +++ /dev/null @@ -1,4 +0,0 @@ -* आगामी अलार्म को जल्दी खारिज करने की अनुमति दें - * कुछ मामलों में अगले के रूप में दिखाए जा रहे गलत अलार्म को ठीक किया गया - * कुछ उपकरणों पर डुप्लिकेट अलार्म ध्वनि को ठीक किया गया - * कुछ UI, अनुवाद और स्थिरता में सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/40.txt b/fastlane/metadata/android/hi-IN/changelogs/40.txt deleted file mode 100644 index 29fc9012..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/40.txt +++ /dev/null @@ -1,2 +0,0 @@ -* अलार्म संबंधी कुछ गड़बड़ियां ठीक की गईं - * कुछ UI, अनुवाद और स्थिरता में सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/41.txt b/fastlane/metadata/android/hi-IN/changelogs/41.txt deleted file mode 100644 index 29fc9012..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/41.txt +++ /dev/null @@ -1,2 +0,0 @@ -* अलार्म संबंधी कुछ गड़बड़ियां ठीक की गईं - * कुछ UI, अनुवाद और स्थिरता में सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/changelogs/42.txt b/fastlane/metadata/android/hi-IN/changelogs/42.txt deleted file mode 100644 index 29fc9012..00000000 --- a/fastlane/metadata/android/hi-IN/changelogs/42.txt +++ /dev/null @@ -1,2 +0,0 @@ -* अलार्म संबंधी कुछ गड़बड़ियां ठीक की गईं - * कुछ UI, अनुवाद और स्थिरता में सुधार जोड़े गए diff --git a/fastlane/metadata/android/hi-IN/full_description.txt b/fastlane/metadata/android/hi-IN/full_description.txt deleted file mode 100644 index 062e0223..00000000 --- a/fastlane/metadata/android/hi-IN/full_description.txt +++ /dev/null @@ -1,24 +0,0 @@ -इस क्लॉक ऐप में समय से संबंधित कई कार्य हैं। इसका उपयोग घड़ी विजेट या अलार्म घड़ी के रूप में किया जा सकता है। यह आपके दैनिक जीवन को नियमित करने और बेहतर नींद लेने में आपकी मदद करने के लिए बनाया गया है। जब आप स्वस्थ जीवन शैली के लिए या किसी अन्य उद्देश्य के लिए दौड़ रहे हों तो आप इस ऐप में स्टॉपवॉच का उपयोग अपना समय गिनने के लिए भी कर सकते हैं। आसान नेविगेशन के लिए इस ऐप को आपके होम स्क्रीन पर भी रखा जा सकता है। - -एक घड़ी विजेट के रूप में आप अन्य समय क्षेत्रों से समय प्रदर्शित करने में सक्षम कर सकते हैं, या सरल, लेकिन अनुकूलन योग्य और आकार बदलने योग्य घड़ी विजेट का उपयोग कर सकते हैं। घड़ी विजेट के टेक्स्ट रंग को अनुकूलित किया जा सकता है, साथ ही पृष्ठभूमि के रंग और अल्फा को भी। आप अपनी पसंद के अनुसार घड़ी विजेट का आकार भी बदल सकते हैं और इसे होम स्क्रीन पर दिखा सकते हैं। - -अलार्म में दिन का चयन, कंपन टॉगल, रिंगटोन का चयन, स्नूज़ या कस्टम लेबल जोड़ने जैसी सभी अपेक्षित विशेषताएं शामिल हैं। जागना आनंदमय होगा. यह जितने चाहें उतने अलार्म का समर्थन करता है, इसलिए जागने और बेहतर नींद न लेने के लिए कोई और बहाना नहीं होगा :) धीरे-धीरे वॉल्यूम बढ़ाने का भी समर्थन किया जाता है, जो डिफ़ॉल्ट रूप से सक्षम है। एक अनुकूलन योग्य स्नूज़ बटन भी उपलब्ध है, यदि आपके पास वास्तव में इसका उपयोग करने का कोई अच्छा कारण हो। इस ऐप द्वारा प्रदान की गई अलार्म घड़ी जितनी सरल हो सकती है। आपको बस यह जोड़ना है कि आप कितनी बार चाहें और उन्हें चालू करें। इस दौरान, आप बेहतर नींद के लिए इस ऐप के माध्यम से नेविगेट करने में मदद करने के लिए इस अलार्म घड़ी ऐप में निर्मित एक गाइड की मदद भी ले सकते हैं। आप बेहतर नींद ले सकें इसलिए यह ऐप आपकी जीवनशैली को प्रभावित किए बिना आपको निर्धारित समय पर जगा सकता है। इस अलार्म को होम स्क्रीन पर रखा जा सकता है जिससे आपके लिए अलार्म तक पहुंचना आसान हो जाता है जबकि आप अपने डिवाइस पर अन्य चीजों पर काम कर सकते हैं। इस घड़ी विजेट में अलार्म रखने का मुख्य लक्ष्य आपको अपना समय अधिक प्रभावी ढंग से निर्धारित करने में मदद करना है। - -स्टॉपवॉच से आप आसानी से लंबी अवधि या व्यक्तिगत अंतराल को माप सकते हैं। आप लैप्स को कुछ अलग तरीकों से क्रमबद्ध कर सकते हैं। इसमें बटन दबाने पर वैकल्पिक कंपन भी शामिल है, बस आपको यह बताने के लिए कि बटन दबाया गया था यदि आप किसी कारण से डिवाइस को नहीं देख सकते हैं, या आप जल्दी में हैं। यदि आप योग कर रहे हैं या पार्क में दौड़ रहे हैं तो यह स्टॉपवॉच आपको आकार में आने में मदद कर सकती है। आप स्टॉपवॉच को होम स्क्रीन पर रख सकते हैं ताकि आप इसे आसानी से एक्सेस कर सकें और मेनू को खोले बिना और इसे ढूंढे बिना अपनी आवश्यकताओं के अनुसार इसे बदल सकें। - -आप कुछ घटनाओं की सूचना पाने के लिए आसानी से टाइमर सेटअप कर सकते हैं। आप इसकी रिंगटोन बदल सकते हैं, या कंपन टॉगल कर सकते हैं। आप उस पिज़्ज़ा को फिर कभी नहीं जलाएंगे। टाइमर उलटी गिनती को रोका भी जा सकता है, न कि केवल रोका जा सकता है। - -उदाहरण के लिए, अतिरिक्त सुविधाओं में ऐप के अग्रभूमि में होने पर डिवाइस को सो जाने से रोकना या 12 या 24 घंटे के समय प्रारूप के बीच टॉगल करना शामिल है। अंतिम लेकिन महत्वपूर्ण बात यह है कि आप यह तय कर सकते हैं कि सप्ताह रविवार को शुरू होना चाहिए, या सोमवार को। - -यह डिफ़ॉल्ट रूप से Material डिज़ाइन और गहरी थीम के साथ आता है, आसान उपयोग के लिए शानदार उपयोगकर्ता अनुभव प्रदान करता है। इंटरनेट एक्सेस की कमी आपको अन्य ऐप्स की तुलना में अधिक गोपनीयता, सुरक्षा और स्थिरता प्रदान करती है। इस घड़ी विजेट में गहरी थीम आपको अपने मोबाइल अलार्म के तेज रंग के साथ अपनी आंखों को अंधा किए बिना रात में अपनी अलार्म घड़ी सेट करने में मदद कर सकती है। - -इसमें कोई विज्ञापन या अनावश्यक अनुमतियाँ नहीं हैं। यह पूरी तरह से ओपनसोर्स है, अनुकूलन योग्य रंग प्रदान करता है। - -यहां Fossify का पूरा सूट देखें: -https://www.fossify.org - -Reddit: -https://www.reddit.com/r/Fossify - -Telegram: -https://t.me/Fossify diff --git a/fastlane/metadata/android/hi-IN/short_description.txt b/fastlane/metadata/android/hi-IN/short_description.txt deleted file mode 100644 index fd7ba040..00000000 --- a/fastlane/metadata/android/hi-IN/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -एक सुंदर घड़ी विजेट, अलार्म घड़ी, स्टॉपवॉच, टाइमर का संयोजन diff --git a/fastlane/metadata/android/hi-IN/title.txt b/fastlane/metadata/android/hi-IN/title.txt deleted file mode 100644 index 16fe316b..00000000 --- a/fastlane/metadata/android/hi-IN/title.txt +++ /dev/null @@ -1 +0,0 @@ -Fossify Clock diff --git a/fastlane/metadata/android/hr/short_description.txt b/fastlane/metadata/android/hr/short_description.txt deleted file mode 100644 index 69862b67..00000000 --- a/fastlane/metadata/android/hr/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Kombinacija prekrasnog widgeta za sat, alarm, štopericu, timer diff --git a/fastlane/metadata/android/hr/title.txt b/fastlane/metadata/android/hr/title.txt deleted file mode 100644 index 2649fa83..00000000 --- a/fastlane/metadata/android/hr/title.txt +++ /dev/null @@ -1 +0,0 @@ -Jednostavni sat diff --git a/fastlane/metadata/android/hu-HU/short_description.txt b/fastlane/metadata/android/hu-HU/short_description.txt deleted file mode 100644 index 6338df1f..00000000 --- a/fastlane/metadata/android/hu-HU/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Egy szép óramodul, ébresztőóra, stopper és időzítő kombinációja diff --git a/fastlane/metadata/android/hu-HU/title.txt b/fastlane/metadata/android/hu-HU/title.txt deleted file mode 100644 index 598e93ae..00000000 --- a/fastlane/metadata/android/hu-HU/title.txt +++ /dev/null @@ -1 +0,0 @@ -Fossify Óra diff --git a/fastlane/metadata/android/it-IT/short_description.txt b/fastlane/metadata/android/it-IT/short_description.txt deleted file mode 100644 index c303ea6b..00000000 --- a/fastlane/metadata/android/it-IT/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Combinazione di un bellissimo widget orologio, sveglia, cronometro, timer diff --git a/fastlane/metadata/android/it-IT/title.txt b/fastlane/metadata/android/it-IT/title.txt deleted file mode 100644 index f9f19c48..00000000 --- a/fastlane/metadata/android/it-IT/title.txt +++ /dev/null @@ -1 +0,0 @@ -Orologio Fossify diff --git a/fastlane/metadata/android/vi/title.txt b/fastlane/metadata/android/vi/title.txt deleted file mode 100644 index 2647e50b..00000000 --- a/fastlane/metadata/android/vi/title.txt +++ /dev/null @@ -1 +0,0 @@ -Đồng hồ Fossify diff --git a/fastlane/metadata/android/zh-CN/title.txt b/fastlane/metadata/android/zh-CN/title.txt deleted file mode 100644 index f565d291..00000000 --- a/fastlane/metadata/android/zh-CN/title.txt +++ /dev/null @@ -1 +0,0 @@ -简单时钟 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ebccb7dd..78118653 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] #jetbrains -kotlin = "1.9.0" +kotlin = "1.9.22" #KSP -ksp = "1.9.0-1.0.12" +ksp = "1.9.22-1.0.17" #AndroidX androidx-constraintlayout = "2.1.4" -androidx-lifecycle = "2.6.1" -androidx-preference = "1.2.0" -androidx-work = "2.8.1" +androidx-lifecycle = "2.7.0" +androidx-preference = "1.2.1" +androidx-work = "2.9.0" #AutoFitTextView autofittextview = "0.2.1" #Eventbus @@ -17,13 +17,13 @@ kotlinx-coroutines = "1.7.3" #NumberPicker numberpicker = "2.4.13" #Room -room = "2.6.0-beta01" -#Simple tools -simple-commons = "c573613da9" +room = "2.6.1" +#Fossify +commons = "5381db38e6" #Stetho stetho = "1.6.0" #Gradle -gradlePlugins-agp = "8.1.1" +gradlePlugins-agp = "8.3.1" #build app-build-compileSDKVersion = "34" app-build-targetSDK = "34" @@ -31,9 +31,9 @@ app-build-minimumSDK = "23" app-build-javaVersion = "VERSION_17" app-build-kotlinJVMTarget = "17" #versioning -app-version-appId = "com.simplemobiletools.clock" -app-version-versionCode = "42" -app-version-versionName = "5.11.2" +app-version-appId = "org.fossify.clock" +app-version-versionCode = "1" +app-version-versionName = "1.0.0" [libraries] #AndroidX androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" } @@ -55,8 +55,8 @@ numberpicker = { module = "io.github.ShawnLin013:number-picker", version.ref = " androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } -#Simple Mobile Tools -simple-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons", version.ref = "simple-commons" } +#Fossify +fossify-commons = { module = "org.fossify:commons", version.ref = "commons" } #Stetho stetho = { module = "com.facebook.stetho:stetho", version.ref = "stetho" } [bundles] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca6f067b..b910320f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip diff --git a/graphics/app_icon.png b/graphics/app_icon.png deleted file mode 100644 index 17034d64..00000000 Binary files a/graphics/app_icon.png and /dev/null differ diff --git a/graphics/featureGraphic.jpg b/graphics/featureGraphic.jpg deleted file mode 100644 index 8f690691..00000000 Binary files a/graphics/featureGraphic.jpg and /dev/null differ diff --git a/graphics/featureGraphic.png b/graphics/featureGraphic.png new file mode 100644 index 00000000..0e2593fa Binary files /dev/null and b/graphics/featureGraphic.png differ diff --git a/graphics/featureGraphic.xcf b/graphics/featureGraphic.xcf deleted file mode 100644 index 387f7628..00000000 Binary files a/graphics/featureGraphic.xcf and /dev/null differ diff --git a/graphics/foreground.svg b/graphics/foreground.svg new file mode 100644 index 00000000..b9847ce5 --- /dev/null +++ b/graphics/foreground.svg @@ -0,0 +1,7 @@ + + + + diff --git a/graphics/icon.png b/graphics/icon.png deleted file mode 100644 index e2905e79..00000000 Binary files a/graphics/icon.png and /dev/null differ diff --git a/graphics/icon.svg b/graphics/icon.svg new file mode 100644 index 00000000..a4bb8bb6 --- /dev/null +++ b/graphics/icon.svg @@ -0,0 +1,4 @@ + + + diff --git a/graphics/icon.webp b/graphics/icon.webp new file mode 100644 index 00000000..eb2b7f70 Binary files /dev/null and b/graphics/icon.webp differ diff --git a/graphics/promo_graphic.png b/graphics/promo_graphic.png deleted file mode 100644 index 2c4f935b..00000000 Binary files a/graphics/promo_graphic.png and /dev/null differ diff --git a/graphics/square.png b/graphics/square.png deleted file mode 100644 index 9d2ed96f..00000000 Binary files a/graphics/square.png and /dev/null differ diff --git a/graphics/square.xcf b/graphics/square.xcf deleted file mode 100644 index 944c58e0..00000000 Binary files a/graphics/square.xcf and /dev/null differ diff --git a/graphics/tv_banner.png b/graphics/tv_banner.png deleted file mode 100644 index fdc214f7..00000000 Binary files a/graphics/tv_banner.png and /dev/null differ