Added alarm history to project and renaming
This commit is contained in:
1 parent
792c650400
commit
032ab2788d
9 files changed
+279
-89
No files matched your search
@@ -36,4 +36,27 @@
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:listitem="@layout/device_item"
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:listitem="@layout/alarm_history_item"
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -8,19 +8,19 @@
|
||||
android:padding="10dp"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvStatusmessage"
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text="Hello World!"
|
||||
android:layout_weight="4">
|
||||
</TextView>
|
||||
android:layout_weight="3"
|
||||
tools:listitem="@layout/alarm_history_item">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="2"
|
||||
android:layout_weight="3"
|
||||
tools:listitem="@layout/device_item">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="8dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAlarmHistoryDeviceSensorType"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sensor_type_placeholder"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:maxLines="1"
|
||||
android:layout_alignParentStart="true"
|
||||
android:ellipsize="end">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAlarmHistoryDeviceID"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvAlarmHistoryDeviceSensorType"
|
||||
android:text="@string/deviceID_placeholder">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAlarmHistoryDeviceTimeStamp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvAlarmHistoryDeviceID"
|
||||
android:text="@string/sensor_time_stamp_placeholder">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAlarmHistoryDeviceSensorMassage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvAlarmHistoryDeviceTimeStamp"
|
||||
android:text="@string/sensor_message_placeholder">
|
||||
</TextView>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
Reference in new issue
Block a user