Skip to content

Commit c5c31f4

Browse files
sds100sds100
committed
#1923 rename PRO mode to Expert mode
1 parent 85f17b4 commit c5c31f4

File tree

61 files changed

+1097
-1338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1097
-1338
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#### TO BE RELEASED
44

5+
Renamed PRO mode to Expert mode because it sounded like a paid premium feature even though it is free.
6+
57
## Added
68

79
- #1915 ask user to remove "adb shell" from Shell command.

‎app/src/main/java/io/github/sds100/keymapper/system/accessibility/AccessibilityServiceController.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import dagger.assisted.AssistedInject
66
import io.github.sds100.keymapper.base.actions.PerformActionsUseCaseImpl
77
import io.github.sds100.keymapper.base.constraints.DetectConstraintsUseCaseImpl
88
import io.github.sds100.keymapper.base.detection.DetectKeyMapsUseCaseImpl
9+
import io.github.sds100.keymapper.base.expertmode.SystemBridgeSetupAssistantController
910
import io.github.sds100.keymapper.base.input.InputEventHub
1011
import io.github.sds100.keymapper.base.keymaps.FingerprintGesturesSupportedUseCase
1112
import io.github.sds100.keymapper.base.keymaps.PauseKeyMapsUseCase
12-
import io.github.sds100.keymapper.base.promode.SystemBridgeSetupAssistantController
1313
import io.github.sds100.keymapper.base.system.accessibility.AccessibilityNodeRecorder
1414
import io.github.sds100.keymapper.base.system.accessibility.BaseAccessibilityServiceController
1515
import io.github.sds100.keymapper.base.system.inputmethod.AutoSwitchImeController

