Merge pull request #85 from NordicSemiconductor/improvements/sample-app

philips77 · web-flow · commit 0439d32e2f02 · 2024-08-30T16:31:48.000+02:00
Sample app Improvements
diff --git a/sample/src/main/java/no/nordicsemi/android/log/example/fragment/KeyNameDialogFragment.java b/sample/src/main/java/no/nordicsemi/android/log/example/fragment/KeyNameDialogFragment.java
@@ -32,6 +32,7 @@
 package no.nordicsemi.android.log.example.fragment;
 
 import no.nordicsemi.android.log.example.R;
+
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -48,8 +49,10 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 public class KeyNameDialogFragment extends DialogFragment implements
-		OnEditorActionListener, DialogInterface.OnClickListener {
+		OnEditorActionListener, View.OnClickListener {
 	public static final String RESULT = "session";
 	public static final String RESULT_KEY = "session_key";
 	public static final String RESULT_NAME = "session_name";
@@ -60,24 +63,30 @@ public class KeyNameDialogFragment extends DialogFragment implements
 	@NonNull
 	@Override
 	public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
-		final AlertDialog.Builder builder = new AlertDialog.Builder(requireContext())
+		final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext())
 				.setTitle(R.string.dialog_title)
 				.setNegativeButton(android.R.string.no, null)
-				.setPositiveButton(android.R.string.ok, this);
+				.setPositiveButton(android.R.string.ok, null);
 
 		final View view = getLayoutInflater()
 				.inflate(R.layout.fragment_dialog_key_name, null);
 		mKeyView = view.findViewById(R.id.key);
 		mNameView = view.findViewById(R.id.name);
 		builder.setView(view);
-		return builder.create();
+
+		// Setting onClickListener to a button this way allows to
+		// validate the input.
+		final AlertDialog dialog = builder.create();
+		dialog.show();
+		dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(this);
+		return dialog;
 	}
 
 	/**
 	 * Called when OK button has been pressed.
 	 */
 	@Override
