Merge branch 'main' of https://github.com/microbit-foundation/microbi…

…t-android into tweak-searching-microbit-copy
microbit-foundation · May 9, 2024 · e67ab17 · e67ab17
2 parents 2388c25 + be8e11c
commit e67ab17
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 81 deletions.
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java
@@ -6,15 +6,7 @@
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCallback;
 import android.bluetooth.BluetoothManager;
-import android.bluetooth.le.BluetoothLeScanner;
-import android.bluetooth.le.ScanCallback;
-import android.bluetooth.le.ScanFilter;
-import android.bluetooth.le.ScanRecord;
-import android.bluetooth.le.ScanResult;
-import android.bluetooth.le.ScanSettings;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -27,9 +19,6 @@
 import android.location.LocationManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Parcelable;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -64,7 +53,6 @@
 import com.samsung.microbit.ui.PopUp;
 import com.samsung.microbit.ui.adapter.LEDAdapter;
 import com.samsung.microbit.utils.BLEConnectionHandler;
-import com.samsung.microbit.utils.ServiceUtils;
 import com.samsung.microbit.utils.Utils;
 import com.samsung.microbit.utils.BLEPair;
 
@@ -74,14 +62,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
 import pl.droidsonroids.gif.GifImageView;
 
-import static android.bluetooth.BluetoothAdapter.STATE_CONNECTED;
-import static android.bluetooth.BluetoothAdapter.STATE_DISCONNECTED;
-import static android.bluetooth.BluetoothAdapter.STATE_CONNECTING;
-import static android.bluetooth.BluetoothAdapter.STATE_DISCONNECTING;
 import static com.samsung.microbit.BuildConfig.DEBUG;
 
 /**
@@ -140,7 +123,7 @@ private enum PAIRING_STATE {
     LinearLayout bottomPairButton;
 
     // Connected Device Status
-    Button deviceConnectionStatusBtn;
+    TextView deviceConnectionStatusTextView;
 
     private int currentOrientation;
 
@@ -676,7 +659,7 @@ private void setupFontStyle() {
         Typeface defaultTypeface = application.getTypeface();
         Typeface robotoTypeface = application.getRobotoTypeface();
 
-        deviceConnectionStatusBtn.setTypeface(defaultTypeface);
+        deviceConnectionStatusTextView.setTypeface(defaultTypeface);
 
         // Connect Screen
         TextView appBarTitle = (TextView) findViewById(R.id.flash_projects_title_txt);
@@ -747,7 +730,7 @@ private void setupFontStyle() {
      */
     private void initViews() {
         logi("initViews");
-        deviceConnectionStatusBtn = (Button) findViewById(R.id.connected_device_status_button);
+        deviceConnectionStatusTextView = findViewById(R.id.connected_device_status);
         bottomPairButton = (LinearLayout) findViewById(R.id.ll_pairing_activity_screen);
         pairButtonView = (LinearLayout) findViewById(R.id.pairButtonView);
         pairTipView = (LinearLayout) findViewById(R.id.pairTipView);
@@ -756,7 +739,6 @@ private void initViews() {
         pairSearchView = (LinearLayout) findViewById(R.id.pairSearchView);
 
         //Setup on click listeners.
-        deviceConnectionStatusBtn.setOnClickListener(this);
         findViewById(R.id.pairButton).setOnClickListener(this);
 
         findViewById(R.id.viewPairStep1AnotherWay).setOnClickListener(this);
@@ -773,7 +755,7 @@ private void initViews() {
     }
 
     private void releaseViews() {
-        deviceConnectionStatusBtn = null;
+        deviceConnectionStatusTextView = null;
         bottomPairButton = null;
         pairButtonView = null;
         pairTipView = null;
@@ -1042,33 +1024,6 @@ private Drawable getDrawableResource(int resID) {
         return ContextCompat.getDrawable(this, resID);
     }
 
-    /**
-     * Updates connection status UI according to current connection status.
-     */
-    private void updateConnectionStatus() {
-        ConnectedDevice connectedDevice = BluetoothUtils.getPairedMicrobit(this);
-        Drawable mDeviceDisconnectedImg;
-        Drawable mDeviceConnectedImg;
-
-        mDeviceDisconnectedImg = getDrawableResource(R.drawable.device_status_disconnected);
-        mDeviceConnectedImg = getDrawableResource(R.drawable.device_status_connected);
-
-        if(!connectedDevice.mStatus) {
-            // Device is not connected
-            deviceConnectionStatusBtn.setBackgroundResource(R.drawable.grey_btn);
-            deviceConnectionStatusBtn.setTextColor(Color.WHITE);
-            deviceConnectionStatusBtn.setCompoundDrawablesWithIntrinsicBounds(null, null, mDeviceDisconnectedImg, null);
-            deviceConnectionStatusBtn.setContentDescription("Micro:bit not connected " + connectedDevice.mName + "is " + getStatusString(connectedDevice.mStatus));
-
-        } else {
-            // Device is connected
-            deviceConnectionStatusBtn.setBackgroundResource(R.drawable.white_btn_devices_status_connected);
-            deviceConnectionStatusBtn.setTextColor(Color.BLACK);
-            deviceConnectionStatusBtn.setCompoundDrawablesWithIntrinsicBounds(null, null, mDeviceConnectedImg, null);
-            deviceConnectionStatusBtn.setContentDescription("Currently connected Micro:bit " + connectedDevice.mName + "is " + getStatusString(connectedDevice.mStatus));
-        }
-    }
-
     /**
      * Converts status state from boolean to its String representation.
      *
@@ -1088,14 +1043,9 @@ private void updatePairedDeviceCard() {
         ConnectedDevice connectedDevice = BluetoothUtils.getPairedMicrobit(this);
         if(connectedDevice.mName == null) {
             // No device is Paired
-            deviceConnectionStatusBtn.setBackgroundResource(R.drawable.grey_btn);
-            deviceConnectionStatusBtn.setText("-");
-            deviceConnectionStatusBtn.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-            deviceConnectionStatusBtn.setOnClickListener(null);
+            deviceConnectionStatusTextView.setText("-");
         } else {
-            deviceConnectionStatusBtn.setText(connectedDevice.mName);
-            updateConnectionStatus();
-            deviceConnectionStatusBtn.setOnClickListener(this);
+            deviceConnectionStatusTextView.setText(connectedDevice.mName);
         }
         logi("updatePairedDeviceCard End");
     }
@@ -1460,18 +1410,6 @@ public void onClick(final View v) {
                 onFinish( RESULT_CANCELED);
                 break;
 
-            case R.id.connected_device_status_button:
-                logi("onClick() :: connectBtn");
-                Toast.makeText(MBApp.getApp(), getString(R.string.no_longer_required_to_connect), Toast.LENGTH_LONG).show();
-
-//                if(!BluetoothChecker.getInstance().isBluetoothON()) {
-//                    setActivityState(PairingActivityState.STATE_ENABLE_BT_FOR_CONNECT);
-//                    enableBluetooth();
-//                    return;
-//                }
-//                toggleConnection();
-                break;
-
             //TODO: there is no ability to delete paired device on Connect screen, so add or remove the case.
             // Delete Microbit
             case R.id.deleteBtn:
@@ -1660,7 +1598,7 @@ protected void onDestroy() {
 
         releaseViews();
 
-        Utils.unbindDrawables(findViewById(R.id.connected_device_status_button));
+        Utils.unbindDrawables(findViewById(R.id.connected_device_status));
         Utils.unbindDrawables(findViewById(R.id.pairButtonView));
 
         Utils.unbindDrawables(findViewById(R.id.pairTipView));

diff --git a/app/src/main/java/com/samsung/microbit/utils/BLEPair.java b/app/src/main/java/com/samsung/microbit/utils/BLEPair.java
@@ -643,7 +643,7 @@ public void onReceive(Context context, Intent intent) {
                 final int state = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.ERROR);
                 final int prevState = intent.getIntExtra(BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE, BluetoothDevice.ERROR);
                 logi("pairReceiver -" + " name = " + name + " addr = " + addr + " state = " + state + " prevState = " + prevState);
-                if (name.isEmpty() || addr.isEmpty()) {
+                if (name == null || name.isEmpty() || addr.isEmpty()) {
                     return;
                 }
                 // Check the changed device is the one we are trying to pair

diff --git a/app/src/main/res/drawable/grey_btn.xml → app/src/main/res/drawable/grey_text_view.xml b/app/src/main/res/drawable/grey_btn.xml → app/src/main/res/drawable/grey_text_view.xml
diff --git a/app/src/main/res/layout/pairing_device_state.xml b/app/src/main/res/layout/pairing_device_state.xml
@@ -10,10 +10,10 @@
     <!-- Connection status-->
     <include layout="@layout/pairing_activity_connection_status" />
 
-    <Button
-        android:id="@+id/connected_device_status_button"
-        style="@style/pairing_device_state_button_style"
-        android:background="@drawable/grey_btn"
-        android:contentDescription="@null"
-        android:drawableRight="@drawable/device_status_disconnected" />
+    <TextView
+        android:id="@+id/connected_device_status"
+        style="@style/pairing_device_state_text_view_style"
+        android:background="@drawable/grey_text_view"
+        android:textColor="@color/white_color"
+        android:contentDescription="@null" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/project_items.xml b/app/src/main/res/layout/project_items.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/grey_btn">
+    android:background="@drawable/grey_text_view">
 
     <Button
         android:id="@+id/appNameButton"

diff --git a/app/src/main/res/layout/projects_app_bar.xml b/app/src/main/res/layout/projects_app_bar.xml
@@ -35,7 +35,6 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:gravity="center"
-        android:nextFocusDown="@+id/connectedIndicatorIcon"
         android:text="@string/flash"
         android:textSize="@dimen/app_bar_title_text_size"
         android:textColor="@android:color/white" />

diff --git a/app/src/main/res/raw/samples.zip b/app/src/main/res/raw/samples.zip
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -387,7 +387,6 @@
     <string name="v1_button_label">V1</string>
     <string name="v2_button_label">V2</string>
 
-    <string name="no_longer_required_to_connect">It is no longer necessary to connect to your micro:bit before flashing</string>
     <string name="desc_edit_project_btn">Edit project</string>
     <string name="edit">Edit</string>
 

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -135,8 +135,8 @@
         <item name="android:paddingBottom">@dimen/pairing_connection_header_padding</item>
     </style>
 
-    <style name="pairing_device_state_button_style" parent="match_width_parent_wrap_height_content">
-        <item name="android:background">@drawable/grey_btn</item>
+    <style name="pairing_device_state_text_view_style" parent="match_width_parent_wrap_height_content">
+        <item name="android:background">@drawable/grey_text_view</item>
         <item name="android:gravity">start|center_vertical</item>
         <item name="android:importantForAccessibility">yes</item>
         <item name="android:drawablePadding">@dimen/pair_prev_connected_button_drawable_padding