From 6d6418b8e07219a99d26211ad2ae05b44e93c9eb Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Wed, 6 Feb 2019 00:00:29 +0800
Subject: [PATCH] Migrate to kotlinx findView

---
 mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt  | 8 ++++----
 .../src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt   | 7 +++----
 .../be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt | 8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt b/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt
index f20e6bea..e8590351 100644
--- a/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt
+++ b/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt
@@ -6,7 +6,6 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewStub
 import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.Spinner
@@ -17,6 +16,7 @@ import be.mygod.vpnhotspot.util.launchUrl
 import be.mygod.vpnhotspot.widget.SmartSnackbar
 import com.android.billingclient.api.*
 import kotlinx.android.parcel.Parcelize
+import kotlinx.android.synthetic.main.fragment_ebeg.view.*
 import timber.log.Timber
 
 /**
@@ -52,9 +52,9 @@ class EBegFragment : AppCompatDialogFragment(), PurchasesUpdatedListener, Billin
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         dialog!!.setTitle(R.string.settings_misc_donate)
-        googleSpinner = view.findViewById(R.id.donations__google_android_market_spinner)
+        googleSpinner = view.donations__google_android_market_spinner
         onBillingServiceDisconnected()
-        view.findViewById<Button>(R.id.donations__google_android_market_donate_button).setOnClickListener {
+        view.donations__google_android_market_donate_button.setOnClickListener {
             val sku = skus?.getOrNull(googleSpinner.selectedItemPosition)
             if (sku == null) {
                 openDialog(R.string.donations__google_android_market_not_supported_title,
@@ -63,7 +63,7 @@ class EBegFragment : AppCompatDialogFragment(), PurchasesUpdatedListener, Billin
                     .setSkuDetails(sku).build())
         }
         @Suppress("ConstantConditionIf")
-        if (BuildConfig.DONATIONS) (view.findViewById<ViewStub>(R.id.donations__more_stub).inflate() as Button)
+        if (BuildConfig.DONATIONS) (view.donations__more_stub.inflate() as Button)
                 .setOnClickListener { requireContext().launchUrl("https://mygod.be/donate/") }
     }
 
diff --git a/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt b/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt
index 6e93fd84..01ef2fb8 100644
--- a/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt
+++ b/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt
@@ -4,11 +4,10 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewStub
 import android.widget.Button
-import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatDialogFragment
 import be.mygod.vpnhotspot.util.launchUrl
+import kotlinx.android.synthetic.main.fragment_ebeg.view.*
 
 /**
  * Based on: https://github.com/PrivacyApps/donations/blob/747d36a18433c7e9329691054122a8ad337a62d2/Donations/src/main/java/org/sufficientlysecure/donations/DonationsFragment.java
@@ -19,8 +18,8 @@ class EBegFragment : AppCompatDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        view.findViewById<LinearLayout>(R.id.donations__google).visibility = View.GONE
-        (view.findViewById<ViewStub>(R.id.donations__more_stub).inflate() as Button).setOnClickListener {
+        view.donations__google.visibility = View.GONE
+        (view.donations__more_stub.inflate() as Button).setOnClickListener {
             requireContext().launchUrl("https://mygod.be/donate/")
         }
     }
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt
index f438dc1c..f430baf3 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt
@@ -12,8 +12,8 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import be.mygod.vpnhotspot.AlertDialogFragment
 import be.mygod.vpnhotspot.R
-import com.google.android.material.textfield.TextInputLayout
 import kotlinx.android.parcel.Parcelize
+import kotlinx.android.synthetic.main.dialog_wifi_ap.view.*
 import java.nio.charset.Charset
 
 /**
@@ -44,8 +44,8 @@ class WifiP2pDialogFragment : AlertDialogFragment<WifiP2pDialogFragment.Arg, Wif
         mView = requireActivity().layoutInflater.inflate(R.layout.dialog_wifi_ap, null)
         setView(mView)
         setTitle(R.string.repeater_configure)
-        mSsid = mView.findViewById(R.id.ssid)
-        mPassword = mView.findViewById(R.id.password)
+        mSsid = mView.ssid
+        mPassword = mView.password
         setPositiveButton(context.getString(R.string.wifi_save), listener)
         setNegativeButton(context.getString(R.string.wifi_cancel), null)
         setNeutralButton(context.getString(R.string.repeater_reset_credentials), listener)
@@ -64,7 +64,7 @@ class WifiP2pDialogFragment : AlertDialogFragment<WifiP2pDialogFragment.Arg, Wif
         val mSsidString = mSsid.text.toString()
         val ssidValid = mSsid.length() != 0 && Charset.forName("UTF-8").encode(mSsidString).limit() <= 32
         val passwordValid = mPassword.length() >= 8
-        mView.findViewById<TextInputLayout>(R.id.password_wrapper).error =
+        mView.password_wrapper.error =
                 if (passwordValid) null else requireContext().getString(R.string.credentials_password_too_short)
         (dialog as AlertDialog).getButton(DialogInterface.BUTTON_POSITIVE).isEnabled = ssidValid && passwordValid
     }