Eric Betts пре 2 година
родитељ
комит
5613d2d2e4
2 измењених фајлова са 30 додато и 8 уклоњено
  1. 15 4
      scenes/seader_scene_credential_info.c
  2. 15 4
      scenes/seader_scene_read_card_success.c

+ 15 - 4
scenes/seader_scene_credential_info.c

@@ -18,8 +18,9 @@ void seader_scene_credential_info_on_enter(void* context) {
     SeaderCredential* credential = seader->credential;
     Widget* widget = seader->widget;
 
-    FuriString* credential_str = furi_string_alloc();
     FuriString* type_str = furi_string_alloc();
+    FuriString* bitlength_str = furi_string_alloc();
+    FuriString* credential_str = furi_string_alloc();
 
     dolphin_deed(DolphinDeedNfcReadSuccess);
 
@@ -27,9 +28,10 @@ void seader_scene_credential_info_on_enter(void* context) {
     notification_message(seader->notifications, &sequence_success);
 
     furi_string_set(credential_str, "");
+    furi_string_set(bitlength_str, "");
     if(credential->bit_length > 0) {
-        furi_string_cat_printf(
-            credential_str, "(%d)  %016llx", credential->bit_length, credential->credential);
+        furi_string_cat_printf(bitlength_str, "%d bit", credential->bit_length);
+        furi_string_cat_printf(credential_str, "0x%llX", credential->credential);
 
         if(credential->type == SeaderCredentialType14A) {
             furi_string_set(type_str, "14443A");
@@ -48,7 +50,15 @@ void seader_scene_credential_info_on_enter(void* context) {
         seader);
 
     widget_add_string_element(
-        widget, 64, 5, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(type_str));
+        widget, 64, 5, AlignCenter, AlignCenter, FontPrimary, furi_string_get_cstr(type_str));
+    widget_add_string_element(
+        widget,
+        64,
+        24,
+        AlignCenter,
+        AlignCenter,
+        FontSecondary,
+        furi_string_get_cstr(bitlength_str));
     widget_add_string_element(
         widget,
         64,
@@ -58,6 +68,7 @@ void seader_scene_credential_info_on_enter(void* context) {
         FontSecondary,
         furi_string_get_cstr(credential_str));
 
+    furi_string_free(bitlength_str);
     furi_string_free(credential_str);
     furi_string_free(type_str);
 

+ 15 - 4
scenes/seader_scene_read_card_success.c

@@ -18,8 +18,9 @@ void seader_scene_read_card_success_on_enter(void* context) {
     SeaderCredential* credential = seader->credential;
     Widget* widget = seader->widget;
 
-    FuriString* credential_str = furi_string_alloc();
     FuriString* type_str = furi_string_alloc();
+    FuriString* bitlength_str = furi_string_alloc();
+    FuriString* credential_str = furi_string_alloc();
 
     dolphin_deed(DolphinDeedNfcReadSuccess);
 
@@ -27,9 +28,10 @@ void seader_scene_read_card_success_on_enter(void* context) {
     notification_message(seader->notifications, &sequence_success);
 
     furi_string_set(credential_str, "");
+    furi_string_set(bitlength_str, "");
     if(credential->bit_length > 0) {
-        furi_string_cat_printf(
-            credential_str, "(%d) %016llx", credential->bit_length, credential->credential);
+        furi_string_cat_printf(bitlength_str, "%d bit", credential->bit_length);
+        furi_string_cat_printf(credential_str, "0x%llX", credential->credential);
 
         if(credential->type == SeaderCredentialType14A) {
             furi_string_set(type_str, "14443A");
@@ -49,7 +51,15 @@ void seader_scene_read_card_success_on_enter(void* context) {
         widget, GuiButtonTypeRight, "More", seader_scene_read_card_success_widget_callback, seader);
 
     widget_add_string_element(
-        widget, 64, 5, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(type_str));
+        widget, 64, 5, AlignCenter, AlignCenter, FontPrimary, furi_string_get_cstr(type_str));
+    widget_add_string_element(
+        widget,
+        64,
+        24,
+        AlignCenter,
+        AlignCenter,
+        FontSecondary,
+        furi_string_get_cstr(bitlength_str));
     widget_add_string_element(
         widget,
         64,
@@ -60,6 +70,7 @@ void seader_scene_read_card_success_on_enter(void* context) {
         furi_string_get_cstr(credential_str));
 
     furi_string_free(credential_str);
+    furi_string_free(bitlength_str);
     furi_string_free(type_str);
 
     view_dispatcher_switch_to_view(seader->view_dispatcher, SeaderViewWidget);