aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-25 02:14:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

DFU Lib version shown on DFU screen

Browse Source
This commit is contained in:
Aleksander Nowakowski
2017-02-23 16:39:03 +01:00
parent ba39d689d3
commit 090ccf0075
4 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/layout-land/activity_feature_dfu.xml
View File

@@ -64,6 +64,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"/>
<LinearLayout
android:id="@+id/dfu_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/feature_horizontal_margin"
@@ -78,7 +79,7 @@
style="@style/Widget.List"
android:layout_width="0dp"
android:layout_height="160dp"
android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
android:layout_marginBottom="8dp"
android:layout_marginLeft="4dp"
android:layout_marginTop="@dimen/feature_vertical_margin_top"
android:layout_weight="1"
@@ -200,7 +201,7 @@
style="@style/Widget.List"
android:layout_width="0dp"
android:layout_height="160dp"
android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
android:layout_marginBottom="8dp"
android:layout_marginLeft="14dp"
android:layout_marginRight="4dp"
android:layout_marginTop="@dimen/feature_vertical_margin_top"
@@ -250,6 +251,15 @@
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/feature_horizontal_margin"
android:layout_alignParentRight="true"
android:layout_below="@+id/dfu_container"
android:text="@string/dfu_lib_version"
android:textSize="12dp"/>
<Button
android:id="@+id/action_connect"
style="@style/Widget.Connect"

10
app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml
View File

@@ -194,7 +194,7 @@
style="@style/Widget.List"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
android:layout_marginBottom="8dp"
android:layout_marginLeft="@dimen/feature_horizontal_margin"
android:layout_marginRight="@dimen/feature_horizontal_margin"
android:layout_marginTop="15dp"
@@ -241,6 +241,14 @@
android:text="@string/dfu_uploading_percentage_label"
android:visibility="invisible"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/feature_horizontal_margin"
android:layout_gravity="right"
android:text="@string/dfu_lib_version"
android:textSize="12sp"/>
</LinearLayout>
<Button

53
app/src/main/res/layout/activity_feature_dfu.xml
View File

@@ -62,11 +62,32 @@
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<Button
android:id="@+id/action_connect"
style="@style/Widget.Connect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
android:onClick="onConnectClicked"
android:text="@string/action_select"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="6dp"
android:src="@drawable/background_title"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true">
<!-- Application section -->
@@ -107,7 +128,7 @@
android:layout_weight="1"
android:ellipsize="middle"
android:freezesText="true"
android:singleLine="true"/>
android:lines="1"/>
</TableRow>
<TableRow
@@ -195,7 +216,7 @@
style="@style/Widget.List"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
android:layout_marginBottom="8dp"
android:layout_marginLeft="@dimen/feature_horizontal_margin"
android:layout_marginRight="@dimen/feature_horizontal_margin"
android:layout_marginTop="15dp"
@@ -242,26 +263,16 @@
android:text="@string/dfu_uploading_percentage_label"
android:visibility="invisible"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/feature_horizontal_margin"
android:layout_gravity="right"
android:text="@string/dfu_lib_version"
android:textSize="12sp"/>
</LinearLayout>
<Button
android:id="@+id/action_connect"
style="@style/Widget.Connect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
android:onClick="onConnectClicked"
android:text="@string/action_select"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="6dp"
android:src="@drawable/background_title"/>
</no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
</LinearLayout>

3
app/src/main/res/values/strings_dfu.xml
View File

@@ -24,7 +24,8 @@
<string name="dfu_feature_title">DFU</string>
<string name="dfu_service_title">nRF Toolbox DFU Proxy</string>
<string name="dfu_settings_title">DFU Settings</string>
<string name="dfu_lib_version">DFU Library version 1.2.0</string>
<string name="dfu_feature_title_long">DEVICE FIRMWARE UPDATE</string>
<dimen name="dfu_feature_title_long_margin">-186dp</dimen>