Skip to content

Commit

Permalink
Merge pull request #18 from CodeDead/release/v1.7.6
Browse files Browse the repository at this point in the history
Release/v1.7.6
  • Loading branch information
CodeDead authored Mar 10, 2022
2 parents 6981f75 + 194636a commit 8a97a20
Show file tree
Hide file tree
Showing 12 changed files with 82 additions and 13 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ This library is maintained by CodeDead. You can find more about us using the fol
* [Twitter](https://twitter.com/C0DEDEAD)
* [Facebook](https://facebook.com/deadlinecodedead)
* [Reddit](https://reddit.com/r/CodeDead/)

Copyright © 2022 CodeDead
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
compileSdkVersion 31
buildToolsVersion '30.0.3'
defaultConfig {
applicationId "com.codedead.deadhash"
minSdkVersion 24
targetSdkVersion 30
versionName '1.7.5'
targetSdkVersion 31
versionName '1.7.6'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 6
}
Expand All @@ -30,10 +30,10 @@ dependencies {
androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
testImplementation 'junit:junit:4.13.2'
implementation 'androidx.cardview:cardview:1.0.0'
implementation "androidx.preference:preference:1.1.1"
implementation "androidx.preference:preference:1.2.0"
}
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<activity
android:name=".gui.MainActivity"
android:label="@string/app_name"
android:exported="true"
android:launchMode="singleInstance"
android:theme="@style/Theme.DeadHash.NoActionBar">
<intent-filter>
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/java/com/codedead/deadhash/gui/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import androidx.appcompat.widget.Toolbar;

import android.os.Looper;
import android.text.method.LinkMovementMethod;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
Expand All @@ -43,6 +44,7 @@
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ViewFlipper;

Expand Down Expand Up @@ -469,10 +471,12 @@ private void loadAboutContent() {
final ImageButton btnFacebook = findViewById(R.id.BtnFacebook);
final ImageButton btnTwitter = findViewById(R.id.BtnTwitter);
final ImageButton btnWebsite = findViewById(R.id.BtnWebsiteAbout);
final TextView txtAbout = findViewById(R.id.TxtAbout);

btnWebsite.setOnClickListener(v -> IntentUtils.openSite(v.getContext(), "http://codedead.com/"));
btnFacebook.setOnClickListener(v -> IntentUtils.openSite(v.getContext(), "https://facebook.com/deadlinecodedead"));
btnTwitter.setOnClickListener(v -> IntentUtils.openSite(v.getContext(), "https://twitter.com/C0DEDEAD"));
txtAbout.setMovementMethod(LinkMovementMethod.getInstance());
}

/**
Expand All @@ -498,6 +502,10 @@ private void loadSettings() {
break;
case "pt":
spnLanguages.setSelection(5);
break;
case "ru":
spnLanguages.setSelection(6);
break;
}

getDelegate().applyDayNight();
Expand Down Expand Up @@ -564,6 +572,9 @@ private void loadSettingsContent() {
break;
case 5:
lang = "pt";
break;
case 6:
lang = "ru";
}


Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/content_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
</TextView>

<TextView
android:id="@+id/TxtAbout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<string name="nav_tools">Werkzeuge</string>
<string name="navigation_drawer_close">Schliessschloss schließen</string>
<string name="navigation_drawer_open">Öffnen Sie die Schublade</string>
<string name="text_about">DeadHash wurde von DeadLine erstellt. Diese App kann verwendet werden, um Hashes von Dateien und Strings zu erzeugen.\n\nIn dieser Version sind keine Anzeigen oder Tracking-Geräte enthalten. Alle erforderlichen Berechtigungen sind erforderlich, um diese App richtig nutzen zu können.\n\nAlle Bilder sind mit freundlicher Genehmigung von Google.\n\nCopyright © 2021 CodeDead</string>
<string name="text_about">DeadHash wurde von DeadLine erstellt. Diese App kann verwendet werden, um Hashes von Dateien und Strings zu erzeugen.\n\nIn dieser Version sind keine Anzeigen oder Tracking-Geräte enthalten. Alle erforderlichen Berechtigungen sind erforderlich, um diese App richtig nutzen zu können.\n\nAlle Bilder sind mit freundlicher Genehmigung von Google.\n\nCopyright © 2022 CodeDead</string>
<string name="text_compare">Vergleichen:</string>
<string name="text_compare_hash">Hash vergleichen</string>
<string name="text_compare_hint">Lege deinen Hash hier</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<string name="text_compare">Comparer:</string>
<string name="navigation_drawer_open">Ouvrir le tiroir de navigation</string>
<string name="navigation_drawer_close">Fermer le tiroir de navigation</string>
<string name="text_about">DeadHash a été créé par DeadLine. Cette application peut être utilisée pour générer des hachages de fichiers et de chaînes.\n\nAucune publicité ou périphérique de suivi n\'est inclus dans cette version. Toutes les autorisations requises sont nécessaires pour utiliser correctement cette application.\n\nToutes les images sont gracieusement fournies par Google.\n\nCopyright © 2021 CodeDead</string>
<string name="text_about">DeadHash a été créé par DeadLine. Cette application peut être utilisée pour générer des hachages de fichiers et de chaînes.\n\nAucune publicité ou périphérique de suivi n\'est inclus dans cette version. Toutes les autorisations requises sont nécessaires pour utiliser correctement cette application.\n\nToutes les images sont gracieusement fournies par Google.\n\nCopyright © 2022 CodeDead</string>
<string name="text_help">La génération de hachages de fichiers ne peut être effectuée que lorsque DeadHash a été autorisé à lire votre stockage. Génération hash pour des fichiers plus volumineux peut prendre un certain temps. Cela dépend entièrement du pouvoir de traitement de votre appareil.\n\nLa génération de hachages de texte ne nécessite aucune autorisation supplémentaire. La génération de hachis pour un texte plus grand peut prendre un certain temps. Cela dépend entièrement du pouvoir de traitement de votre appareil.\n\nSi vous rencontrez un bug ou si vous avez besoin de soutien, vous pouvez toujours nous contacter!</string>
<string name="text_send_mail">Envoyez-nous un e-mail</string>
<string name="alert_review_text">Envisagez de laisser un commentaire si vous aimez cette application!</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<string name="button_support">Supporto</string>
<string name="text_help">La generazione di hash di file può essere eseguita solo quando DeadHash è stato autorizzato a leggere la propria memoria. La generazione di hash per file più grandi può richiedere un po \'di tempo. Questo dipende interamente dalla potenza di elaborazione del dispositivo.\n\nLa generazione di hash di testo non richiede autorizzazioni aggiuntive. La generazione di hash per stringhe più grandi può richiedere un po \'di tempo. Ciò dipende interamente dalla potenza di elaborazione del dispositivo.\n\nSe si verifica un errore o se hai bisogno di supporto, puoi sempre contattarci!</string>
<string name="nav_tools">Strumenti</string>
<string name="text_about">DeadHash è stato creato da DeadLine. Questa applicazione può essere utilizzata per generare hash di file e stringhe.\n\nNon sono inclusi dispositivi di pubblicità o di rilevamento in questa versione. Tutte le autorizzazioni richieste sono necessarie per utilizzare correttamente questa applicazione.\n\nTutte le immagini sono a cura di Google.\n\nCopyright © 2021 CodeDead</string>
<string name="text_about">DeadHash è stato creato da DeadLine. Questa applicazione può essere utilizzata per generare hash di file e stringhe.\n\nNon sono inclusi dispositivi di pubblicità o di rilevamento in questa versione. Tutte le autorizzazioni richieste sono necessarie per utilizzare correttamente questa applicazione.\n\nTutte le immagini sono a cura di Google.\n\nCopyright © 2022 CodeDead</string>
<string name="toast_settings_reset">Tutte le impostazioni sono state ripristinate!</string>
<string name="toast_settings_save">Tutte le impostazioni sono state salvate!</string>
<string name="text_interface">Interfaccia</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<string name="nav_tools">Gereedschap</string>
<string name="navigation_drawer_close">Sluit navigatie lade</string>
<string name="navigation_drawer_open">Open navigatie lade</string>
<string name="text_about">DeadHash werd gemaakt door DeadLine. Deze app kan gebruikt worden om hashes te genereren van bestanden en tekst.\n\nAdvertenties of trackers werden niet toegevoegd in deze release. Alle aangevraagde permissies zijn nodig om de app correct te laten functioneren.\n\nAlle gebruikte afbeeldingen waren gemaakt door Google.\n\nCopyright © 2021 CodeDead</string>
<string name="text_about">DeadHash werd gemaakt door DeadLine. Deze app kan gebruikt worden om hashes te genereren van bestanden en tekst.\n\nAdvertenties of trackers werden niet toegevoegd in deze release. Alle aangevraagde permissies zijn nodig om de app correct te laten functioneren.\n\nAlle gebruikte afbeeldingen waren gemaakt door Google.\n\nCopyright © 2022 CodeDead</string>
<string name="text_compare">Vergelijk:</string>
<string name="text_compare_hash">Vergelijk hash</string>
<string name="text_compare_hint">Plaats uw hash hier</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<string name="button_support">Suporte</string>
<string name="text_help">A geração de hashes para arquivos só pode ser feita se o DeadHash tiver permissão para ler o seu armazenamento. A geração de hashes para arquivos grandes poderá demorar um pouco. Isso dependerá exclusivamente do poder de processamento do seu dispositivo.\n\nA geração de hashes para textos não necessita que nenhuma permissão seja concedida. A geração de hashes para textos grandes poderá demorar um pouco. Isso dependerá exclusivamente do poder de processamento do seu dispositivo.\n\nSe chegar à encontrar algum bug ou precisar de suporte, você sempre poderá em contato conosco!</string>
<string name="nav_tools">Ferramentas</string>
<string name="text_about">DeadHash foi criado por DeadLine. Este aplicativo pode ser utilizado para gerar hashes de arquivos e textos.\n\nNenhum anúncio ou serviço de coleta de dados está incluído nesta versão. Todas as permissões requisitadas pelo aplicativo são necessárias para que ele funcione corretamente.\n\nTodas as imagens são cortesia do Google.\nTraduções fornecidas por SnwMds\n\nCopyright © 2021 CodeDead</string>
<string name="text_about">DeadHash foi criado por DeadLine. Este aplicativo pode ser utilizado para gerar hashes de arquivos e textos.\n\nNenhum anúncio ou serviço de coleta de dados está incluído nesta versão. Todas as permissões requisitadas pelo aplicativo são necessárias para que ele funcione corretamente.\n\nTodas as imagens são cortesia do Google.\nTraduções fornecidas por <a href="https://github.com/SnwMds">SnwMds</a>\n\nCopyright © 2022 CodeDead</string>
<string name="toast_settings_reset">Todas as configurações foram restauradas!</string>
<string name="toast_settings_save">Todas as configurações foram salvas!</string>
<string name="text_interface">Interface</string>
Expand Down
53 changes: 53 additions & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="button_generate">Вычислить</string>
<string name="button_reset">Сброс</string>
<string name="button_save">Сохран.</string>
<string name="button_support">Поддержка</string>
<string name="button_website">Веб-сайт</string>
<string name="card_file">Файл:</string>
<string name="card_file_path">Путь к файлу</string>
<string name="card_open_folder">Открыть папку</string>
<string name="copy_data">Копировать данные</string>
<string name="nav_about">О приложении</string>
<string name="nav_file">Файл</string>
<string name="nav_help">Помощь</string>
<string name="nav_info">Информация</string>
<string name="nav_settings">Параметры</string>
<string name="nav_text">Текст</string>
<string name="nav_tools">Инструменты</string>
<string name="toast_settings_save">Все настройки были сохранены!</string>
<string name="toast_settings_reset">Все настройки были сброшены!</string>
<string name="toast_hash_mismatch">Хеш не совпадает с введённым вами хешем!</string>
<string name="toast_hash_match">Хеш совпадает с введённым вами хешем!</string>
<string name="toast_error_notext">Пожалуйста, сначала введите текст!</string>
<string name="toast_data_copied">Данные скопированы в буфер обмена!</string>
<string name="toast_back_again">Нажмите \'НАЗАД\' ещё раз, чтобы выйти из приложения.</string>
<string name="text_language">Язык:</string>
<string name="text_interface">Интерфейс</string>
<string name="text_hash_generator">Генератор хешей</string>
<string name="text_content_hint">Введите ваш текст сюда</string>
<string name="text_compare_hint">Вставьте ваш хеш сюда</string>
<string name="text_compare_hash">Сравнить хеши</string>
<string name="text_compare">Сравнить:</string>
<string name="navigation_drawer_open">Открыть панель навигации</string>
<string name="navigation_drawer_close">Закрыть панель навигации</string>
<string name="text_about">Приложение DeadHash было создано DeadLine. Это приложение может генерировать хеши для файлов и текста.\n\nЗдесь отсутствуют реклама и отслеживание. Все требуемые разрешения нужны только для правильной работы приложения.\n\nВсе изображения предоставлены Google.\nПереводы:\n- Русский - <a href="https://github.com/Nickoriginal">Nickoriginal</a>\n\nВсе права защищены © 2022 CodeDead</string>
<string name="text_help">DeadHash может генерировать хеши файлов только после получения доступа к чтению вашего хранилища. Генерирование хешей для больших файлов может занять больше времени. Это полностью зависит от вычислительной мощности вашего устройства.\n\nГенерирование хешей для текста не требует дополнительных разрешений. Генерирование хешей для длинных строк текста может занять больше времени. Это полностью зависит от вычислительной мощности вашего устройства.\n\nЕсли вы столкнулись с ошибкой или если вам нужна помощь, вы всегда можете связаться с нами!</string>
<string name="text_send_mail">Отправьте нам электронное письмо</string>
<string name="alert_review_text">Если вам понравилось приложение, вы можете оставить отзыв!</string>
<string name="alert_review_title">Отзыв</string>
<string name="text_information">Информация</string>
<string name="alert_review_never">Никогда</string>
<string name="string_no_clipboard_access">Не могу получить доступ к вашему буферу обмена!</string>
<string name="error_playstore">Не могу открыть Play Store!</string>
<string name="error_website">Не могу открыть веб-сайт!</string>
<string name="dialog_select_file">Выберите файл</string>
<string name="error_copy_file">Не могу копировать выбранный файл!</string>
<string name="error_open_file">Не могу открыть выбранный файл!</string>
<string name="error_no_file">Не был выбран ни один файл!</string>
<string name="theme">Тема</string>
<string name="dark">Тёмная</string>
<string name="light">Светлая</string>
<string name="defaultTheme">По умолчанию</string>
</resources>
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<string name="button_support">Support</string>
<string name="text_help">Generating file hashes can only be done when DeadHash has been given permission to read your storage. Generating hashes for larger files may take a while. This depends entirely on the processing power of your device.\n\nGenerating text hashes does not require any additional permissions to be granted. Generating hashes for larger strings may take a while. This depends entirely on the processing power of your device.\n\nIf you happen to come across a bug or if you need support, you can always contact us!</string>
<string name="nav_tools">Tools</string>
<string name="text_about">DeadHash was created by DeadLine. This app can be used to generate hashes of files and strings.\n\nNo ads or tracking devices are included in this release. All requested permissions are required in order to properly use this app.\n\nAll images are courtesy of Google.\n\nCopyright © 2021 CodeDead</string>
<string name="text_about">DeadHash was created by DeadLine. This app can be used to generate hashes of files and strings.\n\nNo ads or tracking devices are included in this release. All requested permissions are required in order to properly use this app.\n\nAll images are courtesy of Google.\n\nCopyright © 2022 CodeDead</string>
<string name="toast_settings_reset">All settings have been reset!</string>
<string name="toast_settings_save">All settings have been saved!</string>
<string name="text_interface">Interface</string>
Expand Down Expand Up @@ -70,5 +70,6 @@
<item>Deutsch</item>
<item>Italiano</item>
<item>Português (Brasil)</item>
<item>Русский</item>
</string-array>
</resources>

0 comments on commit 8a97a20

Please sign in to comment.