-	public void onClick(final DialogInterface dialog, final int which) {
+	public void onClick(final View v) {
 		// Validate key and name
 		String key = mKeyView.getText().toString().trim();
 		String name = mNameView.getText().toString().trim();
@@ -88,24 +97,20 @@ public void onClick(final DialogInterface dialog, final int which) {
 			mKeyView.setError(getString(R.string.dialog_error));
 		}
 
-		if (TextUtils.isEmpty(name)) {
-			valid = false;
-			mNameView.setError(getString(R.string.dialog_error));
-		}
-
 		if (valid) {
 			final Bundle result = new Bundle();
 			result.putString(KeyNameDialogFragment.RESULT_KEY, key);
 			result.putString(KeyNameDialogFragment.RESULT_NAME, name);
 			getParentFragmentManager().setFragmentResult(KeyNameDialogFragment.RESULT, result);
+			dismiss();
 		}
 	}
 
 	@Override
 	public boolean onEditorAction(final TextView v, final int actionId, final KeyEvent event) {
 		if (EditorInfo.IME_ACTION_DONE == actionId) {
 			// Return input text to activity
-			onClick(null, DialogInterface.BUTTON_POSITIVE);
+			onClick(null);
 			return true;
 		}
 		return false;
diff --git a/sample/src/main/java/no/nordicsemi/android/log/example/fragment/MainFragment.java b/sample/src/main/java/no/nordicsemi/android/log/example/fragment/MainFragment.java
@@ -218,7 +218,7 @@ public void onDestroy() {
 	 * If the nRF Logger application is not installed it will change the "Open in nRF Logger"
 	 * button to "Download nRF Logger".
 	 */
-	private void createLogSession(String key, String name) {
+	private void createLogSession(@NonNull String key, @Nullable String name) {
 		mLogSession = Logger.newSession(requireContext(), key, name);
 
 		// Enable buttons
@@ -230,7 +230,7 @@ private void createLogSession(String key, String name) {
 
 		// The session is null if nRF Logger is not installed
 		if (mLogSession == null) {
-			Toast.makeText(getActivity(), R.string.error_no_nrf_logger, Toast.LENGTH_SHORT).show();
+			Toast.makeText(requireContext(), R.string.error_no_nrf_logger, Toast.LENGTH_SHORT).show();
 			mLogSession = LocalLogSession.newSession(requireContext(), MyLogContentProvider.AUTHORITY_URI, key, name);
 
 			// The button will be used to download the nRF Logger
diff --git a/sample/src/main/res/layout-land/fragment_main.xml b/sample/src/main/res/layout-land/fragment_main.xml
@@ -34,12 +34,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin" >
+    android:paddingBottom="@dimen/activity_vertical_margin">
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/action_create"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -48,60 +48,62 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/field_layout"
+        style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:hint="@string/action_append_hint">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/field"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/log_level_layout"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+            android:layout_weight="1">
 
-            <com.google.android.material.textfield.MaterialAutoCompleteTextView
+            <AutoCompleteTextView
                 android:id="@+id/log_level"
+                style="@style/Widget.Material3.AutoCompleteTextView.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:saveEnabled="false"
-                android:inputType="none"/>
+                android:hint="Level"
+                android:inputType="none"
+                android:saveEnabled="false" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.button.MaterialButton
+        <Button
             android:id="@+id/action_append"
             android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:text="@string/action_append"
-            android:layout_marginLeft="16dp" />
+            android:layout_marginStart="16dp"
+            android:text="@string/action_append" />
     </LinearLayout>
 
     <ListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
         android:layout_marginTop="16dp"
+        android:layout_weight="1"
         android:divider="@null"
-        tools:listitem="@layout/log_item"/>
+        tools:listitem="@layout/log_item" />
 
     <LinearLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/action_open"
diff --git a/sample/src/main/res/layout/fragment_dialog_key_name.xml b/sample/src/main/res/layout/fragment_dialog_key_name.xml
@@ -34,18 +34,23 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="8dp" >
+    android:paddingTop="16dp"
+    android:paddingHorizontal="24dp" >
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/dialog_message" />
 
+    <Space
+        android:layout_width="wrap_content"
+        android:layout_height="16dp" />
+
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/dialog_key"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/key"
@@ -54,11 +59,15 @@
             android:imeOptions="actionNext"/>
     </com.google.android.material.textfield.TextInputLayout>
 
+    <Space
+        android:layout_width="wrap_content"
+        android:layout_height="16dp" />
+
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/dialog_name"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/name"
diff --git a/sample/src/main/res/layout/fragment_main.xml b/sample/src/main/res/layout/fragment_main.xml
@@ -34,12 +34,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin" >
+    android:paddingBottom="@dimen/activity_vertical_margin">
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/action_create"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -48,60 +48,62 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/field_layout"
+        style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:hint="@string/action_append_hint">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/field"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/log_level_layout"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+            android:layout_weight="1">
 
-            <com.google.android.material.textfield.MaterialAutoCompleteTextView
+            <AutoCompleteTextView
                 android:id="@+id/log_level"
+                style="@style/Widget.Material3.AutoCompleteTextView.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:saveEnabled="false"
-                android:inputType="none"/>
+                android:hint="Level"
+                android:inputType="none"
+                android:saveEnabled="false" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.button.MaterialButton
+        <Button
             android:id="@+id/action_append"
             android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:text="@string/action_append"
-            android:layout_marginLeft="16dp" />
+            android:layout_marginStart="16dp"
+            android:text="@string/action_append" />
     </LinearLayout>
 
     <ListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
         android:layout_marginTop="16dp"
+        android:layout_weight="1"
         android:divider="@null"
-        tools:listitem="@layout/log_item"/>
+        tools:listitem="@layout/log_item" />
 
     <LinearLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <Button
             android:id="@+id/action_open"
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
@@ -57,7 +57,7 @@
     <string name="dialog_title">Create session</string>
     <string name="dialog_message">Please, provide a key and a name for the new log session:</string>
     <string name="dialog_key">Key</string>
-    <string name="dialog_name">Name</string>
+    <string name="dialog_name">Name (optional)</string>
     <string name="dialog_error">The field may not be empty.</string>
 
 </resources>
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
@@ -35,7 +35,7 @@
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
-    <style name="AppBaseTheme" parent="@style/Theme.MaterialComponents.Light.DarkActionBar">
+    <style name="AppBaseTheme" parent="@style/Theme.Material3.Light">
         <item name="colorPrimary">@color/nordicBlue</item>
     </style>
 
