Skip to content

Fix: when we press allowed schedule it goes to app home #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alosslessdev wants to merge 4 commits into from
Closed

Fix: when we press allowed schedule it goes to app home #335

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1a74d7
only fragment activity routing
alosslessdev Jul 5, 2026
7b2ad63
merge with clean2
alosslessdev Jul 8, 2026
45bc3eb
merge again
alosslessdev Jul 8, 2026
456a774
Merge branch 'kt-rewrite' into candidate-v2-only-fragment-routing
alosslessdev Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 49 additions & 1 deletion app/src/main/java/neth/iecal/curbox/ui/activity/FragmentActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.autodnd.CreateA
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.reelBlocker.ReelBlockerFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.keywordBlocker.KeywordBlockerFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.keywordBlocker.CreateKeywordGroupFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.appBlocker.TimeBasedSettingsFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.appBlocker.UsageBasedSettingsFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.keywordBlocker.KeywordTimeBasedSettingsFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.keywordBlocker.KeywordUsageBasedSettingsFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.autodnd.AutoDndTimeSettingsFragment
import neth.iecal.curbox.ui.fragments.main.reducers.anti_stimulants.grayscale.GrayscaleTimeSettingsFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.shared.WarningConfigFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.uiHider.UiHiderFragment
import neth.iecal.curbox.ui.fragments.main.reducers.blockertools.uiHider.UiHiderEditorFragment
import neth.iecal.curbox.ui.fragments.main.reducers.advanced.AntiUninstallFragment
Expand All @@ -43,7 +50,23 @@ class FragmentActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
val sharedPreferences = getSharedPreferences("AppPreferences", android.content.Context.MODE_PRIVATE)
val isFirstLaunchComplete = sharedPreferences.getBoolean("isFirstLaunchComplete", false)
val selectedFragment = intent.getStringExtra("fragment") ?: if (!isFirstLaunchComplete) OnboardingFragment.FRAGMENT_ID else AllAppsUsageFragment.FRAGMENT_ID
val selectedFragmentStr = intent.getStringExtra("fragment") ?: intent.getStringExtra("fragment_type") ?: if (!isFirstLaunchComplete) OnboardingFragment.FRAGMENT_ID else AllAppsUsageFragment.FRAGMENT_ID
val mode = intent.getStringExtra("mode")

val selectedFragment = when (selectedFragmentStr) {
"app_time_config" -> when (mode) {
"GRAYSCALE" -> GrayscaleTimeSettingsFragment.FRAGMENT_ID
"AUTODND" -> AutoDndTimeSettingsFragment.FRAGMENT_ID
"KEYWORD_BLOCKER" -> KeywordTimeBasedSettingsFragment.FRAGMENT_ID
else -> TimeBasedSettingsFragment.FRAGMENT_ID
}
"app_usage_config" -> when (mode) {
"KEYWORD_BLOCKER" -> KeywordUsageBasedSettingsFragment.FRAGMENT_ID
else -> UsageBasedSettingsFragment.FRAGMENT_ID
}
"warning_screen_config" -> WarningConfigFragment.FRAGMENT_ID
else -> selectedFragmentStr
}

if (selectedFragment == OnboardingFragment.FRAGMENT_ID) {
setTheme(R.style.Theme_Curbox_Onboarding)
Expand Down Expand Up @@ -104,6 +127,13 @@ class FragmentActivity : AppCompatActivity() {
KeywordBlockerFragment.FRAGMENT_ID,
neth.iecal.curbox.ui.fragments.main.reducers.api.ApiFragment.FRAGMENT_ID,
neth.iecal.curbox.ui.fragments.main.reducers.sync.SyncFragment.FRAGMENT_ID,
TimeBasedSettingsFragment.FRAGMENT_ID,
UsageBasedSettingsFragment.FRAGMENT_ID,
KeywordTimeBasedSettingsFragment.FRAGMENT_ID,
KeywordUsageBasedSettingsFragment.FRAGMENT_ID,
AutoDndTimeSettingsFragment.FRAGMENT_ID,
GrayscaleTimeSettingsFragment.FRAGMENT_ID,
WarningConfigFragment.FRAGMENT_ID,
AntiUninstallFragment.FRAGMENT_ID,
ServiceProtectionFragment.FRAGMENT_ID,
SettingsChangeDelayFragment.FRAGMENT_ID,
Expand All @@ -129,6 +159,24 @@ class FragmentActivity : AppCompatActivity() {
IntentsLogFragment.FRAGMENT_ID -> IntentsLogFragment()
neth.iecal.curbox.ui.fragments.main.reducers.api.ApiFragment.FRAGMENT_ID -> neth.iecal.curbox.ui.fragments.main.reducers.api.ApiFragment()
neth.iecal.curbox.ui.fragments.main.reducers.sync.SyncFragment.FRAGMENT_ID -> neth.iecal.curbox.ui.fragments.main.reducers.sync.SyncFragment()
TimeBasedSettingsFragment.FRAGMENT_ID -> TimeBasedSettingsFragment()
UsageBasedSettingsFragment.FRAGMENT_ID -> UsageBasedSettingsFragment()
KeywordTimeBasedSettingsFragment.FRAGMENT_ID -> KeywordTimeBasedSettingsFragment()
KeywordUsageBasedSettingsFragment.FRAGMENT_ID -> KeywordUsageBasedSettingsFragment()
AutoDndTimeSettingsFragment.FRAGMENT_ID -> AutoDndTimeSettingsFragment()
GrayscaleTimeSettingsFragment.FRAGMENT_ID -> GrayscaleTimeSettingsFragment()
WarningConfigFragment.FRAGMENT_ID -> {
val configJson = intent.getStringExtra(WarningConfigFragment.ARG_CONFIG) ?: intent.getStringExtra("arg_config")
val requestKey = intent.getStringExtra(WarningConfigFragment.ARG_REQUEST_KEY) ?: intent.getStringExtra("arg_request_key") ?: WarningConfigFragment.RESULT_KEY
val isNew = intent.getBooleanExtra(WarningConfigFragment.ARG_IS_NEW, intent.getBooleanExtra("arg_is_new", false))
val isOnOpen = intent.getBooleanExtra(WarningConfigFragment.ARG_IS_ON_OPEN, intent.getBooleanExtra("arg_is_on_open", false))
if (configJson != null) {
val config = com.google.gson.Gson().fromJson(configJson, neth.iecal.curbox.data.models.AppBlockerWarningScreenConfig::class.java)
WarningConfigFragment.newInstance(config, requestKey, isNew, isOnOpen)
} else {
WarningConfigFragment()
}
}
AntiUninstallFragment.FRAGMENT_ID -> AntiUninstallFragment()
ServiceProtectionFragment.FRAGMENT_ID -> ServiceProtectionFragment()
SettingsChangeDelayFragment.FRAGMENT_ID -> SettingsChangeDelayFragment()
Expand Down
Loading