Tweak

microbit-foundation · May 2, 2024 · 1b8ff3c · 1b8ff3c
1 parent f35b652
commit 1b8ff3c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 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
@@ -123,7 +123,7 @@ private enum PAIRING_STATE {
     LinearLayout bottomPairButton;
 
     // Connected Device Status
-    TextView deviceConnectionStatusView;
+    TextView deviceConnectionStatusTextView;
 
     private int currentOrientation;
 
@@ -659,7 +659,7 @@ private void setupFontStyle() {
         Typeface defaultTypeface = application.getTypeface();
         Typeface robotoTypeface = application.getRobotoTypeface();
 
-        deviceConnectionStatusView.setTypeface(defaultTypeface);
+        deviceConnectionStatusTextView.setTypeface(defaultTypeface);
 
         // Connect Screen
         TextView appBarTitle = (TextView) findViewById(R.id.flash_projects_title_txt);
@@ -733,7 +733,7 @@ private void setupFontStyle() {
      */
     private void initViews() {
         logi("initViews");
-        deviceConnectionStatusView = findViewById(R.id.connected_device_status);
+        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);
@@ -758,7 +758,7 @@ private void initViews() {
     }
 
     private void releaseViews() {
-        deviceConnectionStatusView = null;
+        deviceConnectionStatusTextView = null;
         bottomPairButton = null;
         pairButtonView = null;
         pairTipView = null;
@@ -1035,15 +1035,15 @@ private void updateConnectionStatus() {
 
         if(!connectedDevice.mStatus) {
             // Device is not connected
-            deviceConnectionStatusView.setBackgroundResource(R.drawable.grey_text_view);
-            deviceConnectionStatusView.setTextColor(Color.WHITE);
-            deviceConnectionStatusView.setContentDescription("Micro:bit not connected " + connectedDevice.mName + "is " + getStatusString(connectedDevice.mStatus));
+            deviceConnectionStatusTextView.setBackgroundResource(R.drawable.grey_text_view);
+            deviceConnectionStatusTextView.setTextColor(Color.WHITE);
+            deviceConnectionStatusTextView.setContentDescription("Micro:bit not connected " + connectedDevice.mName + "is " + getStatusString(connectedDevice.mStatus));
 
         } else {
             // Device is connected
-            deviceConnectionStatusView.setBackgroundResource(R.drawable.white_btn_devices_status_connected);
-            deviceConnectionStatusView.setTextColor(Color.BLACK);
-            deviceConnectionStatusView.setContentDescription("Currently connected Micro:bit " + connectedDevice.mName + "is " + getStatusString(connectedDevice.mStatus));
+            deviceConnectionStatusTextView.setBackgroundResource(R.drawable.white_btn_devices_status_connected);
+            deviceConnectionStatusTextView.setTextColor(Color.BLACK);
+            deviceConnectionStatusTextView.setContentDescription("Currently connected Micro:bit " + connectedDevice.mName + "is " + getStatusString(connectedDevice.mStatus));
         }
     }
 
@@ -1066,10 +1066,10 @@ private void updatePairedDeviceCard() {
         ConnectedDevice connectedDevice = BluetoothUtils.getPairedMicrobit(this);
         if(connectedDevice.mName == null) {
             // No device is Paired
-            deviceConnectionStatusView.setBackgroundResource(R.drawable.grey_text_view);
-            deviceConnectionStatusView.setText("-");
+            deviceConnectionStatusTextView.setBackgroundResource(R.drawable.grey_text_view);
+            deviceConnectionStatusTextView.setText("-");
         } else {
-            deviceConnectionStatusView.setText(connectedDevice.mName);
+            deviceConnectionStatusTextView.setText(connectedDevice.mName);
             updateConnectionStatus();
         }
         logi("updatePairedDeviceCard End");

diff --git a/app/src/main/res/layout/pairing_device_state.xml b/app/src/main/res/layout/pairing_device_state.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/connected_device_status"
-        style="@style/connected_device_status_text_view_style"
+        style="@style/pairing_device_state_text_view_style"
         android:background="@drawable/grey_text_view"
         android:contentDescription="@null" />
 </LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -135,7 +135,7 @@
         <item name="android:paddingBottom">@dimen/pairing_connection_header_padding</item>
     </style>
 
-    <style name="connected_device_status_text_view_style" parent="match_width_parent_wrap_height_content">
+    <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>