Revert "Make pairing flow buttons typeface bold"

This reverts commit 1c60139.
microbit-foundation · May 17, 2024 · 45ae069 · 45ae069
1 parent 1c60139
commit 45ae069
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 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
@@ -695,10 +695,10 @@ private void setupFontStyle() {
         TextView appBarTitle = (TextView) findViewById(R.id.flash_projects_title_txt);
         appBarTitle.setTypeface(defaultTypeface);
 
-        Typeface boldTypeface = application.getTypefaceBold();
-
         TextView pairBtnText = (TextView) findViewById(R.id.custom_pair_button_text);
-        pairBtnText.setTypeface(boldTypeface);
+        pairBtnText.setTypeface(defaultTypeface);
+
+        Typeface boldTypeface = application.getTypefaceBold();
 
         TextView manageMicrobit = (TextView) findViewById(R.id.title_manage_microbit);
         manageMicrobit.setTypeface(boldTypeface);
@@ -714,10 +714,10 @@ private void setupFontStyle() {
         stepOneTitle.setTypeface(boldTypeface);
 
         Button cancelPairButton = (Button) findViewById(R.id.cancel_tip_step_1_btn);
-        cancelPairButton.setTypeface(boldTypeface);
+        cancelPairButton.setTypeface(robotoTypeface);
 
         Button nextPairButton = (Button) findViewById(R.id.ok_tip_step_1_btn);
-        nextPairButton.setTypeface(boldTypeface);
+        nextPairButton.setTypeface(robotoTypeface);
 
 
         // Enter Pattern
@@ -731,10 +731,10 @@ private void setupFontStyle() {
         stepTwoInstructions.setTypeface(robotoTypeface);
 
         Button cancelEnterPattern = (Button) findViewById(R.id.cancel_enter_pattern_step_2_btn);
-        cancelEnterPattern.setTypeface(boldTypeface);
+        cancelEnterPattern.setTypeface(robotoTypeface);
 
         Button okEnterPatternButton = (Button) findViewById(R.id.ok_enter_pattern_step_2_btn);
-        okEnterPatternButton.setTypeface(boldTypeface);
+        okEnterPatternButton.setTypeface(robotoTypeface);
 
         // Enter pin if needed
         TextView enterPinIfNeededTitle = (TextView) findViewById(R.id.enter_pin_if_needed_title);
@@ -744,10 +744,10 @@ private void setupFontStyle() {
         enterPinIfNeededText.setTypeface(boldTypeface);
 
         Button cancelEnterPinIfNeededButton = (Button) findViewById(R.id.cancel_enter_pin_if_needed_btn);
-        cancelEnterPinIfNeededButton.setTypeface(boldTypeface);
+        cancelEnterPinIfNeededButton.setTypeface(robotoTypeface);
 
         Button nextEnterPinIfNeededButton = (Button) findViewById(R.id.next_enter_pin_if_needed_btn);
-        nextEnterPinIfNeededButton.setTypeface(boldTypeface);
+        nextEnterPinIfNeededButton.setTypeface(robotoTypeface);
 
         // Searching for micro:bit
         TextView searchMicrobitTitle = (TextView) findViewById(R.id.search_microbit_step_3_title);
@@ -757,7 +757,7 @@ private void setupFontStyle() {
         stepThreeTitle.setTypeface(boldTypeface);
 
         Button cancelSearchMicroBit = (Button) findViewById(R.id.cancel_search_microbit_step_3_btn);
-        cancelSearchMicroBit.setTypeface(boldTypeface);
+        cancelSearchMicroBit.setTypeface(robotoTypeface);
 
 
         TextView descriptionManageMicrobit = (TextView) findViewById(R.id.description_manage_microbit);

diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/PopUpActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/PopUpActivity.java
@@ -6,7 +6,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -122,14 +121,14 @@ public void onConfigurationChanged(Configuration newConfig) {
      * Setups font style by setting an appropriate typeface.
      */
     private void setupFontStyle() {
-        affirmationOKButton.setTypeface(MBApp.getApp().getTypefaceBold());
-        cancelButton.setTypeface(MBApp.getApp().getTypefaceBold());
-        okButton.setTypeface(MBApp.getApp().getTypefaceBold());
+        affirmationOKButton.setTypeface(MBApp.getApp().getRobotoTypeface());
+        cancelButton.setTypeface(MBApp.getApp().getRobotoTypeface());
+        okButton.setTypeface(MBApp.getApp().getRobotoTypeface());
         messageTxt.setTypeface(MBApp.getApp().getRobotoTypeface());
         titleTxt.setTypeface(MBApp.getApp().getTypefaceBold());
 
-        v1Button.setTypeface(MBApp.getApp().getTypefaceBold());
-        v2Button.setTypeface(MBApp.getApp().getTypefaceBold());
+        v1Button.setTypeface(MBApp.getApp().getRobotoTypeface());
+        v2Button.setTypeface(MBApp.getApp().getRobotoTypeface());
 
     }