feat: Add room feature #2267

atm1504 · 2019-06-16T04:52:59Z

Changes:
Implemented the UI that would handle the addition of rooms

Screenshots for the change: WIll add it soon

ci-reporter · 2019-06-16T05:18:49Z

The build is failing

✨ Good work on this PR so far! ✨ Unfortunately, the Circle CI build is failing as of 394ab75. Here's the output:

`Run Tests`

> Task :app:preBuild UP-TO-DATE

I'm sure you can fix it! If you need help, don't hesitate to ask a maintainer of the project!

Failed build for 377e75f

`Run Tests`

> Task :app:preBuild UP-TO-DATE

Failed build for cc79055

`spotless check`

> Task :app:spotlessKotlin FAILED

Failed build for 888e658

`spotless check`

> Task :app:spotlessKotlin FAILED

Failed build for 1e6d664

`lint check`

> Task :app:preBuild UP-TO-DATE

Failed build for 1e6d664

`lint check`

> Task :app:preBuild UP-TO-DATE

This comment was automagically generated by ci-reporter. If you see a problem, open an issue here.

…into atm_add_room

atm1504 · 2019-06-20T16:12:59Z

@iamareebjamal @batbrain7 @arundhati24 please start reviewing it. Its succesfully working now if I whitelist the device IP(have made a seperate pr regarding that #2263).
The apk is: app-fdroid-debug.apk.zip(it has cleartext communication but that is not included in this pr).

atm1504 · 2019-06-20T16:13:59Z

I would add the screenshot soon. I need to reflash my device again. So, I need a bit of time for that.

iamareebjamal · 2019-06-20T21:50:37Z

app/src/main/AndroidManifest.xml

@@ -20,6 +20,7 @@
        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true"


@iamareebjamal as stated in the comment, I was waiting for the pr #2263 to get merged, so to temporary make it work, I added that line. I would remove it, as #2263 is now merged. : )

iamareebjamal · 2019-06-20T21:51:23Z

app/src/main/java/org/fossasia/susi/ai/data/device/RoomModel.kt

+import timber.log.Timber
+
+class RoomModel : IRoomModel {
+    private lateinit var addDeviceResponseCall: Call<GetAddDeviceResponse>


Why does this need to be a class member?

This is as per the architecture or the way it has been implemented in other files. So, I created it. Also, we will have more functions related to room in the roomModel class.

iamareebjamal · 2019-06-20T21:51:47Z

app/src/main/java/org/fossasia/susi/ai/dataclasses/AddDeviceQuery.kt

+package org.fossasia.susi.ai.dataclasses
+
+data class AddDeviceQuery(
+    val access_token: String,


iamareebjamal · 2019-06-20T21:52:12Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

@@ -54,26 +66,41 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
    private var checkDevice: Boolean = false
    private val REQUEST_LOCATION_ACCESS = 101
    private val REQUEST_WIFI_ACCESS = 102
+    lateinit var realm: Realm


Tell me which class are you accessing it from

iamareebjamal · 2019-06-20T21:52:20Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

@@ -54,26 +66,41 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
    private var checkDevice: Boolean = false
    private val REQUEST_LOCATION_ACCESS = 101
    private val REQUEST_WIFI_ACCESS = 102
+    lateinit var realm: Realm
+    val availableRoomsList: ArrayList<AvailableRoomsFormat> = ArrayList()
+    lateinit var availableRoomsRecyclerView: RecyclerView


iamareebjamal · 2019-06-20T21:52:25Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

@@ -54,26 +66,41 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
    private var checkDevice: Boolean = false
    private val REQUEST_LOCATION_ACCESS = 101
    private val REQUEST_WIFI_ACCESS = 102
+    lateinit var realm: Realm
+    val availableRoomsList: ArrayList<AvailableRoomsFormat> = ArrayList()


iamareebjamal · 2019-06-20T21:52:32Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

+    val availableRoomsList: ArrayList<AvailableRoomsFormat> = ArrayList()
+    lateinit var availableRoomsRecyclerView: RecyclerView
+    private var availableRoomsAdapter: RecyclerView.Adapter<*>? = null
+    lateinit var roomNameSelected: String


iamareebjamal · 2019-06-20T21:52:38Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

+    lateinit var availableRoomsRecyclerView: RecyclerView
+    private var availableRoomsAdapter: RecyclerView.Adapter<*>? = null
+    lateinit var roomNameSelected: String
+    lateinit var macid: String


iamareebjamal · 2019-06-20T21:52:47Z

app/src/main/java/org/fossasia/susi/ai/dataclasses/AddDeviceQuery.kt

+
+data class AddDeviceQuery(
+    val access_token: String,
+    val macid: String,


iamareebjamal · 2019-06-20T21:54:08Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectPresenter.kt

@@ -31,6 +35,8 @@ class DeviceConnectPresenter(context: Context, manager: WifiManager) : IDeviceCo
    private var isWifiEnabled = false
    lateinit var connections: ArrayList<String>
    private var utilModel: UtilModel = UtilModel(context)
+    lateinit var realm: Realm


atm1504 · 2019-06-22T06:00:11Z

@iamareebjamal please review it.

iamareebjamal · 2019-06-22T06:00:56Z

PRF

atm1504 · 2019-06-22T07:12:15Z

PRF

@iamareebjamal sorry, I couldn't understand what u meant to say. Please explain

liveHarshit · 2019-06-22T07:21:06Z

PRF

@iamareebjamal sorry, I couldn't understand what u meant to say. Please explain

Peer review first. Reviewing 👍

liveHarshit · 2019-06-22T07:21:35Z

Implemented the UI that would handle the addition of rooms

Please add screenshots first.

atm1504 · 2019-06-22T07:23:02Z

Implemented the UI that would handle the addition of rooms

Please add screenshots first.

I will add it by tonight. Need to reflash the memory card with susi installer, so needs time for that. : )

atm1504 · 2019-06-22T09:52:50Z

@liveHarshit can u please start reviewing it. Actually, all my pending tasks are related to this pr. I will be able to work on those, once this is merged. You can now have a look at the code, I will add the screenshot by tonight. Thank you : )

liveHarshit · 2019-06-22T09:57:00Z

@atm1504 Can you please explain what the room feature is so that I can review?

atm1504 · 2019-06-22T10:19:44Z

@liveHarshit yah sure.

See, what we want is that we should associate some room name with the smart speaker that we connect to our account. For that what we have is, initially we show them a list of available rooms. User can add more rooms if he/she wants. These room names are stored locally in the database and are displayed. When a user clicks on any room name, we pass the room name in an intent. We retrieve the room name in a variable. After this when we successfully set up the device(smart speaker with all credentials) we simply make a get request to the server to add this device with the user. The response is not shown to the user. It is done in the background. This is the complete workflow.

liveHarshit · 2019-06-22T10:53:07Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

+        if (activity?.intent?.hasExtra("roomName") as Boolean) {
+            val roomName = activity?.intent?.getStringExtra("roomName").toString()
+            roomNameSelected = roomName
+            activity?.intent?.removeExtra("roomName")


duplicate -3

explain please

You can first store activity?.intent in a bundle before the if statement then use that bundle for query e.t.c.

liveHarshit · 2019-06-22T10:53:17Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt


-        addDeviceButton.setOnClickListener {
-            deviceConnectPresenter.searchDevices()
+        if (activity?.intent?.hasExtra("roomName") as Boolean) {


Don't cast, take a default value instead.

Okay, here take as a bundle, and the get boolean from that bundle.

liveHarshit · 2019-06-22T10:54:05Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

+    private lateinit var availableRoomsRecyclerView: RecyclerView
+    private var availableRoomsAdapter: RecyclerView.Adapter<*>? = null
+    private lateinit var roomNameSelected: String
+    private lateinit var macId: String


To o many lateinit var make sure that app is not crashing in any case.

Its not crashing

liveHarshit · 2019-06-22T10:55:49Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

+                deviceConnectPresenter.addRoom(roomName)
+                Toast.makeText(context, "Added " + roomName + " as a room", Toast.LENGTH_SHORT).show()
+                edt_room.text.clear()
+                view?.let { it1 -> Utils.hideSoftKeyboard(context, it1) }


What is view here? You can use rootView instead, no need for a null check.

To call the hideSoftKeyboard function we need to pass the view, so simply passing view from getview won't work because of the non-null assertion. So to avoid it, it's better to wrap with let.

To call the hideSoftKeyboard function we need to pass the view,

Yes I know. Here val rootView = inflater.inflate(R.layout.fragment_device_connect, container, false) decleare rootView as lateinit var and use that. It won't be nullable.

liveHarshit · 2019-06-22T10:56:58Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

+
+    class AvailableRoomsFormat {
+        var id: Long? = null
+        var room: String? = null


These should be val.

We cannot do so. We cannot reassign the value again later

liveHarshit · 2019-06-22T10:59:26Z

app/src/main/res/layout/room_layout.xml

+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dp"


In dimension resources file

liveHarshit · 2019-06-22T10:59:37Z

app/src/main/res/layout/room_layout.xml

+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rooms_available"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>


replace ></android.support.v7.widget.RecyclerView> with />

liveHarshit · 2019-06-22T11:00:11Z

app/src/main/res/layout/room_layout.xml

+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_marginTop="@dimen/margin_large"
+            android:background="@color/md_grey_200"></View>


close directly with />

liveHarshit · 2019-06-22T11:00:28Z

app/src/main/res/layout/room_layout.xml

+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dp"


in the dimension resources file

liveHarshit · 2019-06-22T11:01:20Z

app/src/main/res/layout/room_recycler_layout.xml

+
+    <ImageView
+        android:layout_width="20dp"
+        android:layout_height="20dp"


same as above

atm1504 · 2019-06-22T12:03:55Z

@liveHarshit please check now : )

liveHarshit · 2019-06-22T12:11:47Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt


-        addDeviceButton.setOnClickListener {
-            deviceConnectPresenter.searchDevices()
+        val intent = activity?.intent


take bundle not intent, activity.intent.extras

atm1504 · 2019-06-22T12:49:47Z

@liveHarshit please have a look now

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

liveHarshit · 2019-06-22T13:39:14Z

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt

-            deviceConnectPresenter.searchDevices()
+        val bundle = activity?.intent?.extras
+
+        if (bundle?.getString("roomName")?.isNullOrEmpty() == false) {


I don't know why you still require to compare with false after a null check.

Error is "Type mismatch: Inferred type is Boolean? but boolean was expected"

atm1504 · 2019-06-22T18:29:59Z

Screenshot:

atm1504 · 2019-06-22T18:30:50Z

@iamareebjamal please review it now.

feat: Implement the UI for adding rooms to devices

47abcc5

auto-label bot added the feature label Jun 16, 2019

Enhance minor UI issues

1e6d664

fix circleci build

a5f08e8

atm1504 changed the title ~~feat: Implement the UI for adding rooms to devices~~ [WIP]: Add room feature Jun 17, 2019

auto-label bot removed the feature label Jun 17, 2019

atm1504 added 6 commits June 17, 2019 13:22

feat: show available rooms

b29be5a

Merge branch 'development' of https://github.com/fossasia/susi_android …

888e658

…into atm_add_room

feat: Add new rooms to choose from

ea3baa2

feat: Make room name clickable

07c05b6

Merge branch 'development' into atm_add_room

9d890bd

feat: register device to the server

cc79055

atm1504 mentioned this pull request Jun 20, 2019

fix: Connect smart speaker to open wifi #2263

Merged

feat: add device to server after authentication

f6716b6

atm1504 changed the title ~~[WIP]: Add room feature~~ feat: Add room feature Jun 20, 2019

auto-label bot added the feature label Jun 20, 2019

iamareebjamal reviewed Jun 20, 2019

View reviewed changes

Merge branch 'development' into atm_add_room

ed709e3

atm1504 added 2 commits June 21, 2019 10:59

make suggested changes

377e75f

trigger circleci

d9563f7

liveHarshit reviewed Jun 22, 2019

View reviewed changes

make suggested changes

36d90a3

liveHarshit reviewed Jun 22, 2019

View reviewed changes

atm1504 added 2 commits June 22, 2019 18:18

make changes

86e01ac

Merge branch 'development' into atm_add_room

1e3de2e

liveHarshit reviewed Jun 22, 2019

View reviewed changes

app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt Outdated Show resolved Hide resolved

updated null or empty

394ab75

liveHarshit approved these changes Jun 22, 2019

View reviewed changes

trigger circle ci

4596dba

iamareebjamal approved these changes Jun 22, 2019

View reviewed changes

iamareebjamal merged commit ae46c39 into fossasia:development Jun 22, 2019

feat: Add room feature #2267

feat: Add room feature #2267

Conversation

atm1504 commented Jun 16, 2019

ci-reporter bot commented Jun 16, 2019 • edited Loading

The build is failing

Run Tests

Run Tests

spotless check

spotless check

lint check

lint check

This comment was automagically generated by ci-reporter. If you see a problem, open an issue here.

atm1504 commented Jun 20, 2019

atm1504 commented Jun 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

atm1504 commented Jun 22, 2019

iamareebjamal commented Jun 22, 2019

atm1504 commented Jun 22, 2019

liveHarshit commented Jun 22, 2019

liveHarshit commented Jun 22, 2019

atm1504 commented Jun 22, 2019

atm1504 commented Jun 22, 2019

liveHarshit commented Jun 22, 2019

atm1504 commented Jun 22, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

liveHarshit Jun 22, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

atm1504 commented Jun 22, 2019

Choose a reason for hiding this comment

atm1504 commented Jun 22, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

atm1504 commented Jun 22, 2019

atm1504 commented Jun 22, 2019

ci-reporter bot commented Jun 16, 2019 •

edited

Loading

`Run Tests`

`Run Tests`

`spotless check`

`spotless check`

`lint check`

`lint check`

liveHarshit Jun 22, 2019 •

edited

Loading