From f0270346a6149b01336b7d7b1ca0b5b7019a3a6f Mon Sep 17 00:00:00 2001 From: Reo Ando Date: Tue, 21 Apr 2020 16:29:03 +0900 Subject: [PATCH 1/6] =?UTF-8?q?#1=20compile=E3=81=AF=E9=9D=9E=E6=8E=A8?= =?UTF-8?q?=E5=A5=A8=E3=81=AA=E3=81=AE=E3=81=A7implementation=E3=81=ABrepl?= =?UTF-8?q?ace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e778a2b..f7da275 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,26 +27,26 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + testImplementation 'junit:junit:4.12' // for data binding kapt 'com.android.databinding:compiler:3.0.0' // for dagger2 - compile "com.google.dagger:dagger:2.12" + implementation "com.google.dagger:dagger:2.12" annotationProcessor "com.google.dagger:dagger-compiler:2.12" kapt "com.google.dagger:dagger-compiler:2.12" // for orma database - compile "com.github.gfx.android.orma:orma:4.2.5" + implementation "com.github.gfx.android.orma:orma:4.2.5" kapt "com.github.gfx.android.orma:orma-processor:4.2.5" From efdaef50f1792f611593a7857a572698dd69dee8 Mon Sep 17 00:00:00 2001 From: Reo Ando Date: Tue, 21 Apr 2020 16:29:15 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E3=81=AE?= =?UTF-8?q?=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c3ee1cc..001b62c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,7 +8,6 @@ "" %.1f - BMI: %.1f cm kg From 4d35cfb34032f8415b52b75f8a4afe9c633213d0 Mon Sep 17 00:00:00 2001 From: Reo Ando Date: Tue, 21 Apr 2020 16:30:40 +0900 Subject: [PATCH 3/6] #1 Remove redundant qualifier name --- .../kotlindatabindingsample/presenter/PersonPresenter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/presenter/PersonPresenter.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/presenter/PersonPresenter.kt index a18adbc..9386f99 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/presenter/PersonPresenter.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/presenter/PersonPresenter.kt @@ -15,7 +15,7 @@ class PersonPresenter @Inject constructor(private val personDao: PersonDao) { // insert some data val persons = ArrayList().apply { for (i in 0 until 50) { - add(PersonPresenter.createAsDummy) + add(createAsDummy) } } From 2776920038ad86f6d25a681dcb69c88186b349b2 Mon Sep 17 00:00:00 2001 From: Reo Ando Date: Tue, 21 Apr 2020 16:31:29 +0900 Subject: [PATCH 4/6] #1 Remove explicit type arguments --- .../kotlindatabindingsample/view/BMICalculateActivity.kt | 2 +- .../view/BMIRealtimeCalculateActivity.kt | 2 +- .../kotlindatabindingsample/view/adapter/BMIListAdapter.kt | 2 +- .../viewmodel/BMIRealtimeCalculateViewModel.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMICalculateActivity.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMICalculateActivity.kt index 0b8293e..ce8fd4a 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMICalculateActivity.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMICalculateActivity.kt @@ -15,7 +15,7 @@ import jp.chau2chaun2.kotlindatabindingsample.task.BMICalculatorTask class BMICalculateActivity : BaseActivity() { private val mBinding: ActivityBmiCalculateBinding by lazy { - DataBindingUtil.setContentView(this, R.layout.activity_bmi_calculate) + DataBindingUtil.setContentView(this, R.layout.activity_bmi_calculate) } private lateinit var mPerson: Person diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMIRealtimeCalculateActivity.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMIRealtimeCalculateActivity.kt index 9b19087..a2d7aea 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMIRealtimeCalculateActivity.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMIRealtimeCalculateActivity.kt @@ -15,7 +15,7 @@ import javax.inject.Named class BMIRealtimeCalculateActivity : BaseActivity() { private val mBinding: ActivityBmiRealtimeCalculateBinding by lazy { - DataBindingUtil.setContentView(this, R.layout.activity_bmi_realtime_calculate) + DataBindingUtil.setContentView(this, R.layout.activity_bmi_realtime_calculate) } @Inject lateinit var viewModel: BMIRealtimeCalculateViewModel diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt index ce46196..478d4a3 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt @@ -26,7 +26,7 @@ class BMIListAdapter(context: Context, private val persons: List): BaseA override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val binding = convertView - ?.let { DataBindingUtil.findBinding(convertView) } + ?.let { DataBindingUtil.findBinding(convertView) } ?: RowListBinding.inflate(mLayoutInflater) binding.data = getItem(position) diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/viewmodel/BMIRealtimeCalculateViewModel.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/viewmodel/BMIRealtimeCalculateViewModel.kt index 167f36f..7317217 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/viewmodel/BMIRealtimeCalculateViewModel.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/viewmodel/BMIRealtimeCalculateViewModel.kt @@ -33,7 +33,7 @@ class BMIRealtimeCalculateViewModel @Inject constructor() : BaseObservable() { updateBmi() } - var displayBmi = ObservableField("") + var displayBmi = ObservableField("") private fun updateBmi() { person.calculateBmi() From bff71f8091cc0d047b142f32ce04596505fc3ab8 Mon Sep 17 00:00:00 2001 From: Reo Ando Date: Tue, 21 Apr 2020 16:32:59 +0900 Subject: [PATCH 5/6] #1 Implicit parameter 'it' of enclosing lambda is shadowed --- .../kotlindatabindingsample/view/adapter/BMIListAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt index 478d4a3..51fd429 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt @@ -17,8 +17,8 @@ class BMIListAdapter(context: Context, private val persons: List): BaseA override fun onItemClick(adapter: AdapterView<*>?, view: View?, position: Int, id: Long) { view?.let { - DataBindingUtil.findBinding(it).also { - it.task = BMICalculatorTask().apply { + DataBindingUtil.findBinding(it).also { rowList -> + rowList.task = BMICalculatorTask().apply { execute(getItem(position)) } } } From b929871385b29d56c11a6c553e157658927417ca Mon Sep 17 00:00:00 2001 From: Reo Ando Date: Tue, 21 Apr 2020 16:38:53 +0900 Subject: [PATCH 6/6] Revert "#1 Remove explicit type arguments" This reverts commit 2776920038ad86f6d25a681dcb69c88186b349b2. --- .../kotlindatabindingsample/view/BMICalculateActivity.kt | 2 +- .../view/BMIRealtimeCalculateActivity.kt | 2 +- .../kotlindatabindingsample/view/adapter/BMIListAdapter.kt | 2 +- .../viewmodel/BMIRealtimeCalculateViewModel.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMICalculateActivity.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMICalculateActivity.kt index ce8fd4a..0b8293e 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMICalculateActivity.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMICalculateActivity.kt @@ -15,7 +15,7 @@ import jp.chau2chaun2.kotlindatabindingsample.task.BMICalculatorTask class BMICalculateActivity : BaseActivity() { private val mBinding: ActivityBmiCalculateBinding by lazy { - DataBindingUtil.setContentView(this, R.layout.activity_bmi_calculate) + DataBindingUtil.setContentView(this, R.layout.activity_bmi_calculate) } private lateinit var mPerson: Person diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMIRealtimeCalculateActivity.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMIRealtimeCalculateActivity.kt index a2d7aea..9b19087 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMIRealtimeCalculateActivity.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/BMIRealtimeCalculateActivity.kt @@ -15,7 +15,7 @@ import javax.inject.Named class BMIRealtimeCalculateActivity : BaseActivity() { private val mBinding: ActivityBmiRealtimeCalculateBinding by lazy { - DataBindingUtil.setContentView(this, R.layout.activity_bmi_realtime_calculate) + DataBindingUtil.setContentView(this, R.layout.activity_bmi_realtime_calculate) } @Inject lateinit var viewModel: BMIRealtimeCalculateViewModel diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt index 51fd429..8867184 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt @@ -26,7 +26,7 @@ class BMIListAdapter(context: Context, private val persons: List): BaseA override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val binding = convertView - ?.let { DataBindingUtil.findBinding(convertView) } + ?.let { DataBindingUtil.findBinding(convertView) } ?: RowListBinding.inflate(mLayoutInflater) binding.data = getItem(position) diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/viewmodel/BMIRealtimeCalculateViewModel.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/viewmodel/BMIRealtimeCalculateViewModel.kt index 7317217..167f36f 100644 --- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/viewmodel/BMIRealtimeCalculateViewModel.kt +++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/viewmodel/BMIRealtimeCalculateViewModel.kt @@ -33,7 +33,7 @@ class BMIRealtimeCalculateViewModel @Inject constructor() : BaseObservable() { updateBmi() } - var displayBmi = ObservableField("") + var displayBmi = ObservableField("") private fun updateBmi() { person.calculateBmi()