Merge branch 'master' into weblate-fossify-clock

Author: naveensingh

README.md

@@ -1,30 +1,42 @@
-# Simple Clock
-<img alt="Logo" src="graphics/icon.png" width="120" />
+# Fossify Clock
+<img alt="Logo" src="graphics/icon.webp" width="120" />
 
-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.
 
-<div style="display:flex;">
-<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg" width="30%">
-<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg" width="30%">
-<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg" width="30%">
+➡️ Explore more Fossify apps: https://www.fossify.org<br>
+➡️ Open-Source Code: https://www.github.com/FossifyOrg<br>
+➡️ Join the community on Reddit: https://www.reddit.com/r/Fossify<br>
+➡️ Connect on Telegram: https://t.me/Fossify
+
+<div align="center">
+<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png" width="30%">
+<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png" width="30%">
+<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png" width="30%">
 </div>
 

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<KotlinCompile> {
         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)

app/schemas/com.simplemobiletools.clock.databases.AppDatabase/1.json

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_launcher_name">Clock_debug</string>
+    <string name="app_launcher_name" translatable="false">Clock_debug</string>
 </resources>

…tools.clock.databases.AppDatabase/2.json …ssify.clock.databases.AppDatabase/2.jsonapp/schemas/com.simplemobiletools.clock.databases.AppDatabase/2.json renamed to app/schemas/org.fossify.clock.databases.AppDatabase/2.json app/schemas/com.simplemobiletools.clock.databases.AppDatabase/2.json renamed to app/schemas/org.fossify.clock.databases.AppDatabase/2.json

@@ -41,7 +41,7 @@
             android:theme="@style/SplashTheme">
 
             <intent-filter>
-                <action android:name="com.simplemobiletools.clock.TOGGLE_STOPWATCH" />
+                <action android:name="org.fossify.clock.TOGGLE_STOPWATCH" />
                 <action android:name="android.intent.action.SHOW_ALARMS" />
                 <action android:name="android.intent.action.SHOW_TIMERS" />
                 <action android:name="android.intent.action.SET_ALARM" />
@@ -102,14 +102,14 @@
         </activity>
 
         <activity
-            android:name="com.simplemobiletools.commons.activities.AboutActivity"
+            android:name="org.fossify.commons.activities.AboutActivity"
             android:configChanges="orientation"
             android:exported="false"
             android:label="@string/about"
             android:parentActivityName=".activities.MainActivity" />
 
         <activity
-            android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
+            android:name="org.fossify.commons.activities.CustomizationActivity"
             android:configChanges="orientation"
             android:exported="false"
             android:label="@string/customize_colors"
@@ -348,10 +348,10 @@
 
         <activity-alias
             android:name=".activities.SplashActivity.Green"
-            android:enabled="false"
+            android:enabled="true"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher_green"
-            android:roundIcon="@mipmap/ic_launcher_green"
+            android:icon="@mipmap/ic_launcher"
+            android:roundIcon="@mipmap/ic_launcher"
             android:targetActivity=".activities.SplashActivity">
 
             <intent-filter>
@@ -418,10 +418,10 @@
 
         <activity-alias
             android:name=".activities.SplashActivity.Orange"
-            android:enabled="true"
+            android:enabled="false"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher"
-            android:roundIcon="@mipmap/ic_launcher"
+            android:icon="@mipmap/ic_launcher_orange"
+            android:roundIcon="@mipmap/ic_launcher_orange"
             android:targetActivity=".activities.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/debug/res/values/strings.xml

@@ -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