diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/DecodeActivity.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/DecodeActivity.kt index e45649ba..7a99aa90 100644 --- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/DecodeActivity.kt +++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/DecodeActivity.kt @@ -112,7 +112,6 @@ class DecodeActivity : AbstractBaseActivity() { private var isBinary = false private var originalBytes: ByteArray = ByteArray(0) private var lastParsedDataItems: List = emptyList() - private var lastParsedDataTitleResId = 0 private var showingDimmed = false private var label: String? = null private var recreationSize = 0 @@ -369,33 +368,32 @@ class DecodeActivity : AbstractBaseActivity() { isEditing: Boolean ) { val items = mutableListOf() + val parsedDataTitleResId = parseData(items, text, bytes) when (prefs.showChecksum) { "CRC4" -> items.add(Field(R.string.crc4, String.format("%X", crc4(bytes)))) "MD5" -> items.add(Field(R.string.md5, bytes.md5().toHexString().fold())) "SHA1" -> items.add(Field(R.string.sha1, bytes.sha1().toHexString().fold())) "SHA256" -> items.add(Field(R.string.sha256, bytes.sha256().toHexString().fold())) } - val count = items.count() - val parsedDataTitleResId = parseData(items, text, bytes) - if (items.count() > count) { + if (parsedDataTitleResId != 0) { + items.add( + 0, + Field( + R.string.parsed_type, + getString(parsedDataTitleResId) + ) + ) lastParsedDataItems = items - lastParsedDataTitleResId = parsedDataTitleResId - .takeIf { it != 0 } ?: R.string.section_parsed_data - fillDataItems(items, false, lastParsedDataTitleResId) + fillDataItems(items, false) return } if (isEditing && lastParsedDataItems.isNotEmpty()) { if (!showingDimmed) { - fillDataItems(lastParsedDataItems, true, lastParsedDataTitleResId) + fillDataItems(lastParsedDataItems, true) } return } - val titleResId = if (items.isNotEmpty()) { - R.string.section_parsed_data - } else { - 0 - } - fillDataItems(items, false, titleResId) + fillDataItems(items, false) } private fun parseData( @@ -418,7 +416,12 @@ class DecodeActivity : AbstractBaseActivity() { } try { - items.add(Field(R.string.formatted_json, JSONObject(text).toString(2))) + items.add( + Field( + R.string.formatted_json, + JSONObject(text).toString(2) + ) + ) return R.string.parsed_type_json } catch (_: JSONException) { // Ignore @@ -591,8 +594,7 @@ class DecodeActivity : AbstractBaseActivity() { private fun LinearLayout.fillDataItems( items: List, - dimmed: Boolean, - titleResId: Int + dimmed: Boolean ) { showingDimmed = dimmed removeAllViews() @@ -601,12 +603,7 @@ class DecodeActivity : AbstractBaseActivity() { visibility = View.GONE return } - if (titleResId != 0) { - dataHeadlineView.setText(titleResId) - dataHeadlineView.visibility = View.VISIBLE - } else { - dataHeadlineView.visibility = View.GONE - } + dataHeadlineView.visibility = View.VISIBLE val ctx = context val spaceBetween = (16f * dp).roundToInt() for (item in items) { diff --git a/app/src/main/res/layout/activity_decode.xml b/app/src/main/res/layout/activity_decode.xml index 13aae6d3..7a8be02b 100644 --- a/app/src/main/res/layout/activity_decode.xml +++ b/app/src/main/res/layout/activity_decode.xml @@ -18,6 +18,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textStyle="bold" + android:text="@string/section_parsed_data" android:visibility="gone"/> %d حرفًا %d أحرف + نوع المحتوى كلمة مرور لمرة واحدة JSON رخصة قيادة دولية diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index bd119828..3e9f231b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -411,6 +411,7 @@ %d знак %d знака + Тип съдържание Еднократна парола JSON Международна шофьорска книжка diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 8573668a..64a6586e 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -411,6 +411,7 @@ %d অক্ষর %d অক্ষর + বিষয়বস্তুর ধরন এককালীন পাসওয়ার্ড JSON আন্তর্জাতিক ড্রাইভার লাইসেন্স diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 9227f9cc..0062d00a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -419,6 +419,7 @@ %d znaků %d znaků + Typ obsahu Jednorázové heslo JSON Mezinárodní řidičský průkaz diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 719f570a..6238ed3a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -411,6 +411,7 @@ %d tegn %d tegn + Indholdstype Engangskode JSON Internationalt kørekort diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7147c477..55c172c1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -411,6 +411,7 @@ %d Zeichen %d Zeichen + Inhaltstyp Einmalpasswort JSON Internationaler Führerschein diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9bc81054..6fed79c6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -412,6 +412,7 @@ %d carácter %d caracteres + Tipo de contenido Contraseña de un solo uso JSON Permiso de conducir internacional diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 10fe4873..93c69891 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -411,6 +411,7 @@ %d نویسه %d نویسه + نوع محتوا رمز یک‌بارمصرف JSON گواهینامه بین‌المللی رانندگی diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b0b9f280..e4e072d5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -412,6 +412,7 @@ %d caractère %d caractères + Type de contenu Mot de passe à usage unique JSON Permis de conduire international diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index d5996d32..0408dc6a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -411,6 +411,7 @@ %d karakter %d karakter + Tartalomtípus Egyszer használatos jelszó JSON Nemzetközi vezetői engedély diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index dd6eb287..085f8899 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -409,6 +409,7 @@ %d karakter %d karakter + Jenis konten Kata sandi sekali pakai JSON Surat Izin Mengemudi Internasional diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dcc7234a..ba39dd5b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -301,6 +301,7 @@ Schema Host Richiesta + Tipo di contenuto Password mono uso JSON Patente di guida internazionale diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 419fec1a..ce5d56d7 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -409,6 +409,7 @@ %d 文字 %d 文字 + コンテンツの種類 ワンタイムパスワード JSON 国際運転免許証 diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index 258393ad..7600c6b3 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -411,6 +411,7 @@ %d სიმბოლო %d სიმბოლო + შიგთავსის ტიპი ერთჯერადი პაროლი JSON საერთაშორისო მართვის მოწმობა diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7e6859d5..c6e572ec 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -409,6 +409,7 @@ %d자 %d자 + 콘텐츠 유형 일회용 비밀번호 JSON 국제 운전 면허증 diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 296807e5..36f840b6 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -306,6 +306,7 @@ Fona pieprasījums neizdevās Ziņojums Shēma + Satura tips Vienreizējā parole JSON Starptautiska vadītāja apliecība diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 87b0aaa5..9037d3d9 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -411,6 +411,7 @@ %d teken %d tekens + Inhoudstype Eenmalig wachtwoord JSON Internationaal rijbewijs diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d78af234..93a2a56a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -419,6 +419,7 @@ %d znaków %d znaku + Typ treści Hasło jednorazowe JSON Międzynarodowe prawo jazdy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 2b3b1116..e6574128 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -411,6 +411,7 @@ %d caractere %d caracteres + Tipo de conteúdo Senha de uso único JSON Carteira Internacional de Habilitação diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index dced4601..472b7b47 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -419,6 +419,7 @@ %d символов %d символов + Тип содержимого Одноразовый пароль JSON Международное водительское удостоверение diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9ac1da66..c77cdf2d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -411,6 +411,7 @@ %d karakter %d karakter + İçerik türü Tek kullanımlık parola JSON Uluslararası sürücü belgesi diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4270cfdc..f7fa7237 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -419,6 +419,7 @@ %d символів %d символів + Тип вмісту Одноразовий пароль JSON Міжнародне водійське посвідчення diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d18eee20..77d378fd 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -409,6 +409,7 @@ %d ký tự %d ký tự + Loại nội dung Mật khẩu dùng một lần JSON Giấy phép lái xe quốc tế diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 848e1b6e..3a513721 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -409,6 +409,7 @@ %d 个字符 %d 个字符 + 内容类型 一次性密码 JSON 国际驾驶执照 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 62737894..d856bb7d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -409,6 +409,7 @@ %d 個字元 %d 個字元 + 內容類型 一次性密碼 JSON 國際駕駛執照 diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 126e6655..46b006b4 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -9,5 +9,5 @@ SHA1 SHA256 %1$s • %2$s - Deutsche Post + Deutsche Post Matrix Code diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d9a3ff65..1d6672db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -301,6 +301,7 @@ Scheme Host Query + Content Type One-Time Password JSON International Driver License