Skip to content
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.

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

feat: Delete rooms in the device connect fragment #2289

Merged
merged 3 commits into from
Jul 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
}
var layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
availableRoomsRecyclerView.layoutManager = layoutManager
availableRoomsAdapter = RoomsAdapter(availableRoomsList, context)
availableRoomsAdapter = RoomsAdapter(availableRoomsList, context, deviceConnectPresenter)
availableRoomsRecyclerView.adapter = availableRoomsAdapter
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@ class DeviceConnectPresenter(context: Context, manager: WifiManager) : IDeviceCo
deviceConnectView?.showRooms()
}

override fun deleteRoom(room: String?) {
realm = Realm.getDefaultInstance()
realm.beginTransaction()
val result = realm.where(RoomsAvailable::class.java).equalTo("room", room).findFirst()
result?.deleteFromRealm()
realm.commitTransaction()
deviceConnectView?.showRooms()
}

override fun addDevice(queryObject: AddDeviceQuery) {
roomModel.addDeviceToServer(queryObject)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import kotlinx.android.synthetic.main.room_recycler_layout.view.room_text
import kotlinx.android.synthetic.main.room_recycler_layout.view.delete_room
import org.fossasia.susi.ai.R
import org.fossasia.susi.ai.device.DeviceActivity
import org.fossasia.susi.ai.device.DeviceActivity.Companion.CONNECT_TO
import org.fossasia.susi.ai.device.DeviceActivity.Companion.TAG_DEVICE_CONNECT_FRAGMENT
import org.fossasia.susi.ai.device.deviceconnect.DeviceConnectFragment
import org.fossasia.susi.ai.device.deviceconnect.contract.IDeviceConnectPresenter

class RoomsAdapter(private val availableRoomsList: ArrayList<DeviceConnectFragment.AvailableRoomsFormat>, val context: Context?) : RecyclerView.Adapter<RoomsAdapter.ViewHolder>() {
class RoomsAdapter(private val availableRoomsList: ArrayList<DeviceConnectFragment.AvailableRoomsFormat>, val context: Context?, private val deviceConnectPresenter: IDeviceConnectPresenter) : RecyclerView.Adapter<RoomsAdapter.ViewHolder>() {

override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
val view = LayoutInflater.from(viewGroup.context).inflate(R.layout.room_recycler_layout, viewGroup, false)
Expand All @@ -39,6 +41,10 @@ class RoomsAdapter(private val availableRoomsList: ArrayList<DeviceConnectFragme
intent.putExtra(CONNECT_TO, TAG_DEVICE_CONNECT_FRAGMENT)
context?.startActivity(intent)
}

itemView.delete_room.setOnClickListener {
deviceConnectPresenter.deleteRoom(availableRoomsList[adapterPosition].room)
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ interface IDeviceConnectPresenter {

fun addRoom(room: String)

fun deleteRoom(room: String?)

fun addDevice(queryObject: AddDeviceQuery)

fun getLocation()
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_delete_black_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
</vector>
15 changes: 13 additions & 2 deletions app/src/main/res/layout/room_recycler_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,27 @@

<ImageView
android:id="@+id/image_tick"
android:layout_width="@dimen/width_room_recycler"
android:layout_width="@dimen/width_null"
android:layout_height="@dimen/height_room_recycler"
android:layout_weight="1"
android:layout_margin="@dimen/padding_large"
app:srcCompat="@drawable/ic_home_black_24dp" />

<TextView
android:id="@+id/room_text"
android:layout_width="match_parent"
android:layout_width="@dimen/width_null"
android:layout_weight="4"
android:layout_height="wrap_content"
android:layout_margin="@dimen/padding_large"
android:text="Living Room" />

<ImageButton
android:layout_width="@dimen/width_null"
android:layout_height="@dimen/height_room_recycler"
android:layout_weight="1"
android:id="@+id/delete_room"
android:layout_margin="@dimen/padding_large"
android:background="@color/susi_message_link_preview_bg"
app:srcCompat="@drawable/ic_delete_black_24dp"/>

</LinearLayout>
2 changes: 2 additions & 0 deletions app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<!-- dimensions specifics -->

<dimen name="width_null">0dp</dimen>
<dimen name="height_very_small">1dp</dimen>
<dimen name="width_very_small">1dp</dimen>
<dimen name="height_large">45dp</dimen>
Expand Down Expand Up @@ -137,4 +138,5 @@
<dimen name="height_minimum">2dp</dimen>
<dimen name="height_room_recycler">20dp</dimen>
<dimen name="width_room_recycler">20dp</dimen>

</resources>