Merge pull request #68 from NordicSemiconductor/develop

Version 2.7.0

app/build.gradle

@@ -8,9 +8,11 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 66
+        versionCode 67
-        versionName "2.6.0"
+        versionName "2.7.0"
         resConfigs "en"
+
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         debug {
@@ -40,15 +42,15 @@ dependencies {
     //noinspection GradleDependency
     implementation 'com.google.android.gms:play-services-wearable:10.2.0'
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.preference:preference:1.1.0-alpha04'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha05'
 
     implementation 'no.nordicsemi.android:log:2.2.0'
-    implementation 'no.nordicsemi.android.support.v18:scanner:1.1.0'
+    implementation 'no.nordicsemi.android.support.v18:scanner:1.4.0'
 
     // The DFU Library is imported automatically from jcenter:
-    implementation 'no.nordicsemi.android:dfu:1.8.0'
+    implementation 'no.nordicsemi.android:dfu:1.9.0'
     // if you desire to build the DFU Library, clone the
     // https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder,
     // add it as a module into the project structure and uncomment the following line
@@ -57,7 +59,7 @@ dependencies {
 
     // Import the BLE Common Library.
     // The BLE Common Library depends on BLE Library. It is enough to include the first one.
-    implementation 'no.nordicsemi.android:ble-common:2.0.0'
+    implementation 'no.nordicsemi.android:ble-common:2.1.1'
     // The BLE Common Library may be included from jcenter. If you want to modify the code,
     // clone both projects from GitHub and replace the line above with the following
     // (and also the according lines in the settings.gradle):

app/proguard-rules.pro

@@ -1,4 +1,3 @@
--libraryjars ../app/libs
 -optimizationpasses 5
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
@@ -29,30 +28,9 @@
 -keep public class * extends android.preference.Preference
 -keep public class com.android.vending.licensing.ILicensingService
 
-# The support library contains references to newer platform versions.
+# The AndroidX library contains references to newer platform versions.
 # Don't warn about those in case this app is linking against an older platform version.
--dontwarn android.support.**
+-dontwarn androidx.**
-
-# android-support-design
--dontwarn android.support.design.**
--keep class android.support.design.** { *; }
--keep interface android.support.design.** { *; }
--keep,includedescriptorclasses class android.support.transition.** { *; }
--keep public class android.support.design.R$* { *; }
-
-# android-support-v4
--dontwarn android.support.v4.**
--dontnote android.support.v4.**
--keep interface android.support.v4.app.** { *; }
--keep class android.support.v4.app.** { *; }
--keep class android.support.v4.** { *; }
-
-# android-support-v7
--dontwarn android.support.v7.**
--dontnote android.support.v7.**
--keep interface android.support.v7.internal.** { *; }
--keep class android.support.v7.internal.** { *; }
--keep class android.support.v7.** { *; }
 
 -keep class com.google.android.gms.**
 -dontwarn com.google.android.gms.**
@@ -74,6 +52,7 @@
 # (the rt.jar has them)
 -dontwarn com.bea.xml.stream.XMLWriterBase
 -dontwarn javax.xml.stream.events.**
+-dontwarn javax.xml.stream.**
 
 # Simple XML
 -keep public class org.simpleframework.** { *; }

app/src/main/AndroidManifest.xml

@@ -54,7 +54,7 @@
 		<activity
 			android:name="no.nordicsemi.android.nrftoolbox.SplashscreenActivity"
 			android:label="@string/app_name"
-			android:theme="@style/AppTheme.Fullscreen" >
+			android:theme="@style/AppTheme.SplashScreen" >
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/AppHelpFragment.java

@@ -24,9 +24,9 @@ package no.nordicsemi.android.nrftoolbox;
 import android.app.Dialog;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 public class AppHelpFragment extends DialogFragment {
 	private static final String ARG_TEXT = "ARG_TEXT";

app/src/main/java/no/nordicsemi/android/nrftoolbox/FeaturesActivity.java

@@ -32,11 +32,13 @@ import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.view.GravityCompat;
+
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.NonNull;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.core.view.GravityCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.drawerlayout.widget.DrawerLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -92,7 +94,7 @@ public class FeaturesActivity extends AppCompatActivity {
 		drawer.addDrawerListener(mDrawerToggle);
 
 		// setup plug-ins in the drawer
-		setupPluginsInDrawer((ViewGroup) drawer.findViewById(R.id.plugin_container));
+		setupPluginsInDrawer(drawer.findViewById(R.id.plugin_container));
 
 		// configure the app grid
 		final GridView grid = findViewById(R.id.grid);
@@ -132,7 +134,7 @@ public class FeaturesActivity extends AppCompatActivity {
 	}
 
 	@Override
-	public void onConfigurationChanged(final Configuration newConfig) {
+	public void onConfigurationChanged(@NonNull final Configuration newConfig) {
 		super.onConfigurationChanged(newConfig);
 		mDrawerToggle.onConfigurationChanged(newConfig);
 	}
@@ -168,7 +170,7 @@ public class FeaturesActivity extends AppCompatActivity {
 		final TextView nrfConnectItem = container.findViewById(R.id.link_mcp);
 		if (nrfConnectInfo == null) {
 			nrfConnectItem.setTextColor(Color.GRAY);
-			ColorMatrix grayscale = new ColorMatrix();
+			final ColorMatrix grayscale = new ColorMatrix();
 			grayscale.setSaturation(0.0f);
 			nrfConnectItem.getCompoundDrawables()[0].mutate().setColorFilter(new ColorMatrixColorFilter(grayscale));
 		}

app/src/main/java/no/nordicsemi/android/nrftoolbox/PermissionRationaleFragment.java

@@ -24,9 +24,9 @@ package no.nordicsemi.android.nrftoolbox;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 public class PermissionRationaleFragment extends DialogFragment {
 	private static final String ARG_PERMISSION = "ARG_PERMISSION";

app/src/main/java/no/nordicsemi/android/nrftoolbox/app/ExpandableListActivity.java

@@ -19,8 +19,8 @@ package no.nordicsemi.android.nrftoolbox.app;
 import android.app.Activity;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View;
@@ -191,7 +191,7 @@ public class ExpandableListActivity extends AppCompatActivity implements
 	/**
 	 * Updates the screen state (current list and other views) when the content changes.
 	 * 
-	 * @see android.support.v7.app.AppCompatActivity#onContentChanged()
+	 * @see androidx.appcompat.app.AppCompatActivity#onContentChanged()
 	 */
 	@Override
 	public void onContentChanged() {

app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java

@@ -5,7 +5,7 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import java.util.UUID;

app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java

@@ -23,8 +23,8 @@ package no.nordicsemi.android.nrftoolbox.bpm;
 
 import android.bluetooth.BluetoothDevice;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.TextView;
 
 import java.util.Calendar;

app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java

@@ -26,8 +26,8 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import java.util.Calendar;

app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSActivity.java

@@ -28,7 +28,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.SparseArray;
 import android.view.MenuInflater;
 import android.view.MenuItem;

app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManager.java

@@ -27,8 +27,8 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.util.SparseArray;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManagerCallbacks.java

@@ -23,7 +23,7 @@
 package no.nordicsemi.android.nrftoolbox.cgms;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import no.nordicsemi.android.nrftoolbox.battery.BatteryManagerCallbacks;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMService.java

@@ -8,9 +8,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.SparseArray;
 
 import no.nordicsemi.android.log.Logger;

app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCActivity.java

@@ -30,7 +30,7 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.Menu;
 import android.widget.TextView;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java

@@ -29,7 +29,7 @@ import android.bluetooth.BluetoothGattService;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import java.util.UUID;

app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCService.java

@@ -30,9 +30,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import no.nordicsemi.android.log.Logger;
 import no.nordicsemi.android.nrftoolbox.FeaturesActivity;

app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/settings/SettingsActivity.java

@@ -23,8 +23,8 @@
 package no.nordicsemi.android.nrftoolbox.csc.settings;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import no.nordicsemi.android.nrftoolbox.R;
@@ -41,7 +41,7 @@ public class SettingsActivity extends AppCompatActivity {
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 		// Display the fragment as the main content.
-		getFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
+		getSupportFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
 	}
 
 	@Override

app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/settings/SettingsFragment.java

@@ -24,12 +24,12 @@ package no.nordicsemi.android.nrftoolbox.csc.settings;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceFragment;
+import androidx.preference.PreferenceScreen;
-import android.preference.PreferenceScreen;
 
+import androidx.preference.PreferenceFragmentCompat;
 import no.nordicsemi.android.nrftoolbox.R;
 
-public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
 	public static final String SETTINGS_WHEEL_SIZE = "settings_wheel_size";
 	public static final int SETTINGS_WHEEL_SIZE_DEFAULT = 2340;
 	public static final String SETTINGS_UNIT = "settings_csc_unit";
@@ -38,11 +38,8 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
 	public static final int SETTINGS_UNIT_MPH = 2; // [m/s]
 	public static final int SETTINGS_UNIT_DEFAULT = SETTINGS_UNIT_KM_H;
 
-
 	@Override
-	public void onCreate(final Bundle savedInstanceState) {
+	public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-		super.onCreate(savedInstanceState);
-
 		addPreferencesFromResource(R.xml.settings_csc);
 
 		// set initial values

app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java

@@ -42,13 +42,13 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuInitiatorActivity.java

@@ -25,7 +25,7 @@ package no.nordicsemi.android.nrftoolbox.dfu;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import no.nordicsemi.android.nrftoolbox.R;
 import no.nordicsemi.android.nrftoolbox.scanner.ScannerFragment;

app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/fragment/UploadCancelFragment.java

@@ -26,10 +26,10 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 
 import no.nordicsemi.android.nrftoolbox.R;

app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/fragment/ZipInfoFragment.java

@@ -23,9 +23,9 @@ package no.nordicsemi.android.nrftoolbox.dfu.fragment;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/settings/AboutDfuPreference.java

@@ -25,10 +25,10 @@ package no.nordicsemi.android.nrftoolbox.dfu.settings;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.preference.Preference;
 import android.util.AttributeSet;
 import android.widget.Toast;
 
+import androidx.preference.Preference;
 import no.nordicsemi.android.nrftoolbox.R;
 
 public class AboutDfuPreference extends Preference {
@@ -44,7 +44,8 @@ public class AboutDfuPreference extends Preference {
 	@Override
 	protected void onClick() {
 		final Context context = getContext();
-		final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.sdk52.v0.9.1%2Fexamples_ble_dfu.html&cp=4_0_0_4_2"));
+		final Intent intent = new Intent(Intent.ACTION_VIEW,
+				Uri.parse("https://www.nordicsemi.com/DocLib/Content/SDK_Doc/nRF5_SDK/v15-3-0/ble_sdk_app_dfu_bootloader"));
 		intent.addCategory(Intent.CATEGORY_DEFAULT);
 		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/settings/SettingsActivity.java

@@ -23,8 +23,8 @@
 package no.nordicsemi.android.nrftoolbox.dfu.settings;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import no.nordicsemi.android.nrftoolbox.R;
@@ -41,7 +41,7 @@ public class SettingsActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 		// Display the fragment as the main content.
-		getFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
+		getSupportFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
 	}
 
 	@Override

app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/settings/SettingsFragment.java

@@ -24,21 +24,20 @@ package no.nordicsemi.android.nrftoolbox.dfu.settings;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.PreferenceFragment;
+import androidx.appcompat.app.AlertDialog;
-import android.preference.PreferenceScreen;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+import no.nordicsemi.android.dfu.DfuServiceInitiator;
 import no.nordicsemi.android.dfu.DfuSettingsConstants;
 import no.nordicsemi.android.nrftoolbox.R;
 
-public class SettingsFragment extends PreferenceFragment implements DfuSettingsConstants, SharedPreferences.OnSharedPreferenceChangeListener {
+public class SettingsFragment extends PreferenceFragmentCompat implements DfuSettingsConstants, SharedPreferences.OnSharedPreferenceChangeListener {
 	public static final String SETTINGS_KEEP_BOND = "settings_keep_bond";
 
 	@Override
-	public void onCreate(final Bundle savedInstanceState) {
+	public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-		super.onCreate(savedInstanceState);
-
 		addPreferencesFromResource(R.xml.settings_dfu);
 
 		// set initial values
@@ -69,7 +68,7 @@ public class SettingsFragment extends PreferenceFragment implements DfuSettingsC
 		if (SETTINGS_PACKET_RECEIPT_NOTIFICATION_ENABLED.equals(key)) {
 			final boolean disabled = !preferences.getBoolean(SETTINGS_PACKET_RECEIPT_NOTIFICATION_ENABLED, true);
 			if (disabled && Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-				new AlertDialog.Builder(getActivity()).setMessage(R.string.dfu_settings_dfu_number_of_packets_info).setTitle(R.string.dfu_settings_dfu_information)
+				new AlertDialog.Builder(requireContext()).setMessage(R.string.dfu_settings_dfu_number_of_packets_info).setTitle(R.string.dfu_settings_dfu_information)
 						.setPositiveButton(R.string.ok, null).show();
 			}
 		} else if (SETTINGS_NUMBER_OF_PACKETS.equals(key)) {
@@ -77,7 +76,7 @@ public class SettingsFragment extends PreferenceFragment implements DfuSettingsC
 		} else if (SETTINGS_MBR_SIZE.equals(key)) {
 			updateMBRSize();
 		} else if (SETTINGS_ASSUME_DFU_NODE.equals(key) && sharedPreferences.getBoolean(key, false)) {
-			new AlertDialog.Builder(getActivity()).setMessage(R.string.dfu_settings_dfu_assume_dfu_mode_info).setTitle(R.string.dfu_settings_dfu_information)
+			new AlertDialog.Builder(requireContext()).setMessage(R.string.dfu_settings_dfu_assume_dfu_mode_info).setTitle(R.string.dfu_settings_dfu_information)
 					.setPositiveButton(R.string.ok, null)
 					.show();
 		}
@@ -97,7 +96,7 @@ public class SettingsFragment extends PreferenceFragment implements DfuSettingsC
 
 		final int valueInt = Integer.parseInt(value);
 		if (valueInt > 200 && Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-			new AlertDialog.Builder(getActivity()).setMessage(R.string.dfu_settings_dfu_number_of_packets_info).setTitle(R.string.dfu_settings_dfu_information)
+			new AlertDialog.Builder(requireContext()).setMessage(R.string.dfu_settings_dfu_number_of_packets_info).setTitle(R.string.dfu_settings_dfu_information)
 					.setPositiveButton(R.string.ok, null)
 					.show();
 		}
@@ -107,7 +106,7 @@ public class SettingsFragment extends PreferenceFragment implements DfuSettingsC
 		final PreferenceScreen screen = getPreferenceScreen();
 		final SharedPreferences preferences = getPreferenceManager().getSharedPreferences();
 
-		final String value = preferences.getString(SETTINGS_MBR_SIZE, String.valueOf(SETTINGS_DEFAULT_MBR_SIZE));
+		final String value = preferences.getString(SETTINGS_MBR_SIZE, String.valueOf(DfuServiceInitiator.DEFAULT_MBR_SIZE));
 		screen.findPreference(SETTINGS_MBR_SIZE).setSummary(value);
 	}
 }

app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java

@@ -23,7 +23,7 @@ package no.nordicsemi.android.nrftoolbox.gls;
 
 import android.bluetooth.BluetoothDevice;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.SparseArray;
 import android.view.MenuInflater;
 import android.view.MenuItem;

app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java

@@ -27,8 +27,8 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.util.SparseArray;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSActivity.java

@@ -27,8 +27,8 @@ import android.content.Intent;
 import android.graphics.Point;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.TextView;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManager.java

@@ -26,8 +26,8 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import java.util.List;

app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSActivity.java

@@ -29,11 +29,10 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.Menu;
 import android.widget.TextView;
 
-import java.text.DecimalFormat;
 import java.util.UUID;
 
 import no.nordicsemi.android.nrftoolbox.R;

app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSManager.java

@@ -26,8 +26,8 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.Calendar;
 import java.util.UUID;

app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSService.java

@@ -30,10 +30,10 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import java.util.Calendar;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/settings/SettingsActivity.java

@@ -23,8 +23,8 @@
 package no.nordicsemi.android.nrftoolbox.hts.settings;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import no.nordicsemi.android.nrftoolbox.R;
@@ -41,7 +41,7 @@ public class SettingsActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 		// Display the fragment as the main content.
-        getFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
+        getSupportFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
 	}
 
 	@Override

app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/settings/SettingsFragment.java

@@ -25,9 +25,10 @@ package no.nordicsemi.android.nrftoolbox.hts.settings;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
 
+import androidx.preference.PreferenceFragmentCompat;
 import no.nordicsemi.android.nrftoolbox.R;
 
-public class SettingsFragment extends PreferenceFragment {
+public class SettingsFragment extends PreferenceFragmentCompat {
 	public static final String SETTINGS_UNIT = "settings_hts_unit";
 	public static final int SETTINGS_UNIT_C = 0; // [C]
 	public static final int SETTINGS_UNIT_F = 1; // [F]
@@ -35,9 +36,7 @@ public class SettingsFragment extends PreferenceFragment {
 	public static final int SETTINGS_UNIT_DEFAULT = SETTINGS_UNIT_C;
 
 	@Override
-	public void onCreate(final Bundle savedInstanceState) {
+	public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-		super.onCreate(savedInstanceState);
-
 		addPreferencesFromResource(R.xml.settings_hts);
 	}
 }

app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java

@@ -29,9 +29,9 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java

@@ -29,8 +29,8 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileService.java

@@ -33,9 +33,9 @@ import android.net.Uri;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.widget.Toast;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileServiceReadyActivity.java

@@ -35,10 +35,10 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/LoggableBleManager.java

@@ -1,8 +1,8 @@
 package no.nordicsemi.android.nrftoolbox.profile;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import no.nordicsemi.android.ble.BleManager;

app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileService.java

@@ -32,9 +32,9 @@ import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -47,7 +47,6 @@ import no.nordicsemi.android.ble.BleManager;
 import no.nordicsemi.android.ble.BleManagerCallbacks;
 import no.nordicsemi.android.ble.utils.ILogger;
 import no.nordicsemi.android.log.ILogSession;
-import no.nordicsemi.android.log.LogContract;
 import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager;
 
 public abstract class BleMulticonnectProfileService extends Service implements BleManagerCallbacks {

app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java

@@ -35,9 +35,9 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -52,7 +52,6 @@ import java.util.UUID;
 import no.nordicsemi.android.ble.BleManagerCallbacks;
 import no.nordicsemi.android.log.ILogSession;
 import no.nordicsemi.android.log.LocalLogSession;
-import no.nordicsemi.android.log.LogContract;
 import no.nordicsemi.android.log.Logger;
 import no.nordicsemi.android.nrftoolbox.AppHelpFragment;
 import no.nordicsemi.android.nrftoolbox.R;

app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/IDeviceLogger.java

@@ -23,7 +23,7 @@
 package no.nordicsemi.android.nrftoolbox.profile.multiconnect;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 
 public interface IDeviceLogger {
 	/**

app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java

@@ -23,8 +23,8 @@
 package no.nordicsemi.android.nrftoolbox.proximity;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/LinkLossFragment.java

@@ -23,9 +23,9 @@ package no.nordicsemi.android.nrftoolbox.proximity;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import no.nordicsemi.android.nrftoolbox.R;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityActivity.java

@@ -28,9 +28,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.UUID;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java

@@ -25,7 +25,7 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import java.util.UUID;

app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManagerCallbacks.java

@@ -22,7 +22,7 @@
 package no.nordicsemi.android.nrftoolbox.proximity;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import no.nordicsemi.android.nrftoolbox.battery.BatteryManagerCallbacks;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityServerManagerCallbacks.java

@@ -22,7 +22,7 @@
 package no.nordicsemi.android.nrftoolbox.proximity;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface ProximityServerManagerCallbacks {
 	void onAlarmTriggered(@NonNull final BluetoothDevice device);

app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java

@@ -34,11 +34,11 @@ import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.RingtoneManager;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/RSCActivity.java

@@ -30,7 +30,7 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.Menu;
 import android.widget.TextView;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/RSCManager.java

@@ -27,8 +27,8 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.UUID;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/RSCService.java

@@ -31,10 +31,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import no.nordicsemi.android.log.Logger;
 import no.nordicsemi.android.nrftoolbox.FeaturesActivity;

app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/settings/SettingsActivity.java

@@ -23,8 +23,8 @@
 package no.nordicsemi.android.nrftoolbox.rsc.settings;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import no.nordicsemi.android.nrftoolbox.R;
@@ -41,7 +41,7 @@ public class SettingsActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 		// Display the fragment as the main content.
-		getFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
+		getSupportFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
 	}
 
 	@Override

app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/settings/SettingsFragment.java

@@ -25,9 +25,10 @@ package no.nordicsemi.android.nrftoolbox.rsc.settings;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
 
+import androidx.preference.PreferenceFragmentCompat;
 import no.nordicsemi.android.nrftoolbox.R;
 
-public class SettingsFragment extends PreferenceFragment {
+public class SettingsFragment extends PreferenceFragmentCompat {
 	public static final String SETTINGS_UNIT = "settings_rsc_unit";
 	public static final int SETTINGS_UNIT_M_S = 0; // [m/s]
 	public static final int SETTINGS_UNIT_KM_H = 1; // [m/s]
@@ -35,9 +36,7 @@ public class SettingsFragment extends PreferenceFragment {
 	public static final int SETTINGS_UNIT_DEFAULT = SETTINGS_UNIT_KM_H;
 
 	@Override
-	public void onCreate(final Bundle savedInstanceState) {
+	public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-		super.onCreate(savedInstanceState);
-
 		addPreferencesFromResource(R.xml.settings_rsc);
 	}
 }

app/src/main/java/no/nordicsemi/android/nrftoolbox/scanner/ScannerFragment.java

@@ -32,11 +32,11 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ParcelUuid;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;

app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateActivity.java

@@ -27,10 +27,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.Menu;
-import android.view.View;
 import android.widget.TextView;
 
 import java.util.UUID;
@@ -63,7 +62,11 @@ public class TemplateActivity extends BleProfileServiceReadyActivity<TemplateSer
 		mValueView = findViewById(R.id.value);
 		mBatteryLevelView = findViewById(R.id.battery);
 
-		findViewById(R.id.action_set_name).setOnClickListener(v -> getService().performAction("Template"));
+		findViewById(R.id.action_set_name).setOnClickListener(v -> {
+			if (isDeviceConnected()) {
+				getService().performAction("Template");
+			}
+		});
 	}
 
 	@Override

app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java

@@ -26,7 +26,7 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import java.util.UUID;

app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateService.java

@@ -30,9 +30,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import no.nordicsemi.android.log.Logger;
 import no.nordicsemi.android.nrftoolbox.FeaturesActivity;

app/src/main/java/no/nordicsemi/android/nrftoolbox/template/callback/TemplateCharacteristicCallback.java

@@ -1,7 +1,7 @@
 package no.nordicsemi.android.nrftoolbox.template.callback;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * This class defines your characteristic API.

app/src/main/java/no/nordicsemi/android/nrftoolbox/template/callback/TemplateDataCallback.java

@@ -1,7 +1,7 @@
 package no.nordicsemi.android.nrftoolbox.template.callback;
 
 import android.bluetooth.BluetoothDevice;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import no.nordicsemi.android.ble.callback.profile.ProfileDataCallback;
 import no.nordicsemi.android.ble.data.Data;

app/src/main/java/no/nordicsemi/android/nrftoolbox/template/settings/SettingsActivity.java

@@ -23,8 +23,8 @@
 package no.nordicsemi.android.nrftoolbox.template.settings;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import no.nordicsemi.android.nrftoolbox.R;
@@ -41,7 +41,7 @@ public class SettingsActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 		// Display the fragment as the main content.
-		getFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
+		getSupportFragmentManager().beginTransaction().replace(R.id.content, new SettingsFragment()).commit();
 	}
 
 	@Override

app/src/main/java/no/nordicsemi/android/nrftoolbox/template/settings/SettingsFragment.java

@@ -25,18 +25,17 @@ package no.nordicsemi.android.nrftoolbox.template.settings;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
 
+import androidx.preference.PreferenceFragmentCompat;
 import no.nordicsemi.android.nrftoolbox.R;
 
-public class SettingsFragment extends PreferenceFragment {
+public class SettingsFragment extends PreferenceFragmentCompat {
 	public static final String SETTINGS_DATA = "settings_template_data"; // TODO values matching those in settings_template.xml file in /res/xml
 	public static final int SETTINGS_VARIANT_A = 0;
 	public static final int SETTINGS_VARIANT_B = 1;
 	public static final int SETTINGS_VARIANT_DEFAULT = SETTINGS_VARIANT_A;
 
 	@Override
-	public void onCreate(final Bundle savedInstanceState) {
+	public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-		super.onCreate(savedInstanceState);
-
 		addPreferencesFromResource(R.xml.settings_template);
 	}
 }

app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java

@@ -46,14 +46,14 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v4.widget.SlidingPaneLayout;
+import androidx.slidingpanelayout.widget.SlidingPaneLayout;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.Menu;
 import android.view.View;

app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTControlFragment.java

@@ -24,7 +24,7 @@ package no.nordicsemi.android.nrftoolbox.uart;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTEditDialog.java

@@ -24,9 +24,9 @@ package no.nordicsemi.android.nrftoolbox.uart;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTLogAdapter.java

@@ -25,7 +25,7 @@ package no.nordicsemi.android.nrftoolbox.uart;
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTLogFragment.java

@@ -31,12 +31,12 @@ import android.content.ServiceConnection;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
-import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
+import androidx.loader.content.CursorLoader;
-import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java

@@ -26,7 +26,7 @@ import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import java.util.UUID;

app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTNewConfigurationDialogFragment.java

@@ -25,9 +25,9 @@ package no.nordicsemi.android.nrftoolbox.uart;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTService.java

@@ -30,9 +30,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/widget/ClosableSpinner.java

@@ -25,7 +25,7 @@ package no.nordicsemi.android.nrftoolbox.widget;
 import android.content.Context;
 import android.util.AttributeSet;
 
-public class ClosableSpinner extends android.support.v7.widget.AppCompatSpinner {
+public class ClosableSpinner extends androidx.appcompat.widget.AppCompatSpinner {
 	public ClosableSpinner(Context context, AttributeSet attrs) {
 		super(context, attrs);
 	}

app/src/main/java/no/nordicsemi/android/nrftoolbox/widget/DividerItemDecoration.java

@@ -27,8 +27,8 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class DividerItemDecoration extends RecyclerView.ItemDecoration {

app/src/main/java/no/nordicsemi/android/nrftoolbox/widget/ForegroundLinearLayout.java

@@ -30,7 +30,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.NinePatchDrawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/widget/ForegroundRelativeLayout.java

@@ -30,7 +30,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.NinePatchDrawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/widget/TrebuchetBoldTextView.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2015, Nordic Semiconductor
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package no.nordicsemi.android.nrftoolbox.widget;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.util.AttributeSet;
-
-import no.nordicsemi.android.nrftoolbox.R;
-
-public class TrebuchetBoldTextView extends android.support.v7.widget.AppCompatTextView {
-
-	public TrebuchetBoldTextView(Context context) {
-		super(context);
-
-		init();
-	}
-
-	public TrebuchetBoldTextView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-
-		init();
-	}
-
-	public TrebuchetBoldTextView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-
-		init();
-	}
-
-	private void init() {
-		if (!isInEditMode()) {
-			final Typeface typeface = Typeface.createFromAsset(getContext().getAssets(), getContext().getString(R.string.font_path));
-			setTypeface(typeface);
-		}
-	}
-}

app/src/main/java/no/nordicsemi/android/nrftoolbox/widget/TrebuchetTextView.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2015, Nordic Semiconductor
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package no.nordicsemi.android.nrftoolbox.widget;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.util.AttributeSet;
-
-import no.nordicsemi.android.nrftoolbox.R;
-
-public class TrebuchetTextView extends android.support.v7.widget.AppCompatTextView {
-
-	public TrebuchetTextView(Context context) {
-		super(context);
-
-		init();
-	}
-
-	public TrebuchetTextView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-
-		init();
-	}
-
-	public TrebuchetTextView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-
-		init();
-	}
-
-	private void init() {
-		if (!isInEditMode()) {
-			final Typeface typeface = Typeface.createFromAsset(getContext().getAssets(), getContext().getString(R.string.normal_font_path));
-			setTypeface(typeface);
-		}
-	}
-}

app/src/main/res/color/button_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/nordicLake" android:state_enabled="true"/>
+    <item android:color="#c4cbcc"/>
+</selector>

app/src/main/res/drawable-v21/ic_feature_bg.xml

@@ -21,13 +21,13 @@
   ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#0081b7" >
+    android:color="@color/featurePressedColor" >
 
     <item>
         <shape xmlns:android="http://schemas.android.com/apk/res/android" >
             <corners android:radius="10dp" />
 
-            <solid android:color="#FF0099da" />
+            <solid android:color="@color/featureColor" />
             
             <size android:width="24dp" android:height="24dp"/>
         </shape>

app/src/main/res/drawable/ic_feature_bg_n.xml

@@ -23,5 +23,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="10dp"/>
     
-    <solid android:color="#0099da"/>
+    <solid android:color="@color/featureColor"/>
 </shape>

app/src/main/res/drawable/ic_feature_bg_p.xml

@@ -23,5 +23,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="10dp"/>
     
-    <solid android:color="#0081b7"/>
+    <solid android:color="@color/featurePressedColor"/>
 </shape>

app/src/main/res/drawable/ic_feature_small_bg_n.xml

@@ -23,7 +23,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="3dp"/>
     
-    <solid android:color="#0099da"/>
+    <solid android:color="@color/nordicBlue"/>
     
     <size android:width="24dp" android:height="24dp"/>
 </shape>

app/src/main/res/drawable/ic_feature_small_bg_p.xml

@@ -23,7 +23,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="3dp"/>
     
-    <solid android:color="#0081b7"/>
+    <solid android:color="@color/nordicBlueDark"/>
     
     <size android:width="24dp" android:height="24dp"/>
 </shape>

app/src/main/res/drawable/nordic_logo.xml

@@ -0,0 +1,142 @@
+<!--
+  ~ Copyright (c) 2018, Nordic Semiconductor
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  ~
+  ~ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  ~
+  ~ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+  ~ documentation and/or other materials provided with the distribution.
+  ~
+  ~ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
+  ~ software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+  ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="600dp"
+    android:height="440dp"
+    android:viewportHeight="440"
+    android:viewportWidth="597">
+    <path
+        android:name="background"
+        android:fillColor="@color/colorNordicLogoBottom"
+        android:pathData="M0,26L600,370L600,440L0,440Z"/>
+    <path
+        android:name="top_triangle"
+        android:fillAlpha="0.6"
+        android:fillColor="@color/colorNordicLogo"
+        android:pathData="M317.186,167.257c0,0 -0.1,0 -0.1,0.1c-0.2,0.1 -0.3,0.2 -0.5,0.2L301.086,176.457l18,10.4V166.857C318.486,166.857 317.786,167.057 317.186,167.257z"
+        android:strokeAlpha="0.6"/>
+    <path
+        android:name="bottom_triangle"
+        android:fillAlpha="0.8"
+        android:fillColor="@color/colorNordicLogo"
+        android:pathData="M285.486,229.957l16.4,-9.5l-18,-10.4l0,20.3C284.386,230.457 284.886,230.257 285.486,229.957z"
+        android:strokeAlpha="0.8"/>
+    <path
+        android:name="bottom_half"
+        android:fillAlpha="0.5"
+        android:fillColor="@color/colorNordicLogo"
+        android:pathData="M337.486,219.357L300.586,198.057l0,0l-1.7,-1L265.586,177.757c-0.2,0.6 -0.4,1.2 -0.4,1.9c0,0.1 0,0.3 0,0.4v38.2c0,1.2 0.7,2.3 1.7,2.9l15.2,8.9c0.5,0.3 1.1,0.4 1.7,0.4l0,-19.5l0,-0.8L318.286,230.057c0.1,0.1 0.2,0.1 0.3,0.1c0,0 0.1,0 0.1,0c1,0.4 1.8,0.1 2.7,-0.5l5.8,-3.3l9.2,-5.5C336.886,220.557 337.286,219.957 337.486,219.357z"
+        android:strokeAlpha="0.5"/>
+    <path
+        android:name="top_half"
+        android:fillColor="@color/colorNordicLogo"
+        android:pathData="M337.686,194.157V179.657c0,-1.9 -1,-3.6 -2.6,-4.5L321.686,167.457C320.886,167.057 319.986,166.857 319.086,166.857v20.1L288.986,169.457l-3.4,-1.9c-1.5,-0.8 -2.8,-0.9 -4.3,-0.2c0,0 -0.1,0 -0.1,0.1c-0.2,0.1 -0.3,0.2 -0.5,0.3l-5.3,3.1l-7.6,4.4c0,0 0,0 0,0c-1,0.6 -1.8,1.5 -2.3,2.6c0,0 33.3,19.2 33.3,19.2l1.7,1l0,0l36.9,21.3c0.2,-0.7 0.2,-1.9 0.2,-1.9V194.157z"/>
+    <path
+        android:name="N"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M255.286,272.957l-4.1,0L239.286,256.357h0l0,16.7l-4.4,0l0,-24.3l4.1,0l11.8,16.7h0l0,-16.7l4.4,0L255.286,272.957z"/>
+    <path
+        android:name="O"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M285.086,260.857c0,7.5 -5.5,12.7 -12.7,12.7c-7.2,0 -12.7,-5.1 -12.7,-12.7c0,-7.5 5.5,-12.7 12.7,-12.7C279.586,248.157 285.086,253.357 285.086,260.857zM264.586,260.857c0,4.8 3.3,8.1 7.8,8.1c4.6,0 7.8,-3.3 7.8,-8.1c0,-4.8 -3.3,-8.1 -7.8,-8.1C267.886,252.757 264.586,256.057 264.586,260.857z"/>
+    <path
+        android:name="R"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M295.986,263.257l-1.7,0l0,9.7l-4.4,0l0,-24.3l8.9,0c4.8,0 7.8,3 7.8,7.4c0,3.6 -2.1,6.3 -5.7,7l7.2,9.9l-5.6,0L295.986,263.257zM294.386,259.357l3.8,0c2.6,0 3.8,-1.2 3.8,-3.3c0,-2 -1.2,-3.3 -3.8,-3.3l-3.8,0L294.386,259.357z"/>
+    <path
+        android:name="D"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M332.386,260.857c0,7.6 -5.3,12.1 -12.6,12.1l-7.8,0l0,-24.3l7.8,0C327.086,248.657 332.386,253.257 332.386,260.857zM316.486,252.757l0,16.1l3.5,0c4.4,0 7.6,-2.8 7.6,-8s-3.3,-8 -7.6,-8L316.486,252.757z"/>
+    <path
+        android:name="I"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M341.586,272.957l-4.5,0l0,-24.3l4.5,0L341.586,272.957z"/>
+    <path
+        android:name="C"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M346.386,260.857c0,-7.7 5.4,-12.7 13.1,-12.7c3.7,0 6.5,1.1 8.7,2.7l-2.6,3.9c-1.5,-1 -3.5,-2 -6.1,-2c-4.7,0 -8.2,3.2 -8.2,8.1c0,5 3.5,8.1 8.2,8.1c2.6,0 4.6,-1 6.1,-2l2.6,3.9c-2.2,1.5 -4.9,2.7 -8.7,2.7C351.886,273.457 346.386,268.457 346.386,260.857z"/>
+    <path
+        android:name="s"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M234.286,287.657l0.7,-1.5c0.7,0.4 1.6,0.8 2.4,0.8c0.8,0 1.3,-0.4 1.3,-0.9c0,-0.5 -0.3,-0.8 -0.9,-1.2l-1.5,-1c-1,-0.7 -1.4,-1.4 -1.4,-2.4c0,-1.4 1,-2.3 2.7,-2.3c0.9,0 1.8,0.2 2.6,0.6l-0.7,1.5c-0.7,-0.3 -1.3,-0.6 -1.9,-0.6c-0.7,0 -0.9,0.3 -0.9,0.7c0,0.3 0.2,0.6 0.7,0.9l1.6,1.1c1,0.7 1.5,1.4 1.5,2.5c0,1.7 -1.2,2.6 -3.1,2.6C236.186,288.557 235.086,288.257 234.286,287.657"/>
+    <path
+        android:name="e"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M249.486,286.857l0,1.5l-5.4,0l0,-9l5.3,0l0,1.5l-3.7,0l0,1.8h3.4l0,1.5l-3.4,0l0,2.6H249.486z"/>
+    <path
+        android:name="m"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M262.686,288.357h-1.7l-0.9,-5.8h0l-1.7,4.5H257.286l-1.7,-4.5h0l-0.9,5.8h-1.7l1.6,-9h1.2l2,5.1h0l2,-5.1h1.2L262.686,288.357z"/>
+    <path
+        android:name="i"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M267.986,288.357H266.286l0,-9h1.7L267.986,288.357z"/>
+    <path
+        android:name="c"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M271.386,283.857c0,-2.8 2,-4.7 4.9,-4.7c1.4,0 2.4,0.4 3.2,1l-0.9,1.4c-0.6,-0.4 -1.3,-0.7 -2.3,-0.7c-1.7,0 -3,1.2 -3,3c0,1.8 1.3,3 3,3c1,0 1.7,-0.4 2.3,-0.7l0.9,1.4c-0.8,0.6 -1.8,1 -3.2,1C273.386,288.557 271.386,286.757 271.386,283.857z"/>
+    <path
+        android:name="o"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M291.586,283.857c0,2.8 -2,4.7 -4.7,4.7c-2.7,0 -4.7,-1.9 -4.7,-4.7s2,-4.7 4.7,-4.7C289.486,279.157 291.586,281.057 291.586,283.857zM283.986,283.857c0,1.8 1.2,3 2.9,3c1.7,0 2.9,-1.2 2.9,-3c0,-1.8 -1.2,-3 -2.9,-3C285.186,280.857 283.986,282.057 283.986,283.857z"/>
+    <path
+        android:name="n"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M302.586,288.357h-1.5l-4.4,-6.2h0l0,6.2h-1.6l0,-9h1.5l4.4,6.2h0l0,-6.2h1.6L302.586,288.357z"/>
+    <path
+        android:name="d"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M314.186,283.857c0,2.8 -2,4.5 -4.7,4.5l-2.9,0l0,-9l2.9,0C312.186,279.357 314.186,281.057 314.186,283.857zM308.286,280.857l0,6l1.3,0c1.6,0 2.8,-1 2.8,-3c0,-1.9 -1.2,-3 -2.8,-3H308.286z"/>
+    <path
+        android:name="u"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M324.986,284.757c0,2.3 -1.3,3.7 -3.7,3.7c-2.4,0 -3.7,-1.5 -3.7,-3.7l0,-5.4l1.7,0l0,5.3c0,1.3 0.8,2.1 2,2.1c1.2,0 2,-0.8 2,-2.1l0,-5.3l1.7,0L324.986,284.757z"/>
+    <path
+        android:name="c2"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M328.386,283.857c0,-2.8 2,-4.7 4.9,-4.7c1.4,0 2.4,0.4 3.2,1l-0.9,1.4c-0.6,-0.4 -1.3,-0.7 -2.3,-0.7c-1.7,0 -3,1.2 -3,3c0,1.8 1.3,3 3,3c1,0 1.7,-0.4 2.3,-0.7l0.9,1.4c-0.8,0.6 -1.8,1 -3.2,1C330.486,288.557 328.386,286.657 328.386,283.857z"/>
+    <path
+        android:name="t"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M345.686,280.857H343.286l0,7.4l-1.6,0l0,-7.4l-2.5,0v-1.5l6.5,0V280.857z"/>
+    <path
+        android:name="o2"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M357.686,283.857c0,2.8 -2,4.7 -4.7,4.7c-2.7,0 -4.7,-1.9 -4.7,-4.7c0,-2.8 2,-4.7 4.7,-4.7C355.586,279.157 357.686,281.057 357.686,283.857zM350.086,283.857c0,1.8 1.2,3 2.9,3c1.7,0 2.9,-1.2 2.9,-3c0,-1.8 -1.2,-3 -2.9,-3C351.286,280.857 350.086,282.057 350.086,283.857z"/>
+    <path
+        android:name="r"
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M363.286,284.757h-0.6v3.6h-1.6l0,-9l3.3,0c1.8,0 2.9,1.1 2.9,2.7c0,1.3 -0.8,2.3 -2.1,2.6l2.7,3.7h-2.1L363.286,284.757zM362.686,283.357h1.4c0.9,0 1.4,-0.4 1.4,-1.2c0,-0.7 -0.4,-1.2 -1.4,-1.2h-1.4L362.686,283.357z"/>
+    <path
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M373.186,251.657v1.3h-0.2l0,-2.8l1.2,0c0.5,0 0.9,0.2 0.9,0.7c0,0.3 -0.1,0.6 -0.5,0.7c0.2,0.1 0.5,0.2 0.5,0.7v0.1c0,0.2 0,0.5 0,0.6h-0.3c0,-0.1 0,-0.4 0,-0.6v-0.1c0,-0.5 -0.2,-0.6 -0.7,-0.6H373.186zM373.186,251.457h0.9c0.5,0 0.7,-0.2 0.7,-0.6c0,-0.3 -0.3,-0.5 -0.7,-0.5h-0.9V251.457z"/>
+    <path
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M375.186,253.057h-0.4l0,-0.1c0,-0.1 0,-0.3 0,-0.5l0,-0.2c0,-0.4 -0.1,-0.5 -0.7,-0.5H373.286v1.3h-0.4v-3h1.3c0.6,0 1,0.3 1,0.8c0,0.3 -0.1,0.5 -0.4,0.7c0.2,0.1 0.3,0.4 0.3,0.7v0.1C375.086,252.557 375.086,252.857 375.186,253.057L375.186,253.057zM374.886,252.857h0.1c0,-0.1 0,-0.3 0,-0.5v-0.1c0,-0.5 -0.2,-0.6 -0.4,-0.6l-0.3,-0.1l0.3,-0.1c0.3,-0.1 0.5,-0.3 0.5,-0.6c0,-0.6 -0.6,-0.7 -0.9,-0.7h-1.2V252.857h0.1v-1.3h1c0.5,0 0.8,0.1 0.8,0.7l0,0.2C374.886,252.657 374.886,252.757 374.886,252.857zM374.086,251.557h-1v-1.2h1c0.7,0 0.8,0.3 0.8,0.6C374.886,251.357 374.586,251.557 374.086,251.557zM373.286,251.357l0.8,0c0.6,0 0.7,-0.3 0.7,-0.5c0,-0.1 0,-0.4 -0.7,-0.4H373.286V251.357z"/>
+    <path
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M373.986,254.157c-1.5,0 -2.7,-1.2 -2.7,-2.7c0,-1.5 1.2,-2.7 2.7,-2.7c1.5,0 2.7,1.2 2.7,2.7C376.586,252.957 375.386,254.157 373.986,254.157zM373.986,249.157c-1.3,0 -2.4,1.1 -2.4,2.4c0,1.3 1.1,2.4 2.4,2.4c1.3,0 2.4,-1.1 2.4,-2.4C376.386,250.157 375.286,249.157 373.986,249.157z"/>
+    <path
+        android:fillColor="@color/colorNordicLogoText"
+        android:pathData="M373.986,254.257c-1.5,0 -2.7,-1.2 -2.7,-2.7c0,-1.5 1.2,-2.7 2.7,-2.7c1.5,0 2.7,1.2 2.7,2.7C376.686,253.057 375.486,254.257 373.986,254.257zM373.986,248.957c-1.4,0 -2.6,1.2 -2.6,2.6c0,1.4 1.2,2.6 2.6,2.6c1.4,0 2.6,-1.2 2.6,-2.6C376.486,250.057 375.386,248.957 373.986,248.957zM373.986,253.957c-1.4,0 -2.5,-1.1 -2.5,-2.5c0,-1.4 1.1,-2.5 2.5,-2.5c1.4,0 2.5,1.1 2.5,2.5C376.486,252.857 375.286,253.957 373.986,253.957zM373.986,249.157c-1.3,0 -2.3,1 -2.3,2.3c0,1.3 1,2.3 2.3,2.3c1.3,0 2.3,-1 2.3,-2.3S375.286,249.157 373.986,249.157z"/>
+</vector>

app/src/main/res/drawable/nordic_logo_horiz_white.xml

@@ -0,0 +1,31 @@
+<vector android:height="54dp" android:viewportHeight="62.67"
+    android:viewportWidth="233" android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFF" android:pathData="M117.62,51.42l-1.67,0l-0.88,-5.84h-0.03l-1.72,4.49h-1.2l-1.72,-4.49h-0.03l-0.89,5.84l-1.67,0l1.62,-9.04h1.22l2.04,5.11h0.03l2.05,-5.11H116L117.62,51.42z"/>
+    <path android:fillColor="#FFFF" android:pathData="M110.13,35.94l-4.15,0L94.11,19.19h-0.03l0,16.75l-4.47,0l0,-24.42l4.15,0l11.86,16.78h0.04l0,-16.78l4.47,0L110.13,35.94z"/>
+    <path android:fillColor="#FFFF" android:pathData="M140.18,23.72c0,7.57 -5.55,12.74 -12.81,12.74c-7.26,0 -12.77,-5.16 -12.77,-12.74s5.51,-12.74 12.77,-12.74S140.18,16.15 140.18,23.72zM119.49,23.72c0,4.85 3.31,8.16 7.89,8.16c4.61,0 7.89,-3.31 7.89,-8.16c0,-4.85 -3.28,-8.16 -7.89,-8.16C122.81,15.56 119.49,18.87 119.49,23.72z"/>
+    <path android:fillColor="#FFFF" android:pathData="M151.15,26.2l-1.67,0l0,9.73l-4.47,0l0,-24.42l9,0c4.85,0 7.89,3 7.89,7.4c0,3.63 -2.13,6.35 -5.72,7.08l7.22,9.94l-5.62,0L151.15,26.2zM149.48,22.26l3.84,0c2.58,0 3.8,-1.22 3.8,-3.28c0,-1.99 -1.22,-3.35 -3.8,-3.35l-3.84,0L149.48,22.26z"/>
+    <path android:fillColor="#FFFF" android:pathData="M187.76,23.72c0,7.61 -5.34,12.21 -12.7,12.21l-7.82,0l0,-24.42l7.82,0C182.42,11.51 187.76,16.12 187.76,23.72zM171.71,15.63l0,16.19l3.56,0c4.4,0 7.68,-2.83 7.68,-8.09c0,-5.27 -3.28,-8.09 -7.68,-8.09L171.71,15.63z"/>
+    <path android:fillColor="#FFFF" android:pathData="M197,35.94l-4.5,0l0,-24.42l4.5,0L197,35.94z"/>
+    <path android:fillColor="#FFFF" android:pathData="M201.82,23.72c0,-7.71 5.48,-12.74 13.19,-12.74c3.77,0 6.52,1.15 8.72,2.69l-2.58,3.91c-1.5,-1.05 -3.56,-2.02 -6.18,-2.02c-4.75,0 -8.27,3.18 -8.27,8.16c0,4.99 3.52,8.16 8.27,8.16c2.62,0 4.68,-0.98 6.18,-2.02l2.58,3.91c-2.2,1.54 -4.95,2.69 -8.72,2.69C207.29,36.46 201.82,31.43 201.82,23.72z"/>
+    <path android:fillColor="#FFFF" android:pathData="M89.04,50.74l0.74,-1.51c0.72,0.43 1.58,0.79 2.44,0.79c0.85,0 1.28,-0.37 1.28,-0.92c0,-0.46 -0.34,-0.77 -0.92,-1.19l-1.46,-1.05c-0.96,-0.66 -1.43,-1.41 -1.43,-2.38c0,-1.41 0.96,-2.3 2.69,-2.3c0.9,0 1.81,0.25 2.65,0.63l-0.71,1.51c-0.68,-0.35 -1.33,-0.56 -1.92,-0.56c-0.68,0 -0.94,0.26 -0.94,0.66c0,0.35 0.21,0.58 0.7,0.93l1.56,1.1c1.01,0.68 1.55,1.41 1.55,2.54c0,1.7 -1.19,2.61 -3.09,2.61C90.99,51.62 89.9,51.27 89.04,50.74"/>
+    <path android:fillColor="#FFFF" android:pathData="M104.3,49.88v1.55l-5.42,0l0,-9.04l5.36,0v1.55l-3.71,0v1.81l3.38,0l0,1.52l-3.38,0v2.61L104.3,49.88z"/>
+    <path android:fillColor="#FFFF" android:pathData="M122.98,51.43l-1.67,0l0,-9.04l1.67,0L122.98,51.43z"/>
+    <path android:fillColor="#FFFF" android:pathData="M122.97,51.43l-1.72,0l0,-9.04l1.72,0L122.97,51.43z"/>
+    <path android:fillColor="#FFFF" android:pathData="M126.32,46.91c0,-2.85 2.03,-4.71 4.88,-4.71c1.39,0 2.42,0.43 3.23,0.99l-0.96,1.45c-0.56,-0.39 -1.32,-0.75 -2.29,-0.75c-1.76,0 -3.06,1.18 -3.06,3.02c0,1.85 1.3,3.02 3.06,3.02c0.97,0 1.73,-0.36 2.29,-0.75l0.96,1.45c-0.81,0.57 -1.83,0.99 -3.23,0.99C128.34,51.62 126.32,49.76 126.32,46.91z"/>
+    <path android:fillColor="#FFFF" android:pathData="M146.67,46.91c0,2.8 -2.05,4.71 -4.74,4.71c-2.69,0 -4.73,-1.91 -4.73,-4.71c0,-2.8 2.04,-4.71 4.73,-4.71C144.62,42.19 146.67,44.11 146.67,46.91zM139.01,46.91c0,1.8 1.23,3.02 2.92,3.02c1.7,0 2.92,-1.23 2.92,-3.02c0,-1.79 -1.21,-3.02 -2.92,-3.02C140.24,43.89 139.01,45.11 139.01,46.91z"/>
+    <path android:fillColor="#FFFF" android:pathData="M157.73,51.43l-1.54,0l-4.39,-6.2h-0.01l0,6.2l-1.65,0l0,-9.04h1.54l4.39,6.21h0.01v-6.21l1.65,0L157.73,51.43z"/>
+    <path android:fillColor="#FFFF" android:pathData="M169.41,46.88c0,2.82 -1.98,4.52 -4.7,4.52l-2.89,0l0,-9.04l2.89,0C167.44,42.36 169.41,44.06 169.41,46.88zM163.47,43.88l0,5.99l1.32,0c1.63,0 2.84,-1.05 2.84,-3c0,-1.95 -1.21,-3 -2.84,-3L163.47,43.88z"/>
+    <path android:fillColor="#FFFF" android:pathData="M180.31,47.83c0,2.29 -1.36,3.75 -3.72,3.75c-2.38,0 -3.73,-1.46 -3.73,-3.75v-5.48l1.74,0l0,5.37c0,1.3 0.77,2.14 1.99,2.14c1.2,0 1.98,-0.84 1.98,-2.14v-5.37l1.74,0V47.83z"/>
+    <path android:fillColor="#FFFF" android:pathData="M183.74,46.88c0,-2.85 2.03,-4.71 4.88,-4.71c1.39,0 2.42,0.43 3.23,0.99l-0.96,1.45c-0.56,-0.39 -1.32,-0.75 -2.29,-0.75c-1.76,0 -3.06,1.18 -3.06,3.02c0,1.85 1.3,3.02 3.06,3.02c0.97,0 1.73,-0.36 2.29,-0.75l0.96,1.45c-0.81,0.57 -1.83,0.99 -3.23,0.99C185.77,51.59 183.74,49.73 183.74,46.88z"/>
+    <path android:fillColor="#FFFF" android:pathData="M201.13,43.91l-2.47,0v7.49l-1.65,0l0,-7.49h-2.47v-1.55l6.59,0V43.91z"/>
+    <path android:fillColor="#FFFF" android:pathData="M213.14,46.88c0,2.8 -2.05,4.71 -4.74,4.71c-2.69,0 -4.73,-1.91 -4.73,-4.71c0,-2.8 2.04,-4.71 4.73,-4.71C211.08,42.16 213.14,44.08 213.14,46.88zM205.48,46.88c0,1.8 1.23,3.02 2.92,3.02c1.7,0 2.92,-1.23 2.92,-3.02c0,-1.79 -1.21,-3.02 -2.92,-3.02C206.7,43.86 205.48,45.08 205.48,46.88z"/>
+    <path android:fillColor="#FFFF" android:pathData="M218.79,47.8l-0.62,0v3.6l-1.65,0l0,-9.04l3.33,0c1.8,0 2.92,1.11 2.92,2.74c0,1.34 -0.79,2.35 -2.12,2.62l2.67,3.68l-2.08,0L218.79,47.8zM218.17,46.34h1.42c0.96,0 1.41,-0.45 1.41,-1.21c0,-0.74 -0.45,-1.24 -1.41,-1.24l-1.42,0L218.17,46.34z"/>
+    <path android:fillColor="#FFFF" android:pathData="M228.74,14.53v1.28l-0.24,0l0,-2.82l1.24,0c0.54,0 0.94,0.24 0.94,0.75c0,0.33 -0.15,0.58 -0.53,0.67c0.22,0.06 0.45,0.21 0.45,0.7v0.11c0,0.23 0,0.48 0.03,0.59h-0.25c-0.04,-0.12 -0.03,-0.36 -0.03,-0.56v-0.09c0,-0.49 -0.19,-0.62 -0.73,-0.62L228.74,14.53zM228.74,14.3l0.93,0c0.5,0 0.75,-0.17 0.75,-0.56c0,-0.35 -0.25,-0.52 -0.73,-0.52l-0.95,0V14.3z"/>
+    <path android:fillColor="#FFFF" android:pathData="M230.73,15.88l-0.41,0l-0.02,-0.05c-0.04,-0.11 -0.03,-0.29 -0.03,-0.47l0,-0.21c0,-0.43 -0.14,-0.55 -0.65,-0.55l-0.8,0v1.28h-0.4v-2.97l1.32,0c0.63,0 1.01,0.31 1.01,0.82c0,0.32 -0.13,0.55 -0.39,0.68c0.21,0.13 0.32,0.36 0.32,0.69v0.11c0,0.22 0,0.47 0.03,0.57L230.73,15.88zM230.44,15.73h0.1c-0.02,-0.13 -0.02,-0.32 -0.02,-0.51v-0.11c0,-0.47 -0.23,-0.58 -0.4,-0.62l-0.3,-0.08l0.3,-0.07c0.32,-0.08 0.47,-0.27 0.47,-0.6c0,-0.6 -0.6,-0.67 -0.86,-0.67l-1.17,0v2.67h0.09v-1.28l0.96,0c0.51,0 0.81,0.11 0.81,0.7l0,0.21C230.42,15.49 230.42,15.64 230.44,15.73zM229.67,14.38l-1,0v-1.23l1.02,0c0.67,0 0.81,0.32 0.81,0.6C230.49,14.16 230.21,14.38 229.67,14.38zM228.81,14.22l0.85,0c0.6,0 0.67,-0.26 0.67,-0.48c0,-0.11 0,-0.44 -0.65,-0.44l-0.87,0V14.22z"/>
+    <path android:fillColor="#FFFF" android:pathData="M229.53,17.02c-1.47,0 -2.67,-1.2 -2.67,-2.67c0,-1.47 1.2,-2.67 2.67,-2.67c1.47,0 2.67,1.2 2.67,2.67C232.2,15.83 231.01,17.02 229.53,17.02zM229.53,11.93c-1.34,0 -2.42,1.09 -2.42,2.42c0,1.34 1.09,2.42 2.42,2.42c1.34,0 2.42,-1.09 2.42,-2.42C231.96,13.02 230.87,11.93 229.53,11.93z"/>
+    <path android:fillColor="#FFFF" android:pathData="M229.53,17.1c-1.51,0 -2.75,-1.23 -2.75,-2.75s1.23,-2.75 2.75,-2.75c1.51,0 2.75,1.23 2.75,2.75S231.05,17.1 229.53,17.1zM229.53,11.76c-1.43,0 -2.6,1.16 -2.6,2.59s1.16,2.59 2.6,2.59c1.43,0 2.6,-1.16 2.6,-2.59S230.96,11.76 229.53,11.76zM229.53,16.85c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5c1.38,0 2.5,1.12 2.5,2.5C232.03,15.73 230.91,16.85 229.53,16.85zM229.53,12c-1.29,0 -2.35,1.05 -2.35,2.35c0,1.29 1.05,2.35 2.35,2.35c1.29,0 2.35,-1.05 2.35,-2.35S230.83,12 229.53,12z"/>
+    <path android:fillColor="#FFFF" android:fillAlpha=".6" android:pathData="M50.98,0.95c-0.04,0.02 -0.08,0.04 -0.12,0.06c-0.16,0.07 -0.31,0.15 -0.46,0.23L35.45,9.88l17.41,10.1V0.55C52.22,0.56 51.58,0.7 50.98,0.95z"/>
+    <path android:fillColor="#FFFF" android:fillAlpha=".8" android:pathData="M20.31,61.6l15.83,-9.15L18.71,42.41l0.01,19.64C19.29,62.07 19.82,61.89 20.31,61.6z"/>
+    <path android:fillColor="#FFFF" android:fillAlpha=".5" android:pathData="M70.66,51.29L34.95,30.67l0,0l-1.68,-0.97L1.1,11.14c-0.23,0.57 -0.36,1.18 -0.36,1.81c0,0.14 0,0.28 0,0.42v36.89c0,1.17 0.64,2.25 1.66,2.81l14.69,8.58c0.51,0.28 1.07,0.41 1.63,0.4l-0.01,-18.9l0,-0.74l33.33,19.2c0.1,0.05 0.2,0.1 0.3,0.14c0.03,0.01 0.06,0.03 0.09,0.04c0.96,0.37 1.76,0.08 2.64,-0.48l5.58,-3.17l8.9,-5.31C70.07,52.44 70.45,51.9 70.66,51.29z"/>
+    <path android:fillColor="#FFFF" android:pathData="M70.83,26.96V12.97c0,-1.79 -0.98,-3.44 -2.55,-4.3l-12.92,-7.5c-0.78,-0.43 -1.65,-0.63 -2.51,-0.62v19.43L23.71,3.07l-3.24,-1.82c-1.41,-0.79 -2.67,-0.85 -4.12,-0.19c-0.04,0.02 -0.07,0.04 -0.11,0.06c-0.17,0.08 -0.33,0.17 -0.49,0.27l-5.12,2.98L3.28,8.64c0,0.02 0,0 0,0c-1.01,0.55 -1.76,1.47 -2.18,2.5C1.14,11.16 33.27,29.7 33.27,29.7l1.68,0.97l0,0l35.71,20.62c0.18,-0.66 0.18,-1.88 0.18,-1.88V26.96z"/>
+</vector>

app/src/main/res/layout-land/activity_feature_bpm.xml

@@ -37,14 +37,14 @@
 
 		<!-- The size of text below must be fixed, therefore dp are used instead of sp -->
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
 			android:layout_marginLeft="@dimen/bpm_feature_title_long_margin"
 			android:rotation="270"
 			android:text="@string/bpm_feature_title_long"
-			android:textColor="@color/darkGray"
+			android:textColor="@color/verticalTitleColor"
 			android:textSize="32dp"
 			android:textStyle="bold"/>
 
@@ -62,7 +62,7 @@
 			android:textColor="#FFFFFF"
 			android:textSize="12sp"/>
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/device_name"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
 				android:layout_weight="1"
 				android:orientation="vertical">
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					style="@style/Widget.ListTitle"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -112,14 +112,14 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="0dp"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
 							android:gravity="center_vertical"
 							android:text="@string/bpm_systolic"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/systolic"
 							android:layout_width="wrap_content"
 							android:layout_height="match_parent"
@@ -128,7 +128,7 @@
 							android:text="@string/not_available_value"
 							android:textSize="32sp"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/systolic_unit"
 							android:layout_width="45dp"
 							android:layout_height="match_parent"
@@ -141,14 +141,14 @@
 						android:layout_height="wrap_content"
 						android:layout_marginTop="4dp">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="0dp"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
 							android:gravity="center_vertical"
 							android:text="@string/bpm_diastolic"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/diastolic"
 							android:layout_width="wrap_content"
 							android:layout_height="match_parent"
@@ -157,7 +157,7 @@
 							android:text="@string/not_available_value"
 							android:textSize="32sp"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/diastolic_unit"
 							android:layout_width="45dp"
 							android:layout_height="match_parent"
@@ -170,14 +170,14 @@
 						android:layout_height="wrap_content"
 						android:layout_marginTop="4dp">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="0dp"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
 							android:gravity="center_vertical"
 							android:text="@string/bpm_mean_ap"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/mean_ap"
 							android:layout_width="wrap_content"
 							android:layout_height="match_parent"
@@ -186,7 +186,7 @@
 							android:text="@string/not_available_value"
 							android:textSize="32sp"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/mean_ap_unit"
 							android:layout_width="45dp"
 							android:layout_height="match_parent"
@@ -215,7 +215,7 @@
 					android:layout_marginTop="@dimen/feature_vertical_margin_top"
 					android:orientation="vertical">
 
-					<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+					<androidx.appcompat.widget.AppCompatTextView
 						style="@style/Widget.ListTitle"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
@@ -227,14 +227,14 @@
 						android:orientation="horizontal"
 						android:padding="@dimen/feature_section_padding">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="0dp"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
 							android:gravity="center_vertical"
 							android:text="@string/bpm_pulse"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/pulse"
 							android:layout_width="wrap_content"
 							android:layout_height="match_parent"
@@ -243,7 +243,7 @@
 							android:text="@string/not_available_value"
 							android:textSize="32sp"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="45dp"
 							android:layout_height="match_parent"
 							android:gravity="bottom"
@@ -264,13 +264,13 @@
 					android:layout_marginTop="15dp"
 					android:orientation="vertical">
 
-					<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+					<androidx.appcompat.widget.AppCompatTextView
 						style="@style/Widget.ListTitle"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:text="@string/bpm_section_timestamp_header"/>
 
-					<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+					<androidx.appcompat.widget.AppCompatTextView
 						android:id="@+id/timestamp"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
@@ -283,7 +283,7 @@
 			</LinearLayout>
 		</LinearLayout>
 
-		<Button
+		<com.google.android.material.button.MaterialButton
 			android:id="@+id/action_connect"
 			style="@style/Widget.Connect"
 			android:layout_width="wrap_content"
@@ -294,13 +294,5 @@
 			android:onClick="onConnectClicked"
 			android:text="@string/action_connect"/>
 
-		<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>

app/src/main/res/layout-land/activity_feature_cgms.xml

@@ -37,14 +37,14 @@
 
         <!-- The size of text below must be fixed, therefore dp are used instead of sp -->
 
-        <no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="@dimen/cgms_feature_title_long_margin"
             android:rotation="270"
             android:text="@string/cgms_feature_title_long"
-            android:textColor="@color/darkGray"
+            android:textColor="@color/verticalTitleColor"
             android:textSize="32dp"
             android:textStyle="bold"/>
 
@@ -62,7 +62,7 @@
             android:textColor="#FFFFFF"
             android:textSize="12sp"/>
 
-        <no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/device_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -103,13 +103,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         style="@style/Widget.ListTitle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/gls_section_data"/>
 
-                    <no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/unit"
                         style="@style/Widget.ListTitle"
                         android:layout_width="wrap_content"
@@ -146,7 +146,7 @@
                 android:layout_marginTop="@dimen/feature_vertical_margin_top"
                 android:orientation="vertical">
 
-                <no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     style="@style/Widget.ListTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -160,25 +160,25 @@
                     android:gravity="center_horizontal"
                     android:orientation="vertical">
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
+                        style="@style/Widget.MaterialComponents.Button.TextButton"
                         android:id="@+id/action_all"
-                        style="?android:attr/buttonBarButtonStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:minWidth="0dp"
                         android:text="@string/gls_action_all"/>
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
+                        style="@style/Widget.MaterialComponents.Button.TextButton"
                         android:id="@+id/action_last"
-                        style="?android:attr/buttonBarButtonStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:minWidth="0dp"
                         android:text="@string/gls_action_last"/>
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
+                        style="@style/Widget.MaterialComponents.Button.TextButton"
                         android:id="@+id/action_more"
-                        style="?android:attr/buttonBarButtonStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:minWidth="0dp"
@@ -205,7 +205,7 @@
             </LinearLayout>
         </LinearLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/action_connect"
             style="@style/Widget.Connect"
             android:layout_width="wrap_content"
@@ -216,13 +216,5 @@
             android:onClick="onConnectClicked"
             android:text="@string/action_connect"/>
 
-        <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>

app/src/main/res/layout-land/activity_feature_csc.xml

@@ -37,14 +37,14 @@
 
 		<!-- The size of text below must be fixed, therefore dp are used instead of sp -->
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
 			android:layout_marginLeft="@dimen/csc_feature_title_long_margin"
 			android:rotation="270"
 			android:text="@string/csc_feature_title_long"
-			android:textColor="@color/darkGray"
+			android:textColor="@color/verticalTitleColor"
 			android:textSize="32dp"
 			android:textStyle="bold"/>
 
@@ -62,7 +62,7 @@
 			android:textColor="#FFFFFF"
 			android:textSize="12sp"/>
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/device_name"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
 				android:layout_weight="1"
 				android:orientation="vertical">
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					style="@style/Widget.ListTitle"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -113,14 +113,14 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="0dp"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
 							android:gravity="center_vertical"
 							android:text="@string/csc_speed"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/speed"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
 							android:text="@string/not_available_value"
 							android:textSize="36sp"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/speed_unit"
 							android:layout_width="45dp"
 							android:layout_height="match_parent"
@@ -142,14 +142,14 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="0dp"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
 							android:gravity="center_vertical"
 							android:text="@string/csc_cadence"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/cadence"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -158,7 +158,7 @@
 							android:text="@string/not_available_value"
 							android:textSize="36sp"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="45dp"
 							android:layout_height="match_parent"
 							android:freezesText="true"
@@ -170,14 +170,14 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="0dp"
 							android:layout_height="match_parent"
 							android:layout_weight="1"
 							android:gravity="center_vertical"
 							android:text="@string/csc_distance"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/distance"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -186,7 +186,7 @@
 							android:text="@string/not_available_value"
 							android:textSize="36sp"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/distance_unit"
 							android:layout_width="45dp"
 							android:layout_height="match_parent"
@@ -214,7 +214,7 @@
 					android:layout_marginTop="@dimen/feature_vertical_margin_top"
 					android:orientation="vertical">
 
-					<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+					<androidx.appcompat.widget.AppCompatTextView
 						style="@style/Widget.ListTitle"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
@@ -229,14 +229,14 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content">
 
-							<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+							<androidx.appcompat.widget.AppCompatTextView
 								android:layout_width="0dp"
 								android:layout_height="match_parent"
 								android:layout_weight="1"
 								android:gravity="center_vertical"
 								android:text="@string/csc_total_distance"/>
 
-							<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+							<androidx.appcompat.widget.AppCompatTextView
 								android:id="@+id/distance_total"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
@@ -245,7 +245,7 @@
 								android:text="@string/not_available_value"
 								android:textSize="36sp"/>
 
-							<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+							<androidx.appcompat.widget.AppCompatTextView
 								android:id="@+id/distance_total_unit"
 								android:layout_width="45dp"
 								android:layout_height="match_parent"
@@ -258,14 +258,14 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content">
 
-							<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+							<androidx.appcompat.widget.AppCompatTextView
 								android:layout_width="0dp"
 								android:layout_height="match_parent"
 								android:layout_weight="1"
 								android:gravity="center_vertical"
 								android:text="@string/csc_gear_ratio"/>
 
-							<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+							<androidx.appcompat.widget.AppCompatTextView
 								android:id="@+id/ratio"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
@@ -280,7 +280,7 @@
 			</LinearLayout>
 		</LinearLayout>
 
-		<Button
+		<com.google.android.material.button.MaterialButton
 			android:id="@+id/action_connect"
 			style="@style/Widget.Connect"
 			android:layout_width="wrap_content"
@@ -291,13 +291,5 @@
 			android:onClick="onConnectClicked"
 			android:text="@string/action_connect"/>
 
-		<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>

app/src/main/res/layout-land/activity_feature_dfu.xml

@@ -21,6 +21,7 @@
   ~ 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"
@@ -38,18 +39,18 @@
 
 		<!-- The size of text below must be fixed, therefore dp are used instead of sp -->
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
 			android:layout_marginLeft="@dimen/dfu_feature_title_long_margin"
 			android:rotation="270"
 			android:text="@string/dfu_feature_title_long"
-			android:textColor="@color/darkGray"
+			android:textColor="@color/verticalTitleColor"
 			android:textSize="32dp"
 			android:textStyle="bold"/>
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/device_name"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -85,7 +86,7 @@
 				android:layout_weight="1"
 				android:orientation="vertical">
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					style="@style/Widget.ListTitle"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -100,12 +101,12 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:text="@string/dfu_file_name_label"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/file_name"
 							android:layout_width="0dp"
 							android:layout_height="wrap_content"
@@ -120,12 +121,12 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:text="@string/dfu_file_type_label"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/file_type"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -137,12 +138,12 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:text="@string/dfu_file_scope_label"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/file_scope"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -154,12 +155,12 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:text="@string/dfu_file_size_label"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/file_size"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -171,12 +172,12 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:text="@string/dfu_file_status_label"/>
 
-						<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+						<androidx.appcompat.widget.AppCompatTextView
 							android:id="@+id/file_status"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -194,12 +195,13 @@
 					android:orientation="horizontal"
 					android:paddingLeft="42dp">
 
-					<Button
+					<com.google.android.material.button.MaterialButton
 						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/nordicLake"/>
 
 					<ImageView
 						android:layout_width="wrap_content"
@@ -224,22 +226,23 @@
 				android:layout_weight="1"
 				android:orientation="vertical">
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					style="@style/Widget.ListTitle"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:text="@string/dfu_section_dfu_header"/>
 
-				<Button
+				<com.google.android.material.button.MaterialButton
 					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"/>
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					android:id="@+id/textviewUploading"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -256,7 +259,7 @@
 					android:max="100"
 					android:visibility="invisible"/>
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					android:id="@+id/textviewProgress"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -275,7 +278,7 @@
 			android:text="@string/dfu_lib_version"
 			android:textSize="12dp"/>
 
-		<Button
+		<com.google.android.material.button.MaterialButton
 			android:id="@+id/action_connect"
 			style="@style/Widget.Connect"
 			android:layout_width="wrap_content"
@@ -286,13 +289,5 @@
 			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>

app/src/main/res/layout-land/activity_feature_gls.xml

@@ -37,14 +37,14 @@
 
 		<!-- The size of text below must be fixed, therefore dp are used instead of sp -->
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
 			android:layout_marginLeft="@dimen/gls_feature_title_long_margin"
 			android:rotation="270"
 			android:text="@string/gls_feature_title_long"
-			android:textColor="@color/darkGray"
+			android:textColor="@color/verticalTitleColor"
 			android:textSize="32dp"
 			android:textStyle="bold"/>
 
@@ -62,7 +62,7 @@
 			android:textColor="#FFFFFF"
 			android:textSize="12sp"/>
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/device_name"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -103,13 +103,13 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content">
 
-					<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+					<androidx.appcompat.widget.AppCompatTextView
 						style="@style/Widget.ListTitle"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:text="@string/gls_section_data"/>
 
-					<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+					<androidx.appcompat.widget.AppCompatTextView
 						android:id="@+id/unit"
 						style="@style/Widget.ListTitle"
 						android:layout_width="wrap_content"
@@ -145,7 +145,7 @@
 				android:layout_marginTop="@dimen/feature_vertical_margin_top"
 				android:orientation="vertical">
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					style="@style/Widget.ListTitle"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -159,29 +159,30 @@
 					android:gravity="center_horizontal"
 					android:orientation="vertical">
 
-					<Button
+					<com.google.android.material.button.MaterialButton
+						style="@style/Widget.MaterialComponents.Button.TextButton"
 						android:id="@+id/action_all"
-						style="?android:attr/buttonBarButtonStyle"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:minWidth="0dp"
 						android:text="@string/gls_action_all"/>
 
-					<Button
+					<com.google.android.material.button.MaterialButton
+						style="@style/Widget.MaterialComponents.Button.TextButton"
 						android:id="@+id/action_last"
-						style="?android:attr/buttonBarButtonStyle"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:minWidth="0dp"
 						android:text="@string/gls_action_last"/>
 
-					<Button
+					<com.google.android.material.button.MaterialButton
+						style="@style/Widget.MaterialComponents.Button.TextButton"
 						android:id="@+id/action_more"
-						style="?android:attr/buttonBarButtonStyle"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:minWidth="0dp"
 						android:text="@string/gls_action_more"/>
+
 				</LinearLayout>
 
 				<LinearLayout
@@ -204,7 +205,7 @@
 			</LinearLayout>
 		</LinearLayout>
 
-		<Button
+		<com.google.android.material.button.MaterialButton
 			android:id="@+id/action_connect"
 			style="@style/Widget.Connect"
 			android:layout_width="wrap_content"
@@ -215,13 +216,5 @@
 			android:onClick="onConnectClicked"
 			android:text="@string/action_connect"/>
 
-		<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>

app/src/main/res/layout-land/activity_feature_hrs.xml

@@ -37,14 +37,14 @@
 
 		<!-- The size of text below must be fixed, therefore dp are used instead of sp -->
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
 			android:layout_marginLeft="@dimen/hrs_feature_title_long_margin"
 			android:rotation="270"
 			android:text="@string/hrs_feature_title_long"
-			android:textColor="@color/darkGray"
+			android:textColor="@color/verticalTitleColor"
 			android:textSize="32dp"
 			android:textStyle="bold"/>
 
@@ -62,7 +62,7 @@
 			android:textColor="#FFFFFF"
 			android:textSize="12sp"/>
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/device_name"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
 				android:gravity="right"
 				android:orientation="vertical">
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					android:id="@+id/text_hrs_value"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -104,13 +104,13 @@
 					android:text="@string/not_available_value"
 					android:textSize="45sp"/>
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="@string/hrs_value_unit"
 					android:textSize="16sp"/>
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					android:id="@+id/text_hrs_position"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -120,7 +120,7 @@
 					android:text="@string/not_available"
 					android:textSize="35sp"/>
 
-				<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+				<androidx.appcompat.widget.AppCompatTextView
 					android:id="@+id/text_hrs_position_label"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -138,7 +138,7 @@
 				android:layout_weight="1"/>
 		</LinearLayout>
 
-		<Button
+		<com.google.android.material.button.MaterialButton
 			android:id="@+id/action_connect"
 			style="@style/Widget.Connect"
 			android:layout_width="wrap_content"
@@ -149,13 +149,5 @@
 			android:onClick="onConnectClicked"
 			android:text="@string/action_connect"/>
 
-		<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>

app/src/main/res/layout-land/activity_feature_hts.xml

@@ -37,14 +37,14 @@
 
 		<!-- The size of text below must be fixed, therefore dp are used instead of sp -->
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetBoldTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
 			android:layout_marginLeft="@dimen/hts_feature_title_long_margin"
 			android:rotation="270"
 			android:text="@string/hts_feature_title_long"
-			android:textColor="@color/darkGray"
+			android:textColor="@color/verticalTitleColor"
 			android:textSize="32dp"
 			android:textStyle="bold"/>
 
@@ -62,7 +62,7 @@
 			android:textColor="#FFFFFF"
 			android:textSize="12sp"/>
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/device_name"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
 			android:textAllCaps="true"
 			android:textAppearance="?android:attr/textAppearanceLarge"/>
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/text_hts_value"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
 			android:text="@string/not_available_value"
 			android:textSize="80sp"/>
 
-		<no.nordicsemi.android.nrftoolbox.widget.TrebuchetTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/text_hts_unit"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
 			android:text="@string/hts_unit_celsius"
 			android:textSize="30sp"/>
 
-		<Button
+		<com.google.android.material.button.MaterialButton
 			android:id="@+id/action_connect"
 			style="@style/Widget.Connect"
 			android:layout_width="wrap_content"
@@ -108,13 +108,5 @@
 			android:onClick="onConnectClicked"
 			android:text="@string/action_connect"/>
 
-		<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>