Clean up remaining OLauncher references

7 files changed, 43 insertions, 43 deletions

diff --git a/app/src/main/java/app/sidephonelauncher/MainActivity.kt b/app/src/main/java/app/sidephonelauncher/MainActivity.kt
index 2454e52..961209e 100644
--- a/app/src/main/java/app/sidephonelauncher/MainActivity.kt
+++ b/app/src/main/java/app/sidephonelauncher/MainActivity.kt
@@ -32,7 +32,7 @@ import app.sidephonelauncher.helper.isDarkThemeOn
 import app.sidephonelauncher.helper.isDaySince
 import app.sidephonelauncher.helper.isDefaultLauncher
 import app.sidephonelauncher.helper.isEinkDisplay
-import app.sidephonelauncher.helper.isOlauncherDefault
+import app.sidephonelauncher.helper.isSidePhOnelauncherDefault
 import app.sidephonelauncher.helper.isTablet
 import app.sidephonelauncher.helper.openUrl
 import app.sidephonelauncher.helper.rateApp
@@ -211,7 +211,7 @@ class MainActivity : AppCompatActivity() {
         viewModel.showDialog.observe(this) {
             when (it) {
                 Constants.Dialog.ABOUT -> {
-                    showMessageDialog(R.string.app_name, R.string.welcome_to_olauncher_settings, R.string.okay) {
+                    showMessageDialog(R.string.app_name, R.string.welcome_to_sidephonelauncher_settings, R.string.okay) {
                         binding.messageLayout.visibility = View.GONE
                     }
                 }
@@ -269,8 +269,8 @@ class MainActivity : AppCompatActivity() {
                 }
 
                 Constants.Dialog.PRO_MESSAGE -> {
-                    showMessageDialog(R.string.hey, R.string.pro_message, R.string.olauncher_pro) {
-                        openUrl(Constants.URL_OLAUNCHER_PRO)
+                    showMessageDialog(R.string.hey, R.string.pro_message, R.string.sidephonelauncher_pro) {
+                        openUrl(Constants.URL_PRO_LAUNCHER)
                     }
                 }
             }
@@ -313,28 +313,28 @@ class MainActivity : AppCompatActivity() {
             Constants.UserState.WALLPAPER -> {
                 if (prefs.wallpaperMsgShown || prefs.dailyWallpaper)
                     prefs.userState = Constants.UserState.REVIEW
-                else if (isOlauncherDefault(this))
+                else if (isSidePhOnelauncherDefault(this))
                     viewModel.showDialog.postValue(Constants.Dialog.WALLPAPER)
             }
 
             Constants.UserState.REVIEW -> {
                 if (prefs.rateClicked)
                     prefs.userState = Constants.UserState.SHARE
-                else if (isOlauncherDefault(this) && prefs.firstOpenTime.hasBeenHours(1))
+                else if (isSidePhOnelauncherDefault(this) && prefs.firstOpenTime.hasBeenHours(1))
                     viewModel.showDialog.postValue(Constants.Dialog.REVIEW)
             }
 
             Constants.UserState.RATE -> {
                 if (prefs.rateClicked)
                     prefs.userState = Constants.UserState.SHARE
-                else if (isOlauncherDefault(this)
+                else if (isSidePhOnelauncherDefault(this)
                     && prefs.firstOpenTime.isDaySince() >= 7
                     && calendar.get(Calendar.HOUR_OF_DAY) >= 16
                 ) viewModel.showDialog.postValue(Constants.Dialog.RATE)
             }
 
             Constants.UserState.SHARE -> {
-                if (isOlauncherDefault(this) && prefs.firstOpenTime.hasBeenDays(14)
+                if (isSidePhOnelauncherDefault(this) && prefs.firstOpenTime.hasBeenDays(14)
                     && prefs.shareShownTime.isDaySince() >= 70
                     && calendar.get(Calendar.HOUR_OF_DAY) >= 16
                 ) viewModel.showDialog.postValue(Constants.Dialog.SHARE)
diff --git a/app/src/main/java/app/sidephonelauncher/MainViewModel.kt b/app/src/main/java/app/sidephonelauncher/MainViewModel.kt
index 4c80fc3..0dec083 100644
--- a/app/src/main/java/app/sidephonelauncher/MainViewModel.kt
+++ b/app/src/main/java/app/sidephonelauncher/MainViewModel.kt
@@ -27,7 +27,7 @@ import app.sidephonelauncher.helper.getAppsList
 import app.sidephonelauncher.helper.getPrivateSpaceApps
 import app.sidephonelauncher.helper.getPrivateSpaceUserHandle
 import app.sidephonelauncher.helper.hasBeenMinutes
-import app.sidephonelauncher.helper.isOlauncherDefault
+import app.sidephonelauncher.helper.isSidePhOnelauncherDefault
 import app.sidephonelauncher.helper.isPackageInstalled
 import app.sidephonelauncher.helper.isPrivateSpaceLocked
 import app.sidephonelauncher.helper.showToast
@@ -47,7 +47,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     val updateSwipeApps = MutableLiveData<Any>()
     val appList = MutableLiveData<List<AppModel>?>()
     val hiddenApps = MutableLiveData<List<AppModel>?>()
-    val isOlauncherDefault = MutableLiveData<Boolean>()
+    val isSidePhOnelauncherDefault = MutableLiveData<Boolean>()
     val launcherResetFailed = MutableLiveData<Boolean>()
     val homeAppAlignment = MutableLiveData<Int>()
     val screenTimeValue = MutableLiveData<String>()
@@ -401,8 +401,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         }
     }
 
-    fun isOlauncherDefault() {
-        isOlauncherDefault.value = isOlauncherDefault(appContext)
+    fun isSidePhOnelauncherDefault() {
+        isSidePhOnelauncherDefault.value = isSidePhOnelauncherDefault(appContext)
     }
 
     fun setWallpaperWorker() {
diff --git a/app/src/main/java/app/sidephonelauncher/data/Constants.kt b/app/src/main/java/app/sidephonelauncher/data/Constants.kt
index 2277b0d..1e1c111 100644
--- a/app/src/main/java/app/sidephonelauncher/data/Constants.kt
+++ b/app/src/main/java/app/sidephonelauncher/data/Constants.kt
@@ -95,12 +95,12 @@ object Constants {
 
     const val MIN_ANIM_REFRESH_RATE = 30f
 
-    const val URL_ABOUT_OLAUNCHER = "https://tanujnotes.substack.com/p/olauncher-minimal-af-launcher?utm_source=olauncher"
-    const val URL_OLAUNCHER_PRIVACY = "https://tanujnotes.notion.site/Olauncher-Privacy-Policy-dd6ac5101ddd4b3da9d27057889d44ab"
+    const val URL_ABOUT_PAGE = "https://github.com/dirksierd/SidePhOnelauncher#readme"
+    const val URL_PRIVACY_POLICY = "https://github.com/dirksierd/SidePhOnelauncher#readme"
     const val URL_DOUBLE_TAP = "https://tanujnotes.notion.site/Double-tap-to-lock-Olauncher-0f7fb103ec1f47d7a90cdfdcd7fb86ef"
-    const val URL_OLAUNCHER_GITHUB = "https://www.github.com/tanujnotes/Olauncher"
-    const val URL_OLAUNCHER_PLAY_STORE = "https://play.google.com/store/apps/details?id=app.sidephonelauncher"
-    const val URL_OLAUNCHER_PRO = "https://play.google.com/store/apps/details?id=app.prolauncher"
+    const val URL_GITHUB_REPO = "https://github.com/dirksierd/SidePhOnelauncher"
+    const val URL_APP_RELEASES = "https://github.com/dirksierd/SidePhOnelauncher/releases/latest"
+    const val URL_PRO_LAUNCHER = "https://play.google.com/store/apps/details?id=app.prolauncher"
     const val URL_PLAY_STORE_DEV = "https://play.google.com/store/apps/dev?id=7198807840081074933"
     const val URL_TWITTER_TANUJ = "https://x.com/tanujnotes"
     const val URL_INSTA_TANUJ = "https://instagram.com/tanuj_notes"
@@ -110,7 +110,7 @@ object Constants {
     const val URL_DEFAULT_DARK_WALLPAPER = "https://images.unsplash.com/photo-1512551980832-13df02babc9e"
     const val URL_DEFAULT_LIGHT_WALLPAPER = "https://images.unsplash.com/photo-1515549832467-8783363e19b6"
     const val URL_DUCK_SEARCH = "https://duck.co/?q="
-    const val URL_DIGITAL_WELLBEING_LEARN_MORE = "https://tanujnotes.substack.com/p/digital-wellbeing-app-on-android?utm_source=olauncher"
+    const val URL_DIGITAL_WELLBEING_LEARN_MORE = "https://tanujnotes.substack.com/p/digital-wellbeing-app-on-android"
 
     const val DIGITAL_WELLBEING_PACKAGE_NAME = "com.google.android.apps.wellbeing"
     const val DIGITAL_WELLBEING_ACTIVITY = "com.google.android.apps.wellbeing.settings.TopLevelSettingsActivity"
diff --git a/app/src/main/java/app/sidephonelauncher/helper/Utils.kt b/app/src/main/java/app/sidephonelauncher/helper/Utils.kt
index b9cf6c3..222977d 100644
--- a/app/src/main/java/app/sidephonelauncher/helper/Utils.kt
+++ b/app/src/main/java/app/sidephonelauncher/helper/Utils.kt
@@ -98,7 +98,7 @@ suspend fun getAppsList(
                         user = profile
                     )
 
-                    // if the current app is not OLauncher
+                    // if the current app is not this launcher
                     if (app.applicationInfo.packageName != BuildConfig.APPLICATION_ID) {
                         // is this a hidden app?
                         if (hiddenApps.contains(app.applicationInfo.packageName + "|" + profile.toString())) {
@@ -267,7 +267,7 @@ fun getUserHandleFromString(context: Context, userHandleString: String): UserHan
     return android.os.Process.myUserHandle()
 }
 
-fun isOlauncherDefault(context: Context): Boolean {
+fun isSidePhOnelauncherDefault(context: Context): Boolean {
     val launcherPackageName = getDefaultLauncherPackage(context)
     return BuildConfig.APPLICATION_ID == launcherPackageName
 }
@@ -612,7 +612,7 @@ fun View.animateAlpha(alpha: Float = 1.0f) {
 
 fun Context.shareApp() {
     val message = getString(R.string.are_you_using_your_phone_or_is_your_phone_using_you) +
-            "\n" + Constants.URL_OLAUNCHER_PLAY_STORE
+            "\n" + Constants.URL_APP_RELEASES
     val sendIntent: Intent = Intent().apply {
         action = Intent.ACTION_SEND
         putExtra(Intent.EXTRA_TEXT, message)
@@ -626,7 +626,7 @@ fun Context.shareApp() {
 fun Context.rateApp() {
     val intent = Intent(
         Intent.ACTION_VIEW,
-        Constants.URL_OLAUNCHER_PLAY_STORE.toUri()
+        Constants.URL_APP_RELEASES.toUri()
     )
     var flags = Intent.FLAG_ACTIVITY_NO_HISTORY or Intent.FLAG_ACTIVITY_MULTIPLE_TASK
     flags = flags or Intent.FLAG_ACTIVITY_NEW_DOCUMENT
diff --git a/app/src/main/java/app/sidephonelauncher/helper/WallpaperWorker.kt b/app/src/main/java/app/sidephonelauncher/helper/WallpaperWorker.kt
index 1f00826..814c74c 100644
--- a/app/src/main/java/app/sidephonelauncher/helper/WallpaperWorker.kt
+++ b/app/src/main/java/app/sidephonelauncher/helper/WallpaperWorker.kt
@@ -14,7 +14,7 @@ class WallpaperWorker(appContext: Context, workerParams: WorkerParameters) : Cor
 
     override suspend fun doWork(): Result = coroutineScope {
         val success =
-            if (prefs.appTheme == AppCompatDelegate.MODE_NIGHT_YES && isOlauncherDefault(applicationContext).not())
+            if (prefs.appTheme == AppCompatDelegate.MODE_NIGHT_YES && isSidePhOnelauncherDefault(applicationContext).not())
                 true
             else if (prefs.dailyWallpaper) {
                 val wallType = checkWallpaperType()
diff --git a/app/src/main/java/app/sidephonelauncher/ui/HomeFragment.kt b/app/src/main/java/app/sidephonelauncher/ui/HomeFragment.kt
index 0161c36..9d28a80 100644
--- a/app/src/main/java/app/sidephonelauncher/ui/HomeFragment.kt
+++ b/app/src/main/java/app/sidephonelauncher/ui/HomeFragment.kt
@@ -94,7 +94,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
         NotificationDotRepository.addListener(notificationDotListener)
         dpadLeftKeyDownTime = 0L
         populateHomeScreen(false)
-        viewModel.isOlauncherDefault()
+        viewModel.isSidePhOnelauncherDefault()
         if (prefs.showStatusBar) showStatusBar()
         else hideStatusBar()
         requestInitialFocus()
@@ -173,7 +173,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
             R.id.setDefaultLauncher -> {
                 prefs.hideSetDefaultLauncher = true
                 binding.setDefaultLauncher.visibility = View.GONE
-                if (viewModel.isOlauncherDefault.value != true) {
+                if (viewModel.isSidePhOnelauncherDefault.value != true) {
                     requireContext().showToast(R.string.set_as_default_launcher)
                     findNavController().navigate(R.id.action_mainFragment_to_settingsFragment)
                 }
@@ -191,7 +191,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
         viewModel.refreshHome.observe(viewLifecycleOwner) {
             populateHomeScreen(it)
         }
-        viewModel.isOlauncherDefault.observe(viewLifecycleOwner, Observer {
+        viewModel.isSidePhOnelauncherDefault.observe(viewLifecycleOwner, Observer {
             if (it != true) {
                 if (prefs.dailyWallpaper && prefs.appTheme == AppCompatDelegate.MODE_NIGHT_YES) {
                     prefs.dailyWallpaper = false
diff --git a/app/src/main/java/app/sidephonelauncher/ui/SettingsFragment.kt b/app/src/main/java/app/sidephonelauncher/ui/SettingsFragment.kt
index 3b46513..f928311 100644
--- a/app/src/main/java/app/sidephonelauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/sidephonelauncher/ui/SettingsFragment.kt
@@ -33,7 +33,7 @@ import app.sidephonelauncher.helper.isAccessServiceEnabled
 import app.sidephonelauncher.helper.isDarkThemeOn
 import app.sidephonelauncher.helper.isEinkDisplay
 import app.sidephonelauncher.helper.isCountryIn
-import app.sidephonelauncher.helper.isOlauncherDefault
+import app.sidephonelauncher.helper.isSidePhOnelauncherDefault
 import app.sidephonelauncher.helper.isTablet
 import app.sidephonelauncher.helper.openAppInfo
 import app.sidephonelauncher.helper.openUrl
@@ -66,7 +66,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
         viewModel = activity?.run {
             ViewModelProvider(this)[MainViewModel::class.java]
         } ?: throw Exception("Invalid Activity")
-        viewModel.isOlauncherDefault()
+        viewModel.isSidePhOnelauncherDefault()
 
         deviceManager = requireContext().getSystemService(Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
         componentName = ComponentName(requireContext(), DeviceAdmin::class.java)
@@ -112,7 +112,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
             binding.alignmentSelectLayout.visibility = View.GONE
 
         when (view.id) {
-            R.id.olauncherHiddenApps -> showHiddenApps()
+            R.id.launcherHiddenApps -> showHiddenApps()
             R.id.moreFeatures -> viewModel.showDialog.postValue(Constants.Dialog.PRO_MESSAGE)
             R.id.screenTimeOnOff -> viewModel.showDialog.postValue(Constants.Dialog.DIGITAL_WELLBEING)
             R.id.appInfo -> openAppInfo(requireContext(), Process.myUserHandle(), BuildConfig.APPLICATION_ID)
@@ -164,9 +164,9 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
             R.id.notifications -> updateSwipeDownAction(Constants.SwipeDownAction.NOTIFICATIONS)
             R.id.search -> updateSwipeDownAction(Constants.SwipeDownAction.SEARCH)
 
-            R.id.aboutOlauncher -> {
+            R.id.aboutLauncher -> {
                 prefs.aboutClicked = true
-                requireContext().openUrl(Constants.URL_ABOUT_OLAUNCHER)
+                requireContext().openUrl(Constants.URL_ABOUT_PAGE)
             }
 
             R.id.share -> requireActivity().shareApp()
@@ -178,8 +178,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
             R.id.twitter -> requireContext().openUrl(
                 if (showInstagram) Constants.URL_INSTA_TANUJ else Constants.URL_TWITTER_TANUJ
             )
-            R.id.github -> requireContext().openUrl(Constants.URL_OLAUNCHER_GITHUB)
-            R.id.privacy -> requireContext().openUrl(Constants.URL_OLAUNCHER_PRIVACY)
+            R.id.github -> requireContext().openUrl(Constants.URL_GITHUB_REPO)
+            R.id.privacy -> requireContext().openUrl(Constants.URL_PRIVACY_POLICY)
             R.id.footer -> {
                 requireContext().openUrl(
                     if (showPentastic) Constants.URL_PENTASTIC else Constants.URL_NTS
@@ -210,11 +210,11 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
     }
 
     private fun initClickListeners() {
-        binding.olauncherHiddenApps.setOnClickListener(this)
+        binding.launcherHiddenApps.setOnClickListener(this)
         binding.scrollLayout.setOnClickListener(this)
         binding.appInfo.setOnClickListener(this)
         binding.setLauncher.setOnClickListener(this)
-        binding.aboutOlauncher.setOnClickListener(this)
+        binding.aboutLauncher.setOnClickListener(this)
         binding.moreFeatures.setOnClickListener(this)
         binding.autoShowKeyboard.setOnClickListener(this)
         binding.toggleLock.setOnClickListener(this)
@@ -281,7 +281,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
             viewModel.showDialog.postValue(Constants.Dialog.ABOUT)
             prefs.firstSettingsOpen = false
         }
-        viewModel.isOlauncherDefault.observe(viewLifecycleOwner) {
+        viewModel.isSidePhOnelauncherDefault.observe(viewLifecycleOwner) {
             if (it) {
                 binding.setLauncher.text = getString(R.string.change_default_launcher)
                 prefs.toShowHintCounter += 1
@@ -453,7 +453,7 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
     }
 
     private fun toggleDailyWallpaperUpdate() {
-        if (prefs.dailyWallpaper.not() && prefs.appTheme == AppCompatDelegate.MODE_NIGHT_YES && viewModel.isOlauncherDefault.value == false) {
+        if (prefs.dailyWallpaper.not() && prefs.appTheme == AppCompatDelegate.MODE_NIGHT_YES && viewModel.isSidePhOnelauncherDefault.value == false) {
             requireContext().showToast(R.string.set_as_default_launcher_first)
             return
         }
@@ -466,10 +466,10 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
     }
 
     private fun showWallpaperToasts() {
-        if (isOlauncherDefault(requireContext()))
+        if (isSidePhOnelauncherDefault(requireContext()))
             requireContext().showToast(getString(R.string.your_wallpaper_will_update_shortly))
         else
-            requireContext().showToast(getString(R.string.olauncher_is_not_default_launcher), Toast.LENGTH_LONG)
+            requireContext().showToast(getString(R.string.sidephonelauncher_is_not_default_launcher), Toast.LENGTH_LONG)
     }
 
     private fun updateHomeAppsNum(num: Int) {
@@ -573,8 +573,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
     }
 
     private fun updateHomeBottomAlignment() {
-        if (viewModel.isOlauncherDefault.value != true) {
-            requireContext().showToast(getString(R.string.please_set_olauncher_as_default_first), Toast.LENGTH_LONG)
+        if (viewModel.isSidePhOnelauncherDefault.value != true) {
+            requireContext().showToast(getString(R.string.please_set_sidephonelauncher_as_default_first), Toast.LENGTH_LONG)
             return
         }
         prefs.homeBottomAlignment = !prefs.homeBottomAlignment
@@ -670,8 +670,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
 
     private fun populateActionHints() {
         if (prefs.aboutClicked.not())
-            binding.aboutOlauncher.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_info, 0)
-        if (viewModel.isOlauncherDefault.value != true) return
+            binding.aboutLauncher.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_info, 0)
+        if (viewModel.isSidePhOnelauncherDefault.value != true) return
         if (prefs.rateClicked.not() && prefs.toShowHintCounter > Constants.HINT_RATE_US && prefs.toShowHintCounter < Constants.HINT_RATE_US + 100)
             binding.rate.setCompoundDrawablesWithIntrinsicBounds(0, android.R.drawable.arrow_down_float, 0, 0)
     }