<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content">
- <LinearLayout
- android:orientation="vertical"
+ <!--
+ <TableLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="match_parent"
+ android:id="@+id/tbl_opts"
+ android:stretchColumns="1">
- <TextView
- android:text="@string/header_gamestate"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center" />
+ <TableRow
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent" >
- <TableLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:stretchColumns="1">
+ <TextView
+ android:text="Notifications\nDuring\nGame"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center" />
- <TableRow
+ <LinearLayout
+ android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:paddingBottom="1dp">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/tv_jailbreak"
- android:text="@string/ctfws_gamestart"
- android:gravity="center" />
+ android:layout_height="match_parent">
- <ProgressBar
- style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
+ <CheckBox
+ android:text="Wear"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/pb_jailbreak"
- android:layout_weight="1"
- android:indeterminate="false"
- android:max="100"
- android:progress="0"
- android:padding="5dp"
- android:rotation="180" />
-
- <Chronometer
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/ch_jailbreak"
- android:countDown="true" />
-
- </TableRow>
-
- <TableRow
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:paddingBottom="1dp"
- android:paddingTop="1dp">
-
- <TextView
- android:text="@string/header_gametimeela"
- android:layout_height="wrap_content"
- android:id="@+id/tv_gameProgress"
- android:layout_weight="1"
- android:gravity="center"
- android:layout_width="wrap_content" />
+ android:id="@+id/notif_wear"
+ android:layout_weight="1" />
- <ProgressBar
- style="@android:style/Widget.DeviceDefault.Light.ProgressBar.Horizontal"
+ <CheckBox
+ android:text="Here"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/pb_gameProgress"
- android:layout_weight="1"
- android:indeterminate="false"
- android:padding="5dp" />
-
- <Chronometer
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/ch_gameProgress" />
-
- </TableRow>
-
- <TableRow
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/tr_flags"
- android:paddingTop="1dp">
+ android:id="@+id/notif_here"
+ android:layout_weight="1" />
+ </LinearLayout>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:id="@+id/tv_flags_label" />
+ </TableRow>
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/tv_flags"
- android:gravity="center" />
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
- </TableRow>
+ </TableLayout>
+ -->
- </TableLayout>
- </LinearLayout>
+ <TextView
+ android:text="@string/header_gamestate"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:clickable="true"
+ android:onClick="onclick_gamestate" />
- <LinearLayout
- android:orientation="vertical"
+ <TableLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="match_parent"
+ android:stretchColumns="1">
- <TextView
+ <TableRow
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:gravity="center"
- android:text="@string/header_messages" />
+ android:paddingBottom="1dp">
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="none"
- android:ems="10"
- android:id="@+id/msgs"
- android:lines="10"
- android:scrollbars="vertical"
- android:gravity="bottom" />
-
- </LinearLayout>
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_jailbreak"
+ android:text="@string/ctfws_gamestart"
+ android:gravity="center" />
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="@string/mqtt_header" />
+ <ProgressBar
+ style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/pb_jailbreak"
+ android:layout_weight="1"
+ android:indeterminate="false"
+ android:max="100"
+ android:progress="0"
+ android:padding="5dp"
+ android:rotation="180" />
+
+ <Chronometer
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/ch_jailbreak"
+ android:countDown="true" />
- <TableLayout
+ </TableRow>
+
+ <TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:stretchColumns="1">
+ android:gravity="center"
+ android:paddingBottom="1dp"
+ android:paddingTop="1dp">
+
+ <TextView
+ android:text="@string/header_gametimeela"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_gameProgress"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:layout_width="wrap_content" />
- <TableRow
+ <ProgressBar
+ style="@android:style/Widget.DeviceDefault.Light.ProgressBar.Horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content"
+ android:id="@+id/pb_gameProgress"
+ android:layout_weight="1"
+ android:indeterminate="false"
+ android:padding="5dp" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/menutext_mqtt_label"
- android:gravity="center" />
+ <Chronometer
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/ch_gameProgress" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/tv_mqtt_server_uri"
- android:gravity="center" />
- </TableRow>
+ </TableRow>
+
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/tr_flags"
+ android:paddingTop="1dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:id="@+id/tv_flags_label" />
- <TableRow
+ <TextView
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_flags"
+ android:gravity="center" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/mqtt_state_label"
- android:gravity="center" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/tv_mqtt_state"
- android:gravity="center" />
+ </TableLayout>
- </TableRow>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/header_messages" />
- </TableLayout>
- </LinearLayout>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="none"
+ android:ems="10"
+ android:id="@+id/msgs"
+ android:lines="10"
+ android:scrollbars="vertical"
+ android:gravity="bottom" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/mqtt_header" />
- <!--
<TableLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/tbl_opts"
android:stretchColumns="1">
<TableRow
- android:layout_width="wrap_content"
- android:layout_height="match_parent" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/menutext_mqtt_label"
+ android:gravity="right" />
<TextView
- android:text="Notifications\nDuring\nGame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:id="@+id/tv_mqtt_server_uri"
android:gravity="center" />
+ </TableRow>
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <CheckBox
- android:text="Wear"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/notif_wear"
- android:layout_weight="1" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/mqtt_state_label"
+ android:gravity="right" />
- <CheckBox
- android:text="Here"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/notif_here"
- android:layout_weight="1" />
- </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_mqtt_state"
+ android:gravity="center" />
</TableRow>
- <TableRow
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
</TableLayout>
- -->
-
</LinearLayout>
</RelativeLayout>