‎app/src/main/java/io/github/sds100/keymapper/trigger/ConfigTriggerViewModel.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ConfigTriggerViewModel @Inject constructor(
5454

5555
override fun onEditFloatingLayoutClick() {}
5656

57-
override fun showTriggerSetup(shortcut: TriggerSetupShortcut, forceProMode: Boolean) {
57+
override fun showTriggerSetup(shortcut: TriggerSetupShortcut, forceExpertMode: Boolean) {
5858
when (shortcut) {
5959
TriggerSetupShortcut.ASSISTANT,
6060
TriggerSetupShortcut.FLOATING_BUTTON_CUSTOM,
@@ -63,7 +63,7 @@ class ConfigTriggerViewModel @Inject constructor(
6363
navigateToAdvancedTriggers("purchase_assistant_trigger")
6464
}
6565

66-
else -> super.showTriggerSetup(shortcut, forceProMode)
66+
else -> super.showTriggerSetup(shortcut, forceExpertMode)
6767
}
6868
}
6969
}

‎base/src/main/assets/whats-new.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
✨ Screen-off remapping
2-
You can now remap ALL buttons when the screen is off (including the power button) for free with PRO mode.
2+
You can now remap ALL buttons when the screen is off (including the power button) for free with Expert mode.
33

44
🎯 New Actions
55
• Run shell commands

‎base/src/main/java/io/github/sds100/keymapper/base/ActivityViewModel.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class ActivityViewModel @Inject constructor(
2929
setupAccessibilityServiceDelegate.showCantFindAccessibilitySettingsDialog()
3030
}
3131

32-
fun launchProModeSetup() {
32+
fun launchExpertModeSetup() {
3333
viewModelScope.launch {
34-
navigate("pro_mode_setup", NavDestination.ProModeSetup)
34+
navigate("expert_mode_setup", NavDestination.ExpertModeSetup)
3535
}
3636
}
3737
}

‎base/src/main/java/io/github/sds100/keymapper/base/BaseKeyMapperApp.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import androidx.lifecycle.LifecycleObserver
1616
import androidx.lifecycle.OnLifecycleEvent
1717
import androidx.lifecycle.ProcessLifecycleOwner
1818
import androidx.multidex.MultiDexApplication
19+
import io.github.sds100.keymapper.base.expertmode.SystemBridgeAutoStarter
1920
import io.github.sds100.keymapper.base.logging.KeyMapperLoggingTree
2021
import io.github.sds100.keymapper.base.logging.SystemBridgeLogger
21-
import io.github.sds100.keymapper.base.promode.SystemBridgeAutoStarter
2222
import io.github.sds100.keymapper.base.settings.Theme
2323
import io.github.sds100.keymapper.base.system.accessibility.AccessibilityServiceAdapterImpl
2424
import io.github.sds100.keymapper.base.system.notifications.NotificationController

‎base/src/main/java/io/github/sds100/keymapper/base/BaseMainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ abstract class BaseMainActivity : AppCompatActivity() {
254254
}
255255

256256
ACTION_START_SYSTEM_BRIDGE -> {
257-
viewModel.launchProModeSetup()
257+
viewModel.launchExpertModeSetup()
258258

259259
// Only clear the intent if it is handled in case it is used elsewhere
260260
this.intent = null

‎base/src/main/java/io/github/sds100/keymapper/base/BaseMainNavHost.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import io.github.sds100.keymapper.base.actions.uielement.InteractUiElementScreen
2525
import io.github.sds100.keymapper.base.actions.uielement.InteractUiElementViewModel
2626
import io.github.sds100.keymapper.base.constraints.ChooseConstraintScreen
2727
import io.github.sds100.keymapper.base.constraints.ChooseConstraintViewModel
28+
import io.github.sds100.keymapper.base.expertmode.ExpertModeScreen
29+
import io.github.sds100.keymapper.base.expertmode.ExpertModeSetupScreen
2830
import io.github.sds100.keymapper.base.logging.LogScreen
2931
import io.github.sds100.keymapper.base.onboarding.HandleAccessibilityServiceDialogs
3032
import io.github.sds100.keymapper.base.onboarding.SetupAccessibilityServiceDelegateImpl
31-
import io.github.sds100.keymapper.base.promode.ProModeScreen
32-
import io.github.sds100.keymapper.base.promode.ProModeSetupScreen
3333
import io.github.sds100.keymapper.base.settings.AutomaticChangeImeSettingsScreen
3434
import io.github.sds100.keymapper.base.settings.DefaultOptionsSettingsScreen
3535
import io.github.sds100.keymapper.base.settings.SettingsScreen
@@ -135,8 +135,8 @@ fun BaseMainNavHost(
135135
)
136136
}
137137

138-
composable<NavDestination.ProMode> {
139-
ProModeScreen(
138+
composable<NavDestination.ExpertMode> {
139+
ExpertModeScreen(
140140
modifier = Modifier
141141
.fillMaxSize()
142142
.windowInsetsPadding(
@@ -151,8 +151,8 @@ fun BaseMainNavHost(
151151
)
152152
}
153153

154-
composable<NavDestination.ProModeSetup> {
155-
ProModeSetupScreen(
154+
composable<NavDestination.ExpertModeSetup> {
155+
ExpertModeSetupScreen(
156156
viewModel = hiltViewModel(),
157157
)
158158
}

‎base/src/main/java/io/github/sds100/keymapper/base/BaseViewModelHiltModule.kt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ import io.github.sds100.keymapper.base.constraints.ConfigConstraintsUseCaseImpl
2525
import io.github.sds100.keymapper.base.constraints.CreateConstraintUseCase
2626
import io.github.sds100.keymapper.base.constraints.CreateConstraintUseCaseImpl
2727
import io.github.sds100.keymapper.base.constraints.DisplayConstraintUseCase
28+
import io.github.sds100.keymapper.base.expertmode.ExpertModeSetupDelegateImpl
29+
import io.github.sds100.keymapper.base.expertmode.SystemBridgeSetupDelegate
30+
import io.github.sds100.keymapper.base.expertmode.SystemBridgeSetupUseCase
31+
import io.github.sds100.keymapper.base.expertmode.SystemBridgeSetupUseCaseImpl
2832
import io.github.sds100.keymapper.base.home.ListKeyMapsUseCase
2933
import io.github.sds100.keymapper.base.home.ListKeyMapsUseCaseImpl
3034
import io.github.sds100.keymapper.base.home.ShowHomeScreenAlertsUseCase
@@ -37,10 +41,6 @@ import io.github.sds100.keymapper.base.logging.ShareLogcatUseCase
3741
import io.github.sds100.keymapper.base.logging.ShareLogcatUseCaseImpl
3842
import io.github.sds100.keymapper.base.onboarding.OnboardingTipDelegate
3943
import io.github.sds100.keymapper.base.onboarding.OnboardingTipDelegateImpl
40-
import io.github.sds100.keymapper.base.promode.ProModeSetupDelegateImpl
41-
import io.github.sds100.keymapper.base.promode.SystemBridgeSetupDelegate
42-
import io.github.sds100.keymapper.base.promode.SystemBridgeSetupUseCase
43-
import io.github.sds100.keymapper.base.promode.SystemBridgeSetupUseCaseImpl
4444
import io.github.sds100.keymapper.base.settings.ConfigSettingsUseCase
4545
import io.github.sds100.keymapper.base.settings.ConfigSettingsUseCaseImpl
4646
import io.github.sds100.keymapper.base.shortcuts.CreateKeyMapShortcutUseCase
@@ -153,7 +153,7 @@ abstract class BaseViewModelHiltModule {
153153

154154
@Binds
155155
@ViewModelScoped
156-
abstract fun bindProModeSetupUseCase(
156+
abstract fun bindExpertModeSetupUseCase(
157157
impl: SystemBridgeSetupUseCaseImpl,
158158
): SystemBridgeSetupUseCase
159159

@@ -197,5 +197,7 @@ abstract class BaseViewModelHiltModule {
197197

198198
@Binds
199199
@ViewModelScoped
200-
abstract fun bindProModeSetupDelegate(impl: ProModeSetupDelegateImpl): SystemBridgeSetupDelegate
200+
abstract fun bindExpertModeSetupDelegate(
201+
impl: ExpertModeSetupDelegateImpl,
202+
): SystemBridgeSetupDelegate
201203
}

‎base/src/main/java/io/github/sds100/keymapper/base/actions/ActionsScreen.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ fun ActionsScreen(modifier: Modifier = Modifier, viewModel: ConfigActionsViewMod
7979
sheetState = sheetState,
8080
onDismissRequest = viewModel::dismissFixKeyEventActionBottomSheet,
8181
onEnableAccessibilityServiceClick = viewModel::onEnableAccessibilityServiceClick,
82-
onEnableProModeClick = viewModel::onEnableProModeForKeyEventActionsClick,
82+
onEnableExpertModeClick = viewModel::onEnableExpertModeForKeyEventActionsClick,
8383
onEnableInputMethodClick = viewModel::onEnableImeClick,
8484
onChooseInputMethodClick = viewModel::onChooseImeClick,
8585
onDoneClick = viewModel::dismissFixKeyEventActionBottomSheet,
86-
onSelectProMode = viewModel::onSelectProMode,
86+
onSelectExpertMode = viewModel::onSelectExpertMode,
8787
onSelectInputMethod = viewModel::onSelectInputMethod,
8888
onAutoSwitchImeCheckedChange = viewModel::onAutoSwitchImeCheckedChange,
8989
)
@@ -150,6 +150,7 @@ private fun ActionsScreen(
150150

151151
when (state) {
152152
State.Loading -> Loading()
153+
153154
is State.Data<ConfigActionsState> -> Surface(modifier = modifier) {
154155
Column {
155156
Spacer(Modifier.height(8.dp))

0 commit comments

Comments
 (0)