codezwc
diff --git a/‎app/build.gradle
Lines changed: 3 additions & 0 deletions b/‎app/build.gradle
Lines changed: 3 additions & 0 deletions
diff --git a/‎app/src/main/java/com/duckduckgo/app/about/AboutDuckDuckGoActivity.kt
Lines changed: 5 additions & 6 deletions b/‎app/src/main/java/com/duckduckgo/app/about/AboutDuckDuckGoActivity.kt
Lines changed: 5 additions & 6 deletions
diff --git a/‎app/src/main/java/com/duckduckgo/app/browser/TabSwitcherButton.kt
Lines changed: 10 additions & 10 deletions b/‎app/src/main/java/com/duckduckgo/app/browser/TabSwitcherButton.kt
Lines changed: 10 additions & 10 deletions
diff --git a/‎app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionViewHolderFactory.kt
Lines changed: 15 additions & 15 deletions b/‎app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionViewHolderFactory.kt
Lines changed: 15 additions & 15 deletions
diff --git a/‎app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
Lines changed: 9 additions & 3 deletions b/‎app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
Lines changed: 9 additions & 3 deletions
diff --git a/‎app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
Lines changed: 20 additions & 11 deletions b/‎app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
Lines changed: 20 additions & 11 deletions
diff --git a/‎app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
Lines changed: 21 additions & 12 deletions b/‎app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
Lines changed: 21 additions & 12 deletions
@@ -41,6 +41,9 @@ android {
             }
         }
     }
+    buildFeatures {
+        viewBinding = true
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
 
@@ -20,20 +20,19 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import com.duckduckgo.app.browser.BrowserActivity
-import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.browser.databinding.ActivityAboutDuckDuckGoBinding
 import com.duckduckgo.app.global.AppUrl.Url
 import com.duckduckgo.app.global.DuckDuckGoActivity
-import kotlinx.android.synthetic.main.content_about_duck_duck_go.*
-import kotlinx.android.synthetic.main.include_toolbar.*
 
 class AboutDuckDuckGoActivity : DuckDuckGoActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_about_duck_duck_go)
-        setupToolbar(toolbar)
+        val binding = ActivityAboutDuckDuckGoBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setupToolbar(binding.includeToolbar.toolbar)
 
