Fix building after build.gradle changes during rebase

home-assistant · Aug 23, 2021 · d1b2544 · d1b2544
1 parent 6c09dfc
commit d1b2544
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 23 deletions.
diff --git a/wear/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt b/wear/src/main/java/io/homeassistant/companion/android/onboarding/OnboardingActivity.kt
@@ -21,7 +21,7 @@ import io.homeassistant.companion.android.R
 import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 import io.homeassistant.companion.android.onboarding.authentication.AuthenticationActivity
 import io.homeassistant.companion.android.onboarding.manual_setup.ManualSetupActivity
-import kotlinx.android.synthetic.main.activity_integration.loading_view
+import io.homeassistant.companion.android.util.LoadingView
 import javax.inject.Inject
 
 class OnboardingActivity : AppCompatActivity(), OnboardingView {
@@ -38,6 +38,7 @@ class OnboardingActivity : AppCompatActivity(), OnboardingView {
 
     @Inject
     lateinit var presenter: OnboardingPresenter
+    private lateinit var loadingView: LoadingView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -51,6 +52,8 @@ class OnboardingActivity : AppCompatActivity(), OnboardingView {
 
         setContentView(R.layout.activity_onboarding)
 
+        loadingView = findViewById<LoadingView>(R.id.loading_view)
+
         adapter = ServerListAdapter(ArrayList())
         adapter.onInstanceClicked = { instance -> presenter.onAdapterItemClick(instance) }
         adapter.onManualSetupClicked = { this.startManualSetup() }
@@ -65,7 +68,7 @@ class OnboardingActivity : AppCompatActivity(), OnboardingView {
     override fun onResume() {
         super.onResume()
 
-        loading_view.visibility = View.GONE
+        loadingView.visibility = View.GONE
 
         // Add listener to exchange authentication tokens
         Wearable.getDataClient(this).addListener(presenter)
@@ -92,7 +95,7 @@ class OnboardingActivity : AppCompatActivity(), OnboardingView {
     }
 
     override fun showLoading() {
-        loading_view.visibility = View.VISIBLE
+        loadingView.visibility = View.VISIBLE
     }
 
     override fun showError() {
@@ -102,7 +105,7 @@ class OnboardingActivity : AppCompatActivity(), OnboardingView {
             putExtra(ConfirmationActivity.EXTRA_MESSAGE, getString(R.string.failed_connection))
         }
         startActivity(intent)
-        loading_view.visibility = View.GONE
+        loadingView.visibility = View.GONE
     }
 
     override fun onInstanceFound(instance: HomeAssistantInstance) {

diff --git a/...va/io/homeassistant/companion/android/onboarding/authentication/AuthenticationActivity.kt b/...va/io/homeassistant/companion/android/onboarding/authentication/AuthenticationActivity.kt
@@ -5,14 +5,16 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.View
+import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import androidx.wear.activity.ConfirmationActivity
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import io.homeassistant.companion.android.DaggerPresenterComponent
 import io.homeassistant.companion.android.PresenterModule
 import io.homeassistant.companion.android.R
 import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 import io.homeassistant.companion.android.onboarding.integration.MobileAppIntegrationActivity
-import kotlinx.android.synthetic.main.activity_authentication.*
+import io.homeassistant.companion.android.util.LoadingView
 import javax.inject.Inject
 
 class AuthenticationActivity : AppCompatActivity(), AuthenticationView {
@@ -28,6 +30,7 @@ class AuthenticationActivity : AppCompatActivity(), AuthenticationView {
 
     @Inject
     lateinit var presenter: AuthenticationPresenter
+    private lateinit var loadingView: LoadingView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -46,27 +49,29 @@ class AuthenticationActivity : AppCompatActivity(), AuthenticationView {
 
         setContentView(R.layout.activity_authentication)
 
-        button_next.setOnClickListener {
+        loadingView = findViewById<LoadingView>(R.id.loading_view)
+
+        findViewById<FloatingActionButton>(R.id.button_next).setOnClickListener {
             presenter.onNextClicked(
                 intent.getStringExtra("flowId")!!,
-                username.text.toString(),
-                password.text.toString()
+                findViewById<EditText>(R.id.username).text.toString(),
+                findViewById<EditText>(R.id.password).text.toString()
             )
         }
     }
 
     override fun onResume() {
         super.onResume()
 
-        loading_view.visibility = View.GONE
+        loadingView.visibility = View.GONE
     }
 
     override fun startIntegration() {
         startActivity(MobileAppIntegrationActivity.newInstance(this))
     }
 
     override fun showLoading() {
-        loading_view.visibility = View.VISIBLE
+        loadingView.visibility = View.VISIBLE
     }
 
     override fun showError() {
@@ -76,7 +81,7 @@ class AuthenticationActivity : AppCompatActivity(), AuthenticationView {
             putExtra(ConfirmationActivity.EXTRA_MESSAGE, getString(R.string.failed_authentication))
         }
         startActivity(intent)
-        loading_view.visibility = View.GONE
+        loadingView.visibility = View.GONE
     }
 
     override fun onDestroy() {

diff --git a/...io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationActivity.kt b/...io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import androidx.wear.activity.ConfirmationActivity
 import com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -13,7 +14,7 @@ import io.homeassistant.companion.android.PresenterModule
 import io.homeassistant.companion.android.R
 import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 import io.homeassistant.companion.android.home.HomeActivity
-import kotlinx.android.synthetic.main.activity_integration.*
+import io.homeassistant.companion.android.util.LoadingView
 import javax.inject.Inject
 
 class MobileAppIntegrationActivity : AppCompatActivity(), MobileAppIntegrationView {
@@ -27,6 +28,7 @@ class MobileAppIntegrationActivity : AppCompatActivity(), MobileAppIntegrationVi
 
     @Inject
     lateinit var presenter: MobileAppIntegrationPresenter
+    private lateinit var loadingView: LoadingView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -40,17 +42,20 @@ class MobileAppIntegrationActivity : AppCompatActivity(), MobileAppIntegrationVi
 
         setContentView(R.layout.activity_integration)
 
-        server_url.setText(Build.MODEL)
+        loadingView = findViewById<LoadingView>(R.id.loading_view)
+
+        val serverUrl: EditText = findViewById(R.id.server_url)
+        serverUrl.setText(Build.MODEL)
 
         findViewById<FloatingActionButton>(R.id.finish).setOnClickListener {
-            presenter.onRegistrationAttempt(server_url.text.toString())
+            presenter.onRegistrationAttempt(serverUrl.text.toString())
         }
     }
 
     override fun onResume() {
         super.onResume()
 
-        loading_view.visibility = View.GONE
+        loadingView.visibility = View.GONE
     }
 
     override fun deviceRegistered() {
@@ -61,7 +66,7 @@ class MobileAppIntegrationActivity : AppCompatActivity(), MobileAppIntegrationVi
     }
 
     override fun showLoading() {
-        loading_view.visibility = View.VISIBLE
+        loadingView.visibility = View.VISIBLE
     }
 
     override fun showError() {
@@ -71,7 +76,7 @@ class MobileAppIntegrationActivity : AppCompatActivity(), MobileAppIntegrationVi
             putExtra(ConfirmationActivity.EXTRA_MESSAGE, getString(R.string.failed_registration))
         }
         startActivity(intent)
-        loading_view.visibility = View.GONE
+        loadingView.visibility = View.GONE
     }
 
     override fun onDestroy() {

diff --git a/...in/java/io/homeassistant/companion/android/onboarding/manual_setup/ManualSetupActivity.kt b/...in/java/io/homeassistant/companion/android/onboarding/manual_setup/ManualSetupActivity.kt
@@ -4,14 +4,16 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import androidx.wear.activity.ConfirmationActivity
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import io.homeassistant.companion.android.DaggerPresenterComponent
 import io.homeassistant.companion.android.PresenterModule
 import io.homeassistant.companion.android.R
 import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 import io.homeassistant.companion.android.onboarding.authentication.AuthenticationActivity
-import kotlinx.android.synthetic.main.activity_manual_setup.*
+import io.homeassistant.companion.android.util.LoadingView
 import javax.inject.Inject
 
 class ManualSetupActivity : AppCompatActivity(), ManualSetupView {
@@ -25,6 +27,7 @@ class ManualSetupActivity : AppCompatActivity(), ManualSetupView {
 
     @Inject
     lateinit var presenter: ManualSetupPresenter
+    private lateinit var loadingView: LoadingView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,8 +41,10 @@ class ManualSetupActivity : AppCompatActivity(), ManualSetupView {
 
         setContentView(R.layout.activity_manual_setup)
 
-        button_next.setOnClickListener {
-            presenter.onNextClicked(server_url.text.toString())
+        loadingView = findViewById<LoadingView>(R.id.loading_view)
+
+        findViewById<FloatingActionButton>(R.id.button_next).setOnClickListener {
+            presenter.onNextClicked(findViewById<EditText>(R.id.server_url).text.toString())
         }
     }
 
@@ -48,7 +53,7 @@ class ManualSetupActivity : AppCompatActivity(), ManualSetupView {
     }
 
     override fun showLoading() {
-        loading_view.visibility = View.VISIBLE
+        loadingView.visibility = View.VISIBLE
     }
 
     override fun showError() {
@@ -58,13 +63,13 @@ class ManualSetupActivity : AppCompatActivity(), ManualSetupView {
             putExtra(ConfirmationActivity.EXTRA_MESSAGE, getString(R.string.failed_connection))
         }
         startActivity(intent)
-        loading_view.visibility = View.GONE
+        loadingView.visibility = View.GONE
     }
 
     override fun onResume() {
         super.onResume()
 
-        loading_view.visibility = View.GONE
+        loadingView.visibility = View.GONE
     }
 
     override fun onDestroy() {