aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-01 22:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

#69 fixed

Browse Source
This commit is contained in:
Aleksander Nowakowski
2019-04-03 09:40:56 +02:00
parent b15ce50dd3
commit f1e2b8bc04
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@@ -30,6 +30,7 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="no.nordicsemi.android.LOG" />

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

@@ -201,7 +201,7 @@
android:layout_height="wrap_content"
android:onClick="onSelectFileClicked"
android:text="@string/dfu_action_select_file"
app:backgroundTint="@color/nordicLake"/>
app:backgroundTint="@color/button_color"/>
<ImageView
android:layout_width="wrap_content"

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

@@ -195,7 +195,7 @@
android:layout_height="wrap_content"
android:onClick="onSelectFileClicked"
android:text="@string/dfu_action_select_file"
app:backgroundTint="@color/nordicLake"/>
app:backgroundTint="@color/button_color"/>
<ImageView
android:layout_width="wrap_content"

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

@@ -21,10 +21,10 @@
~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
tools:context=".dfu.DfuActivity">
@@ -77,10 +77,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true">
android:gravity="center_horizontal"
android:orientation="vertical">
<!-- Application section -->
@@ -204,12 +204,12 @@
android:paddingLeft="42dp">
<com.google.android.material.button.MaterialButton
app:backgroundTint="@color/nordicLake"
android:id="@+id/action_select_file"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onSelectFileClicked"
android:text="@string/dfu_action_select_file"/>
android:text="@string/dfu_action_select_file"
app:backgroundTint="@color/button_color"/>
<ImageView
android:layout_width="wrap_content"
@@ -240,14 +240,14 @@
android:text="@string/dfu_section_dfu_header"/>
<com.google.android.material.button.MaterialButton
app:backgroundTint="@color/button_color"
android:id="@+id/action_upload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/feature_section_padding"
android:enabled="false"
android:onClick="onUploadClicked"
android:text="@string/dfu_action_upload"/>
android:text="@string/dfu_action_upload"
app:backgroundTint="@color/button_color"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/textviewUploading"
@@ -279,8 +279,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/feature_horizontal_margin"
android:layout_gravity="right"
android:layout_marginRight="@dimen/feature_horizontal_margin"
android:text="@string/dfu_lib_version"
android:textSize="12sp"/>
</LinearLayout>