Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependency updates and minor changes to accompany them #1865

Merged
merged 1 commit into from Nov 3, 2021
Merged

Dependency updates and minor changes to accompany them #1865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions app/build.gradle.kts
View file
Open in desktop
Expand Up @@ -147,7 +147,7 @@ dependencies {
kapt("com.google.dagger:dagger-compiler:2.39.1")

implementation("androidx.appcompat:appcompat:1.3.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.1")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.preference:preference-ktx:1.1.1")
Expand All @@ -156,7 +156,6 @@ dependencies {
implementation("com.google.android.material:material:1.4.0")

implementation("androidx.wear:wear-remote-interactions:1.0.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-rc01")
implementation("com.google.android.gms:play-services-wearable:17.1.0")

implementation("androidx.room:room-runtime:2.3.0")
Expand All @@ -168,9 +167,9 @@ dependencies {
implementation("com.squareup.picasso:picasso:2.8")

"fullImplementation"("com.google.android.gms:play-services-location:18.0.0")
"fullImplementation"("com.google.firebase:firebase-core:19.0.2")
"fullImplementation"("com.google.firebase:firebase-core:20.0.0")
"fullImplementation"("com.google.firebase:firebase-iid:21.1.0")
"fullImplementation"("com.google.firebase:firebase-messaging:22.0.0")
"fullImplementation"("com.google.firebase:firebase-messaging:23.0.0")
"fullImplementation"("io.sentry:sentry-android:5.2.4")
"fullImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2")

Expand All @@ -192,7 +191,7 @@ dependencies {
implementation("androidx.compose.runtime:runtime:1.0.4")
implementation("androidx.compose.ui:ui:1.0.4")
implementation("androidx.compose.ui:ui-tooling:1.0.4")
implementation("androidx.activity:activity-compose:1.3.1")
implementation("androidx.activity:activity-compose:1.4.0")
implementation("com.google.android.material:compose-theme-adapter:1.0.4")
implementation("com.google.accompanist:accompanist-appcompat-theme:0.20.0")

Expand Down
2 changes: 1 addition & 1 deletion app/src/full/java/io/homeassistant/companion/android/settings/SettingsWearActivity.kt
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ class SettingsWearActivity : AppCompatActivity(), CapabilityClient.OnCapabilityC
private var wearNodesWithApp: Set<Node>? = null
private var allConnectedNodes: List<Node>? = null

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_activity_settings_wear, menu)
return true
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/homeassistant/companion/android/settings/SettingsActivity.kt
View file
Open in desktop
Expand Up @@ -17,10 +17,10 @@ class SettingsActivity : BaseActivity() {
}
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_activity_settings, menu)

(menu?.findItem(R.id.action_search)?.actionView as SearchView).apply {
(menu.findItem(R.id.action_search)?.actionView as SearchView).apply {
queryHint = getString(R.string.search_sensors)
maxWidth = Integer.MAX_VALUE
}
Expand Down