-        learnMoreLink.setOnClickListener {
+        binding.includeContent.learnMoreLink.setOnClickListener {
             startActivity(BrowserActivity.intent(this, Url.ABOUT))
             finish()
         }
 
@@ -20,31 +20,31 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.content.Context
 import android.util.AttributeSet
-import android.view.View
+import android.view.LayoutInflater
 import android.widget.RelativeLayout
-import kotlinx.android.synthetic.main.view_tab_switcher_button.view.*
+import com.duckduckgo.app.browser.databinding.ViewTabSwitcherButtonBinding
 
 class TabSwitcherButton @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : RelativeLayout(context, attrs, defStyleAttr) {
 
+    private var _binding: ViewTabSwitcherButtonBinding? = null
+    private val binding get() = _binding!!
+
     var count = 0
         set(value) {
             field = value
             val text = if (count < 100) "$count" else "~"
-            tabCount.text = text
+            binding.tabCount.text = text
         }
 
     var hasUnread = false
-        set(value) {
-            field = value
-        }
 
     override fun onFinishInflate() {
         super.onFinishInflate()
-        View.inflate(context, R.layout.view_tab_switcher_button, this)
+        _binding = ViewTabSwitcherButtonBinding.inflate(LayoutInflater.from(context), this)
     }
 
     fun increment(callback: () -> Unit) {
@@ -65,20 +65,20 @@ class TabSwitcherButton @JvmOverloads constructor(
         val listener = object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator?) {
                 // otherwise on end keeps being called repeatedly
-                tabCount.animate().setListener(null)
+                binding.tabCount.animate().setListener(null)
                 callback()
             }
         }
 
-        tabCount.animate()
+        binding.tabCount.animate()
             .setDuration(300)
             .alpha(0.0f)
             .setListener(listener)
             .start()
     }
 
     private fun fadeInCount() {
-        tabCount.animate()
+        binding.tabCount.animate()
             .setDuration(300)
             .alpha(1.0f)
             .start()
 
@@ -25,8 +25,9 @@ import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.A
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.autocomplete.AutoCompleteViewHolder.*
-import kotlinx.android.synthetic.main.item_autocomplete_bookmark_suggestion.view.*
-import kotlinx.android.synthetic.main.item_autocomplete_search_suggestion.view.*
+import com.duckduckgo.app.browser.databinding.ItemAutocompleteBookmarkSuggestionBinding
+import com.duckduckgo.app.browser.databinding.ItemAutocompleteNoSuggestionsBinding
+import com.duckduckgo.app.browser.databinding.ItemAutocompleteSearchSuggestionBinding
 
 interface SuggestionViewHolderFactory {
 
@@ -44,9 +45,8 @@ class SearchSuggestionViewHolderFactory : SuggestionViewHolderFactory {
 
     override fun onCreateViewHolder(parent: ViewGroup): AutoCompleteViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        return SearchSuggestionViewHolder(
-            inflater.inflate(R.layout.item_autocomplete_search_suggestion, parent, false)
-        )
+        val binding = ItemAutocompleteSearchSuggestionBinding.inflate(inflater, parent, false)
+        return SearchSuggestionViewHolder(binding)
     }
 
     override fun onBindViewHolder(
@@ -64,7 +64,8 @@ class BookmarkSuggestionViewHolderFactory : SuggestionViewHolderFactory {
 
     override fun onCreateViewHolder(parent: ViewGroup): AutoCompleteViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        return BookmarkSuggestionViewHolder(inflater.inflate(R.layout.item_autocomplete_bookmark_suggestion, parent, false))
+        val binding = ItemAutocompleteBookmarkSuggestionBinding.inflate(inflater, parent, false)
+        return BookmarkSuggestionViewHolder(binding)
     }
 
     override fun onBindViewHolder(
@@ -82,7 +83,7 @@ class EmptySuggestionViewHolderFactory : SuggestionViewHolderFactory {
 
     override fun onCreateViewHolder(parent: ViewGroup): AutoCompleteViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        return EmptySuggestionViewHolder(inflater.inflate(R.layout.item_autocomplete_no_suggestions, parent, false))
+        return EmptySuggestionViewHolder(ItemAutocompleteNoSuggestionsBinding.inflate(inflater, parent, false))
     }
 
     override fun onBindViewHolder(
@@ -97,37 +98,36 @@ class EmptySuggestionViewHolderFactory : SuggestionViewHolderFactory {
 
 sealed class AutoCompleteViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-    class SearchSuggestionViewHolder(itemView: View) : AutoCompleteViewHolder(itemView) {
+    class SearchSuggestionViewHolder(val binding: ItemAutocompleteSearchSuggestionBinding) : AutoCompleteViewHolder(binding.root) {
         fun bind(
             item: AutoCompleteSearchSuggestion,
             immediateSearchListener: (AutoCompleteSuggestion) -> Unit,
             editableSearchClickListener: (AutoCompleteSuggestion) -> Unit
-        ) = with(itemView) {
-
+        ) = with(binding) {
             phrase.text = item.phrase
 
             val phraseOrUrlImage = if (item.isUrl) R.drawable.ic_globe_24dp else R.drawable.ic_loupe_24dp
             phraseOrUrlIndicator.setImageResource(phraseOrUrlImage)
 
             editQueryImage.setOnClickListener { editableSearchClickListener(item) }
-            setOnClickListener { immediateSearchListener(item) }
+            root.setOnClickListener { immediateSearchListener(item) }
         }
     }
 
-    class BookmarkSuggestionViewHolder(itemView: View) : AutoCompleteViewHolder(itemView) {
+    class BookmarkSuggestionViewHolder(val binding: ItemAutocompleteBookmarkSuggestionBinding) : AutoCompleteViewHolder(binding.root) {
         fun bind(
             item: AutoCompleteBookmarkSuggestion,
             immediateSearchListener: (AutoCompleteSuggestion) -> Unit,
             editableSearchClickListener: (AutoCompleteSuggestion) -> Unit
-        ) = with(itemView) {
+        ) = with(binding) {
 
             title.text = item.title
             url.text = item.url
 
             goToBookmarkImage.setOnClickListener { editableSearchClickListener(item) }
-            setOnClickListener { immediateSearchListener(item) }
+            root.setOnClickListener { immediateSearchListener(item) }
         }
     }
 
-    class EmptySuggestionViewHolder(itemView: View) : AutoCompleteViewHolder(itemView)
+    class EmptySuggestionViewHolder(binding: ItemAutocompleteNoSuggestionsBinding) : AutoCompleteViewHolder(binding.root)
 }
@@ -25,6 +25,7 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.transaction
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.browser.databinding.ActivityFeedbackBinding
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
 import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackFragment
@@ -34,7 +35,6 @@ import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedba
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.view.hideKeyboard
-import kotlinx.android.synthetic.main.include_toolbar.*
 import timber.log.Timber
 
 class FeedbackActivity :
@@ -48,9 +48,15 @@ class FeedbackActivity :
 
     private val viewModel: FeedbackViewModel by bindViewModel()
 
+    private lateinit var binding: ActivityFeedbackBinding
+
+    private val toolbar
+        get() = binding.includeToolbar.toolbar
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_feedback)
+        binding = ActivityFeedbackBinding.inflate(layoutInflater)
+        setContentView(binding.root)
         setupToolbar(toolbar)
         configureObservers()
     }
@@ -218,7 +224,7 @@ class FeedbackActivity :
     }
 
     private fun hideKeyboard() {
-        toolbar?.hideKeyboard()
+        toolbar.hideKeyboard()
     }
 
     companion object {
 
@@ -22,45 +22,54 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.browser.databinding.ContentFeedbackBinding
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel.Command.*
 import com.duckduckgo.app.global.DuckDuckGoTheme
 import com.duckduckgo.app.settings.db.SettingsDataStore
-import kotlinx.android.synthetic.main.content_feedback.*
 import javax.inject.Inject
 
 class InitialFeedbackFragment : FeedbackFragment() {
 
-    @Inject
-    lateinit var settingsDataStore: SettingsDataStore
-
     interface InitialFeedbackListener {
         fun userSelectedPositiveFeedback()
         fun userSelectedNegativeFeedback()
         fun userCancelled()
     }
 
+    @Inject
+    lateinit var settingsDataStore: SettingsDataStore
+
+    private var _binding: ContentFeedbackBinding? = null
+    private val binding get() = _binding!!
+
     private val viewModel by bindViewModel<InitialFeedbackFragmentViewModel>()
 
     private val listener: InitialFeedbackListener?
         get() = activity as InitialFeedbackListener
 
-        return inflater.inflate(R.layout.content_feedback, container, false)
+        _binding = ContentFeedbackBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
         if (settingsDataStore.theme == DuckDuckGoTheme.LIGHT) {
-            positiveFeedbackButton.setImageResource(R.drawable.button_happy_light_theme)
-            negativeFeedbackButton.setImageResource(R.drawable.button_sad_light_theme)
+            binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_light_theme)
+            binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_light_theme)
         } else {
-            positiveFeedbackButton.setImageResource(R.drawable.button_happy_dark_theme)
-            negativeFeedbackButton.setImageResource(R.drawable.button_sad_dark_theme)
+            binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_dark_theme)
+            binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_dark_theme)
         }
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     override fun configureViewModelObservers() {
         viewModel.command.observe(
             this,
@@ -75,8 +84,8 @@ class InitialFeedbackFragment : FeedbackFragment() {
     }
 
     override fun configureListeners() {
-        positiveFeedbackButton.setOnClickListener { viewModel.onPositiveFeedback() }
-        negativeFeedbackButton.setOnClickListener { viewModel.onNegativeFeedback() }
+        binding.positiveFeedbackButton.setOnClickListener { viewModel.onPositiveFeedback() }
+        binding.negativeFeedbackButton.setOnClickListener { viewModel.onNegativeFeedback() }
     }
 
     companion object {
 
@@ -22,10 +22,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.doOnNextLayout
 import androidx.lifecycle.Observer
-import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.browser.databinding.ContentFeedbackNegativeBrokenSiteFeedbackBinding
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
 import com.duckduckgo.app.feedback.ui.common.LayoutScrollingTouchListener
-import kotlinx.android.synthetic.main.content_feedback_negative_broken_site_feedback.*
 
 class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() {
 
@@ -34,13 +33,22 @@ class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() {
         fun userCancelled()
     }
 
+    private var _binding: ContentFeedbackNegativeBrokenSiteFeedbackBinding? = null
+    private val binding get() = _binding!!
+
     private val viewModel by bindViewModel<BrokenSiteNegativeFeedbackViewModel>()
 
     private val listener: BrokenSiteFeedbackListener?
         get() = activity as BrokenSiteFeedbackListener
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.content_feedback_negative_broken_site_feedback, container, false)
+        _binding = ContentFeedbackNegativeBrokenSiteFeedbackBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
     }
 
     override fun configureViewModelObservers() {
@@ -60,21 +68,22 @@ class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() {
     }
 
     override fun configureListeners() {
-        submitFeedbackButton.doOnNextLayout {
-            brokenSiteInput.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, brokenSiteInputContainer.y.toInt()))
-            openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedbackContainer.y.toInt()))
-        }
+        with(binding) {
+            submitFeedbackButton.doOnNextLayout {
+                brokenSiteInput.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, brokenSiteInputContainer.y.toInt()))
+                openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedbackContainer.y.toInt()))
+            }
 
-        submitFeedbackButton.setOnClickListener {
-            val feedback = openEndedFeedback.text.toString()
-            val brokenSite = brokenSiteInput.text.toString()
+            submitFeedbackButton.setOnClickListener {
+                val feedback = openEndedFeedback.text.toString()
+                val brokenSite = brokenSiteInput.text.toString()
 
-            viewModel.userSubmittingFeedback(feedback, brokenSite)
+                viewModel.userSubmittingFeedback(feedback, brokenSite)
+            }
         }
     }
 
     companion object {
-
         fun instance(): BrokenSiteNegativeFeedbackFragment {
             return BrokenSiteNegativeFeedbackFragment()
         }