Skip to content

Migrate shortcuts settings to HA components #7033

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
himu-gupta wants to merge 3 commits into from
+120 −165
Closed

Migrate shortcuts settings to HA components #7033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c98d8f7
Migrate shortcuts settings to HA components
himu-gupta Jun 16, 2026
a7e3f6a
Fix pinned shortcut update label detection
himu-gupta Jun 18, 2026
409fc34
Merge branch 'main' into feature/manage-shortcuts-material3
himu-gupta Jun 22, 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
5 changes: 4 additions & 1 deletion .../io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsSettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.fragment.app.viewModels
import com.mikepenz.iconics.typeface.IIcon
import dagger.hilt.android.AndroidEntryPoint
import io.homeassistant.companion.android.common.R as commonR
import io.homeassistant.companion.android.common.compose.theme.HATheme
import io.homeassistant.companion.android.settings.addHelpMenuProvider
import io.homeassistant.companion.android.settings.shortcuts.views.ManageShortcutsView
import io.homeassistant.companion.android.util.compose.HomeAssistantAppTheme
Expand Down Expand Up @@ -48,7 +49,9 @@ class ManageShortcutsSettingsFragment : Fragment() {
)
}

ManageShortcutsView(viewModel = viewModel, showIconDialog = { showingTag = it })
HATheme {
ManageShortcutsView(viewModel = viewModel, showIconDialog = { showingTag = it })
}
}
}
}
Expand Down
Loading
Loading