Skip to content

Migrate From ButerKnife to Databinding #4

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lawhacknifemi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Migrate From ButerKnife to Databinding #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3162ae
Migrate from ButterKnife to DataBinding
Lawhacknifemi Mar 26, 2021
c108186
Migrate from ButterKnife to DataBinding
Lawhacknifemi Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

buildFeatures{
dataBinding true
}
}

dependencies {
Expand Down Expand Up @@ -57,8 +61,8 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"

//Butterknife
implementation 'com.jakewharton:butterknife:10.2.0'
kapt 'com.jakewharton:butterknife-compiler:10.2.0'
// implementation 'com.jakewharton:butterknife:10.2.0'
// kapt 'com.jakewharton:butterknife-compiler:10.2.0'

//ThreeTenAPB
implementation 'com.jakewharton.threetenabp:threetenabp:1.2.1'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/itsamirrezah/livescore/data/services/FootballDataInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class FootballDataInterceptor : Interceptor {

val request = chain.request()
.newBuilder()
.addHeader("X-Auth-Token", "24fb047edaa64dddb076659db5f5fd39")
.addHeader("X-Auth-Token", "71610fca6e1747489ffef41555f291e9")
.build()

return chain.proceed(request)
Expand Down
44 changes: 24 additions & 20 deletions app/src/main/java/com/itsamirrezah/livescore/ui/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,22 @@ import android.view.View
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.ContextCompat
import androidx.databinding.DataBindingUtil
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import butterknife.BindView
import butterknife.ButterKnife
import butterknife.OnClick

import com.bumptech.glide.Glide
import com.google.android.material.bottomappbar.BottomAppBar
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.button.MaterialButton
import com.google.android.material.chip.Chip
import com.google.android.material.chip.ChipDrawable
import com.google.android.material.chip.ChipGroup
import com.itsamirrezah.livescore.R
import com.itsamirrezah.livescore.data.db.LivescoreDb
import com.itsamirrezah.livescore.data.models.Team
import com.itsamirrezah.livescore.data.services.FootbalDataApiImp
import com.itsamirrezah.livescore.databinding.ActivityMainBinding
import com.itsamirrezah.livescore.ui.items.*
import com.itsamirrezah.livescore.ui.model.*
import com.itsamirrezah.livescore.util.EndlessScrollListener
Expand All @@ -36,6 +34,7 @@ import com.mikepenz.fastadapter.GenericFastAdapter
import com.mikepenz.fastadapter.adapters.GenericItemAdapter
import com.mikepenz.fastadapter.adapters.ModelAdapter
import com.mikepenz.fastadapter.ui.items.ProgressItem
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.launch
Expand All @@ -45,21 +44,11 @@ import java.net.SocketTimeoutException

class MainActivity : AppCompatActivity() {

//views
@BindView(R.id.recyclerView)
lateinit var recyclerView: RecyclerView

@BindView(R.id.bottomAppBar)
lateinit var bottomAppBar: BottomAppBar

@BindView(R.id.coordinator)
lateinit var coordinator: CoordinatorLayout
lateinit var bottomSheetBehavior: BottomSheetBehavior<View>

@BindView(R.id.chipGroupCompetition)
lateinit var chipGroupCompetition: ChipGroup

@BindView(R.id.chipGroupStatus)

lateinit var chipGroupStatus: ChipGroup

//data
Expand All @@ -83,8 +72,22 @@ class MainActivity : AppCompatActivity() {
*/
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
ButterKnife.bind(this)


k
val binding : ActivityMainBinding = DataBindingUtil.setContentView(this,R.layout.activity_main)

binding.lifecycleOwner = this

binding.recyclerView
binding.bottomAppBar
binding.coordinator
binding.root

chipGroupCompetition = findViewById(R.id.chipGroupCompetition)
chipGroupStatus = findViewById(R.id.chipGroupStatus)

findViewById<MaterialButton>(R.id.btnFilterDone).setOnClickListener { filterDone() }
AndroidThreeTen.init(application)
setupSharedPreference()
setupBottomAppBar()
Expand All @@ -98,9 +101,10 @@ class MainActivity : AppCompatActivity() {
requestCompetitions()
requestTeams()
}

}

@OnClick(R.id.btnFilterDone)
// @OnClick(R.id.btnFilterDone)
fun filterDone() {
val competitionsSelected = mutableSetOf<String>()
for (i in 0 until chipGroupCompetition.childCount) {
Expand Down
65 changes: 36 additions & 29 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
tools:context=".ui.activities.MainActivity">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator"
xmlns:tools="http://schemas.android.com/tools">

<data>

</data>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/colorPrimary"
tools:context=".ui.activities.MainActivity">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/spacing_small"
android:layout_marginTop="@dimen/spacing_mlarge"
android:layout_marginRight="@dimen/spacing_small"
android:layout_marginBottom="@dimen/spacing_xxlarge">
android:layout_height="match_parent">

</androidx.recyclerview.widget.RecyclerView>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/spacing_small"
android:layout_marginTop="@dimen/spacing_mlarge"
android:layout_marginRight="@dimen/spacing_small"
android:layout_marginBottom="@dimen/spacing_xxlarge">

</androidx.recyclerview.widget.RecyclerView>

<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/bottomAppBar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:backgroundTint="@color/colorPrimaryDark"
android:layout_gravity="bottom"
app:menu="@menu/bottomappbar_menu"
app:navigationIcon="@drawable/ic_menu_black_24dp" />

<include layout="@layout/filter_match_sheet" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/bottomAppBar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:backgroundTint="@color/colorPrimaryDark"
android:layout_gravity="bottom"
app:menu="@menu/bottomappbar_menu"
app:navigationIcon="@drawable/ic_menu_black_24dp" />

<include layout="@layout/filter_match_sheet" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>


</LinearLayout>
</LinearLayout>
</layout>