Skip to content

Commit 42f386d

Browse files
Daeda88Daeda88
authored
Merge pull request #5 from jedlix/feature/1.4.0
Version 1.4.0
2 parents 66e11bf + addb407 commit 42f386d

31 files changed

+705
-185
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Add the following to your `build.gradle`:
1414

1515
```groovy
1616
dependencies {
17-
implementation("com.jedlix:sdk:1.2.0")
17+
implementation("com.jedlix:sdk:1.4.0")
1818
}
1919
```
2020

‎example/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.android.application")
33
kotlin("android")
4+
kotlin("kapt")
45
id("com.github.triplet.play") version "3.7.0"
56
}
67

@@ -46,6 +47,7 @@ android {
4647
}
4748

4849
dataBinding {
50+
isEnabled = true
4951
addKtx = true
5052
}
5153

‎example/src/main/java/com/jedlix/sdk/example/activity/ConnectionsActivity.kt

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ import androidx.activity.viewModels
2323
import androidx.appcompat.app.AppCompatActivity
2424
import androidx.lifecycle.lifecycleScope
2525
import com.jedlix.sdk.connectSession.registerConnectSessionManager
26+
import com.jedlix.sdk.example.adapter.ButtonListAdapter
27+
import com.jedlix.sdk.example.adapter.ConnectSessionViewModelAdapter
28+
import com.jedlix.sdk.example.adapter.GroupedConnectSessionViewModelAdapter
2629
import com.jedlix.sdk.example.databinding.ActivityConnectionsBinding
2730
import com.jedlix.sdk.example.viewModel.ConnectionsViewModel
2831
import kotlinx.coroutines.flow.collect
@@ -47,6 +50,9 @@ class ConnectionsActivity : AppCompatActivity() {
4750
binding.viewModel = viewModel
4851
binding.lifecycleOwner = this
4952

53+
binding.vehicles.adapter = ConnectSessionViewModelAdapter(this)
54+
binding.chargers.adapter = GroupedConnectSessionViewModelAdapter(this)
55+
5056
val connectSessionManager = registerConnectSessionManager {
5157
viewModel.reloadData()
5258
}

‎example/src/main/java/com/jedlix/sdk/example/adapter/ButtonListAdapter.kt

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright 2022 Jedlix B.V. The Netherlands
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.jedlix.sdk.example.adapter
18+
19+
import android.annotation.SuppressLint
20+
import android.view.LayoutInflater
21+
import android.view.ViewGroup
22+
import androidx.databinding.BindingAdapter
23+
import androidx.recyclerview.widget.RecyclerView
24+
import com.jedlix.sdk.example.databinding.ViewButtonRowBinding
25+
import com.jedlix.sdk.example.model.Button
26+
27+
class ButtonListAdapter : RecyclerView.Adapter<ButtonListAdapter.ButtonViewHolder>() {
28+
29+
companion object {
30+
@BindingAdapter("modelButtons")
31+
@JvmStatic
32+
fun bindModelButtons(recyclerView: RecyclerView, buttons: List<Button>?) {
33+
(recyclerView.adapter as? ButtonListAdapter)?.buttons = buttons ?: emptyList()
34+
}
35+
}
36+
37+
class ButtonViewHolder(val binding: ViewButtonRowBinding) : RecyclerView.ViewHolder(binding.root)
38+
39+
private var buttons: List<Button> = emptyList()
40+
@SuppressLint("NotifyDataSetChanged")
41+
set(value) {
42+
field = value
43+
notifyDataSetChanged()
44+
}
45+
46+
override fun getItemCount(): Int = buttons.size
47+
48+
override fun onBindViewHolder(holder: ButtonViewHolder, position: Int) {
49+
holder.binding.button.apply {
50+
val modelButton = buttons.getOrNull(position)
51+
text = modelButton?.title
52+
setOnClickListener { modelButton?.action?.invoke() }
53+
}
54+
}
55+
56+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ButtonViewHolder(
57+
ViewButtonRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
58+
)
59+
}

‎example/src/main/java/com/jedlix/sdk/example/adapter/ConnectSessionViewModelAdapter.kt

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/*
2+
* Copyright 2022 Jedlix B.V. The Netherlands
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.jedlix.sdk.example.adapter
18+
19+
import android.annotation.SuppressLint
20+
import android.view.LayoutInflater
21+
import android.view.ViewGroup
22+
import androidx.databinding.BindingAdapter
23+
import androidx.lifecycle.LifecycleOwner
24+
import androidx.recyclerview.widget.RecyclerView
25+
import com.jedlix.sdk.example.databinding.ViewConnectSessionViewModelRowBinding
26+
import com.jedlix.sdk.example.viewModel.ConnectSessionViewModel
27+
28+
class ConnectSessionViewModelAdapter(val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<ConnectSessionViewModelAdapter.ViewHolder>() {
29+
30+
companion object {
31+
@BindingAdapter("connectSessionViewModels")
32+
@JvmStatic
33+
fun bindModelButtons(recyclerView: RecyclerView, connectSessionViewModels: List<ConnectSessionViewModel>?) {
34+
(recyclerView.adapter as? ConnectSessionViewModelAdapter)?.connectSessionViewModels = connectSessionViewModels ?: emptyList()
35+
}
36+
}
37+
38+
class ViewHolder(val binding: ViewConnectSessionViewModelRowBinding) : RecyclerView.ViewHolder(binding.root)
39+
40+
private var connectSessionViewModels: List<ConnectSessionViewModel> = emptyList()
41+
@SuppressLint("NotifyDataSetChanged")
42+
set(value) {
43+
field = value
44+
notifyDataSetChanged()
45+
}
46+
47+
override fun getItemCount(): Int = connectSessionViewModels.size
48+
49+
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
50+
holder.binding.apply {
51+
viewModel = connectSessionViewModels[position]
52+
}
53+
}
54+
55+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
56+
ViewConnectSessionViewModelRowBinding.inflate(LayoutInflater.from(parent.context), parent, false).apply {
57+
lifecycleOwner = this@ConnectSessionViewModelAdapter.lifecycleOwner
58+
buttons.adapter = ButtonListAdapter()
59+
}
60+
)
61+
}

‎example/src/main/java/com/jedlix/sdk/example/adapter/GroupedConnectSessionViewModelAdapter.kt

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
* Copyright 2022 Jedlix B.V. The Netherlands
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.jedlix.sdk.example.adapter
18+
19+
import android.annotation.SuppressLint
20+
import android.view.LayoutInflater
21+
import android.view.ViewGroup
22+
import androidx.databinding.BindingAdapter
23+
import androidx.lifecycle.LifecycleOwner
24+
import androidx.recyclerview.widget.RecyclerView
25+
import com.jedlix.sdk.example.databinding.ViewConnectSessionViewModelRowBinding
26+
import com.jedlix.sdk.example.databinding.ViewGroupedConnectSessionViewModelRowBinding
27+
import com.jedlix.sdk.example.viewModel.GroupedConnectSessionViewModel
28+
29+
class GroupedConnectSessionViewModelAdapter(private val lifecycleOwner: LifecycleOwner) : RecyclerView.Adapter<GroupedConnectSessionViewModelAdapter.ViewHolder>() {
30+
31+
companion object {
32+
@BindingAdapter("groupedConnectSessionViewModels")
33+
@JvmStatic
34+
fun bindModelButtons(recyclerView: RecyclerView, connectSessionViewModels: List<GroupedConnectSessionViewModel>?) {
35+
(recyclerView.adapter as? GroupedConnectSessionViewModelAdapter)?.groupedConnectSessionViewModels = connectSessionViewModels ?: emptyList()
36+
}
37+
}
38+
39+
class ViewHolder(val binding: ViewGroupedConnectSessionViewModelRowBinding) : RecyclerView.ViewHolder(binding.root)
40+
41+
private var groupedConnectSessionViewModels: List<GroupedConnectSessionViewModel> = emptyList()
42+
@SuppressLint("NotifyDataSetChanged")
43+
set(value) {
44+
field = value
45+
notifyDataSetChanged()
46+
}
47+
48+
override fun getItemCount(): Int = groupedConnectSessionViewModels.size
49+
50+
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
51+
holder.binding.apply {
52+
viewModel = groupedConnectSessionViewModels[position]
53+
54+
}
55+
}
56+
57+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
58+
ViewGroupedConnectSessionViewModelRowBinding.inflate(LayoutInflater.from(parent.context), parent, false).apply {
59+
lifecycleOwner = this@GroupedConnectSessionViewModelAdapter.lifecycleOwner
60+
connectSessions.adapter = ConnectSessionViewModelAdapter(this@GroupedConnectSessionViewModelAdapter.lifecycleOwner)
61+
}
62+
)
63+
}

‎sdk/src/main/java/com/jedlix/sdk/model/ChargingLocationTariff.kt ‎example/src/main/java/com/jedlix/sdk/example/model/Button.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.jedlix.sdk.model
18-
19-
import kotlinx.serialization.Serializable
17+
package com.jedlix.sdk.example.model
2018

19+
data class Button(val title: String, val action: () -> Unit)

‎example/src/main/java/com/jedlix/sdk/example/viewModel/ChargerViewModel.kt

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Copyright 2022 Jedlix B.V. The Netherlands
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.jedlix.sdk.example.viewModel
18+
19+
import com.jedlix.sdk.example.model.Button
20+
import com.jedlix.sdk.model.Charger
21+
import com.jedlix.sdk.model.ChargerConnectSession
22+
23+
class ChargerViewModel(
24+
charger: Charger,
25+
connectSession: ChargerConnectSession?,
26+
private val resumeConnectSession: (ChargerConnectSession) -> Unit,
27+
private val removeCharger: (Charger) -> Unit
28+
) : ConnectSessionViewModel {
29+
30+
override val title = charger.detail.fullName
31+
override val buttons = listOfNotNull(
32+
connectSession?.let { Button("Resume") { resumeConnectSession(it) } },
33+
Button("Remove") { removeCharger(charger) }
34+
)
35+
36+
private val Charger.Detail.fullName: String get() = listOfNotNull(brand, model).joinToString(" ")
37+
}

‎example/src/main/java/com/jedlix/sdk/example/viewModel/ChargingLocationViewModel.kt

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Copyright 2022 Jedlix B.V. The Netherlands
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.jedlix.sdk.example.viewModel
18+
19+
import com.jedlix.sdk.example.model.Button
20+
import com.jedlix.sdk.model.Charger
21+
import com.jedlix.sdk.model.ChargerConnectSession
22+
import com.jedlix.sdk.model.ChargingLocation
23+
24+
class ChargingLocationViewModel(
25+
private val chargingLocation: ChargingLocation,
26+
chargers: List<Charger>,
27+
private val chargerSessions: List<ChargerConnectSession>,
28+
private val startChargerConnectSession: (ChargingLocation) -> Unit,
29+
private val resumeConnectSession: (ChargerConnectSession) -> Unit,
30+
private val removeCharger: (Charger) -> Unit
31+
) : GroupedConnectSessionViewModel {
32+
33+
override val title = chargingLocation.address.let { listOfNotNull(it.street, it.houseNumber, it.city).joinToString(", ") }
34+
override val connectSessionViewModels = chargers.map { charger ->
35+
ChargerViewModel(charger, chargerSessions.firstOrNull { it.chargerId == charger.id }, resumeConnectSession, removeCharger)
36+
}.ifEmpty {
37+
val connectSessionWithoutVehicle = chargerSessions.firstOrNull { it.chargingLocationId == chargingLocation.id && it.chargerId.isNullOrEmpty() }
38+
listOf(
39+
object : ConnectSessionViewModel {
40+
override val title: String = if (connectSessionWithoutVehicle != null) "Unfinished connect session" else "No Chargers found"
41+
override val buttons: List<Button> = listOf(
42+
connectSessionWithoutVehicle?.let { Button("Resume") { resumeConnectSession(it) } } ?: Button("Connect") { startChargerConnectSession(chargingLocation) }
43+
)
44+
}
45+
)
46+
}
47+
}

‎example/src/main/java/com/jedlix/sdk/example/viewModel/ConnectSessionViewModel.kt

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright 2022 Jedlix B.V. The Netherlands
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.jedlix.sdk.example.viewModel
18+
19+
import com.jedlix.sdk.example.model.Button
20+
21+
interface ConnectSessionViewModel {
22+
val title: String
23+
val buttons: List<Button>
24+
}
25+
26+
interface GroupedConnectSessionViewModel {
27+
val title: String
28+
val connectSessionViewModels: List<ConnectSessionViewModel>
29+
}

0 commit comments

Comments
 (0)