forked from home-assistant/android
-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:home-assistant/android
# Conflicts: # .github/actions/create-release-notes/action.yml # .github/workflows/onPush.yml # .github/workflows/pr.yml # .github/workflows/weekly.yaml # app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt # app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt # gradle/libs.versions.toml
- Loading branch information
Showing
173 changed files
with
3,943 additions
and
2,115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <background android:drawable="@android:color/holo_red_dark"/> | ||
| <foreground android:drawable="@drawable/ic_launcher_foreground"/> | ||
| <background android:drawable="@android:color/holo_red_dark" /> | ||
| <foreground android:drawable="@drawable/ic_launcher_foreground" /> | ||
| <monochrome android:drawable="@drawable/ic_launcher_monochrome" /> | ||
| </adaptive-icon> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <background android:drawable="@android:color/holo_red_dark"/> | ||
| <foreground android:drawable="@drawable/ic_launcher_foreground"/> | ||
| <monochrome android:drawable="@drawable/ic_launcher_monochrome" /> | ||
| <background android:drawable="@android:color/holo_red_dark" /> | ||
| <foreground android:drawable="@drawable/ic_launcher_foreground_round" /> | ||
| <monochrome android:drawable="@drawable/ic_launcher_monochrome_round" /> | ||
| </adaptive-icon> |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
...o/homeassistant/companion/android/settings/developer/location/LocationTrackingFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package io.homeassistant.companion.android.settings.developer.location | ||
|
|
||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.Menu | ||
| import android.view.MenuInflater | ||
| import android.view.MenuItem | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.compose.ui.platform.ComposeView | ||
| import androidx.core.net.toUri | ||
| import androidx.core.view.MenuHost | ||
| import androidx.core.view.MenuProvider | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.viewModels | ||
| import androidx.lifecycle.Lifecycle | ||
| import com.google.accompanist.themeadapter.material.MdcTheme | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import io.homeassistant.companion.android.R | ||
| import io.homeassistant.companion.android.common.data.servers.ServerManager | ||
| import io.homeassistant.companion.android.settings.developer.location.views.LocationTrackingView | ||
| import javax.inject.Inject | ||
| import io.homeassistant.companion.android.common.R as commonR | ||
|
|
||
| @AndroidEntryPoint | ||
| class LocationTrackingFragment : Fragment() { | ||
|
|
||
| @Inject | ||
| lateinit var serverManager: ServerManager | ||
|
|
||
| val viewModel: LocationTrackingViewModel by viewModels() | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View { | ||
| return ComposeView(requireContext()).apply { | ||
| setContent { | ||
| MdcTheme { | ||
| LocationTrackingView( | ||
| useHistory = viewModel.historyEnabled, | ||
| onSetHistory = viewModel::enableHistory, | ||
| history = viewModel.historyPagerFlow, | ||
| serversList = serverManager.defaultServers | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| val menuHost: MenuHost = requireActivity() | ||
| menuHost.addMenuProvider( | ||
| object : MenuProvider { | ||
| override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { | ||
| menuInflater.inflate(R.menu.menu_fragment_locationtracking, menu) | ||
| } | ||
|
|
||
| override fun onPrepareMenu(menu: Menu) { | ||
| menu.findItem(R.id.get_help).apply { | ||
| intent = Intent(Intent.ACTION_VIEW, "https://companion.home-assistant.io/docs/troubleshooting/faqs#device-tracker-is-not-updating-in-android-app".toUri()) | ||
| } | ||
| } | ||
|
|
||
| override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) { | ||
| R.id.history_all, R.id.history_sent, R.id.history_skipped, R.id.history_failed -> { | ||
| viewModel.setHistoryFilter(menuItem.itemId) | ||
| menuItem.isChecked = true | ||
| true | ||
| } | ||
| else -> false | ||
| } | ||
| }, | ||
| viewLifecycleOwner, | ||
| Lifecycle.State.RESUMED | ||
| ) | ||
| } | ||
|
|
||
| override fun onResume() { | ||
| super.onResume() | ||
| activity?.title = getString(commonR.string.location_tracking) | ||
| } | ||
| } |
Oops, something went wrong.