Skip to content

Commit ccc3336

Browse files
CodeDeadCodeDead
authored
Merge pull request #6 from CodeDead/release/1.7.4
Release/1.7.4
2 parents f067a4f + 414d22c commit ccc3336

File tree

19 files changed

+202
-57
lines changed

19 files changed

+202
-57
lines changed

‎app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 30
5-
buildToolsVersion '30.0.2'
5+
buildToolsVersion '30.0.3'
66
defaultConfig {
77
applicationId "com.codedead.deadhash"
88
minSdkVersion 24
99
targetSdkVersion 30
10-
versionName '1.7.3'
10+
versionName '1.7.4'
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
12-
versionCode 4
12+
versionCode 5
1313
}
1414
buildTypes {
1515
release {
@@ -31,9 +31,9 @@ dependencies {
3131
exclude group: 'com.android.support', module: 'support-annotations'
3232
})
3333
implementation 'androidx.appcompat:appcompat:1.2.0'
34-
implementation 'com.google.android.material:material:1.2.1'
34+
implementation 'com.google.android.material:material:1.3.0'
3535
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
36-
testImplementation 'junit:junit:4.13.1'
36+
testImplementation 'junit:junit:4.13.2'
3737
implementation 'androidx.cardview:cardview:1.0.0'
3838
implementation "androidx.preference:preference:1.1.1"
3939
}

‎app/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
android:largeHeap="true"
1616
android:roundIcon="@mipmap/ic_launcher_round"
1717
android:supportsRtl="true"
18-
android:theme="@style/AppTheme"
18+
android:theme="@style/Theme.DeadHash"
1919
tools:ignore="GoogleAppIndexingWarning">
2020
<activity
2121
android:name=".gui.MainActivity"
2222
android:label="@string/app_name"
2323
android:launchMode="singleInstance"
24-
android:theme="@style/AppTheme.NoActionBar">
24+
android:theme="@style/Theme.DeadHash.NoActionBar">
2525
<intent-filter>
2626
<action android:name="android.intent.action.MAIN" />
2727

‎app/src/main/java/com/codedead/deadhash/domain/objects/settings/SettingsContainer.java

+21
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class SettingsContainer {
1616
private boolean calculateSha512;
1717
private boolean calculateCrc32;
1818
private int reviewTimes;
19+
private int theme;
1920

2021
/**
2122
* Initialize a new SettingsContainer
@@ -189,6 +190,24 @@ public void setReviewTimes(final int reviewTimes) {
189190
this.reviewTimes = reviewTimes;
190191
}
191192

193+
/**
194+
* Get the theme index
195+
*
196+
* @return The theme index
197+
*/
198+
public int getTheme() {
199+
return theme;
200+
}
201+
202+
/**
203+
* Set the theme index
204+
*
205+
* @param theme The theme index
206+
*/
207+
public void setTheme(final int theme) {
208+
this.theme = theme;
209+
}
210+
192211
/**
193212
* Load the settings
194213
*
@@ -208,6 +227,7 @@ public void loadSettings(final Context context) {
208227
calculateSha512 = sharedPreferences.getBoolean("sha512", true);
209228
calculateCrc32 = sharedPreferences.getBoolean("crc32", true);
210229
reviewTimes = sharedPreferences.getInt("reviewTimes", 0);
230+
theme = sharedPreferences.getInt("theme", 0);
211231
}
212232

213233
/**
@@ -230,6 +250,7 @@ public void saveSettings(final Context context) {
230250
edit.putBoolean("sha512", isCalculateSha512());
231251
edit.putBoolean("crc32", isCalculateCrc32());
232252
edit.putInt("reviewTimes", getReviewTimes());
253+
edit.putInt("theme", getTheme());
233254

234255
edit.apply();
235256
}

‎app/src/main/java/com/codedead/deadhash/gui/MainActivity.java

+41-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import androidx.annotation.NonNull;
1414
import androidx.annotation.Nullable;
15+
import androidx.appcompat.app.AppCompatDelegate;
1516
import androidx.core.app.ActivityCompat;
1617
import androidx.core.app.ShareCompat;
1718
import androidx.core.content.ContextCompat;
@@ -39,6 +40,8 @@
3940
import android.widget.EditText;
4041
import android.widget.ImageButton;
4142
import android.widget.ProgressBar;
43+
import android.widget.RadioButton;
44+
import android.widget.RadioGroup;
4245
import android.widget.Spinner;
4346
import android.widget.Toast;
4447
import android.widget.ViewFlipper;
@@ -89,6 +92,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
8992
private boolean paused;
9093

9194
private Spinner spnLanguages;
95+
private RadioButton rdbLightTheme;
96+
private RadioButton rdbDarkTheme;
97+
private RadioButton rdbDefaultTheme;
9298
private CheckBox ChbMD5;
9399
private CheckBox ChbSHA1;
94100
private CheckBox ChbSHA224;
@@ -136,8 +142,10 @@ protected void onCreate(final Bundle savedInstanceState) {
136142
navigationView.setCheckedItem(navigationView.getMenu().getItem(0).getSubMenu().getItem(0).getItemId());
137143
deleteTempFile();
138144
}
139-
140145
spnLanguages = findViewById(R.id.SpnLanguages);
146+
rdbLightTheme = findViewById(R.id.RdbLightTheme);
147+
rdbDarkTheme = findViewById(R.id.RdbDarkTheme);
148+
rdbDefaultTheme = findViewById(R.id.RdbDefaultTheme);
141149
ChbMD5 = findViewById(R.id.ChbMD5);
142150
ChbSHA1 = findViewById(R.id.ChbSHA1);
143151
ChbSHA224 = findViewById(R.id.ChbSHA224);
@@ -492,6 +500,23 @@ private void loadSettings() {
492500
spnLanguages.setSelection(5);
493501
}
494502

503+
getDelegate().applyDayNight();
504+
505+
switch (settingsContainer.getTheme()) {
506+
case 0:
507+
rdbDefaultTheme.setChecked(true);
508+
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
509+
break;
510+
case 1:
511+
rdbLightTheme.setChecked(true);
512+
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
513+
break;
514+
case 2:
515+
rdbDarkTheme.setChecked(true);
516+
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
517+
break;
518+
}
519+
495520
ChbMD5.setChecked(settingsContainer.isCalculateMd5());
496521
ChbSHA1.setChecked(settingsContainer.isCalculateSha1());
497522
ChbSHA224.setChecked(settingsContainer.isCalculateSha224());
@@ -509,8 +534,10 @@ private void loadSettingsContent() {
509534
final Button btnSave = findViewById(R.id.BtnSaveSettings);
510535
loadSettings();
511536

537+
final RadioGroup group = findViewById(R.id.RgrThemes);
538+
512539
btnReset.setOnClickListener(v -> {
513-
saveSettings("en", true, true, true, true, true, true, true);
540+
saveSettings("en", true, true, true, true, true, true, true, 0);
514541
final Context c = LocaleHelper.setLocale(getApplicationContext(), settingsContainer.getLanguageCode());
515542
Toast.makeText(MainActivity.this, c.getString(R.string.toast_settings_reset), Toast.LENGTH_SHORT).show();
516543
recreate();
@@ -539,7 +566,16 @@ private void loadSettingsContent() {
539566
lang = "pt";
540567
}
541568

542-
saveSettings(lang, ChbMD5.isChecked(), ChbSHA1.isChecked(), ChbSHA224.isChecked(), ChbSHA256.isChecked(), ChbSHA384.isChecked(), ChbSHA512.isChecked(), ChbCRC32.isChecked());
569+
570+
final int checkedRadioButtonId = group.getCheckedRadioButtonId();
571+
int themeIndex = 0;
572+
if (checkedRadioButtonId == R.id.RdbLightTheme) {
573+
themeIndex = 1;
574+
} else if (checkedRadioButtonId == R.id.RdbDarkTheme) {
575+
themeIndex = 2;
576+
}
577+
578+
saveSettings(lang, ChbMD5.isChecked(), ChbSHA1.isChecked(), ChbSHA224.isChecked(), ChbSHA256.isChecked(), ChbSHA384.isChecked(), ChbSHA512.isChecked(), ChbCRC32.isChecked(), themeIndex);
543579
final Context c = LocaleHelper.setLocale(getApplicationContext(), settingsContainer.getLanguageCode());
544580
Toast.makeText(MainActivity.this, c.getString(R.string.toast_settings_save), Toast.LENGTH_SHORT).show();
545581
recreate();
@@ -559,7 +595,7 @@ private void loadSettingsContent() {
559595
* @param sha512 Whether or not SHA512 hashes should be calculated
560596
* @param crc32 Whether or not CRC32 values should be calculated
561597
*/
562-
private void saveSettings(final String lang, final boolean md5, final boolean sha1, final boolean sha224, final boolean sha256, final boolean sha384, final boolean sha512, final boolean crc32) {
598+
private void saveSettings(final String lang, final boolean md5, final boolean sha1, final boolean sha224, final boolean sha256, final boolean sha384, final boolean sha512, final boolean crc32, final int theme) {
563599
settingsContainer.setLanguageCode(lang);
564600
settingsContainer.setCalculateMd5(md5);
565601
settingsContainer.setCalculateSha1(sha1);
@@ -568,6 +604,7 @@ private void saveSettings(final String lang, final boolean md5, final boolean sh
568604
settingsContainer.setCalculateSha384(sha384);
569605
settingsContainer.setCalculateSha512(sha512);
570606
settingsContainer.setCalculateCrc32(crc32);
607+
settingsContainer.setTheme(theme);
571608

572609
settingsContainer.saveSettings(getApplicationContext());
573610
}

‎app/src/main/res/drawable/side_nav_bar.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
android:shape="rectangle">
33
<gradient
44
android:angle="135"
5-
android:centerColor="@color/colorPrimaryDark"
6-
android:endColor="@color/colorPrimary"
7-
android:startColor="@color/colorPrimary"
5+
android:centerColor="@color/purple_500"
6+
android:endColor="@color/purple_500"
7+
android:startColor="@color/purple_500"
88
android:type="linear" />
99
</shape>

‎app/src/main/res/layout/app_bar_main.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<com.google.android.material.appbar.AppBarLayout
1111
android:layout_width="match_parent"
1212
android:layout_height="wrap_content"
13-
android:theme="@style/AppTheme.AppBarOverlay">
13+
android:theme="@style/Theme.DeadHash.AppBarOverlay">
1414

1515
<androidx.appcompat.widget.Toolbar
1616
android:id="@+id/toolbar"
1717
android:layout_width="match_parent"
1818
android:layout_height="?attr/actionBarSize"
1919
android:background="?attr/colorPrimary"
20-
app:popupTheme="@style/AppTheme.PopupOverlay" />
20+
app:popupTheme="@style/Theme.DeadHash.PopupOverlay" />
2121

2222
</com.google.android.material.appbar.AppBarLayout>
2323

‎app/src/main/res/layout/content_settings.xml

+48-12
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,61 @@
1414
android:textSize="16sp"
1515
android:textStyle="bold" />
1616

17-
<LinearLayout
17+
<TableLayout
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
2020
android:layout_margin="5dp"
2121
android:gravity="center">
2222

23-
<TextView
24-
android:layout_width="wrap_content"
25-
android:layout_height="wrap_content"
26-
android:text="@string/text_language"
27-
android:textSize="16sp" />
23+
<TableRow android:gravity="center">
2824

29-
<Spinner
30-
android:id="@+id/SpnLanguages"
31-
android:layout_width="wrap_content"
32-
android:layout_height="wrap_content"
33-
android:entries="@array/array_languages" />
25+
<TextView
26+
android:layout_width="wrap_content"
27+
android:layout_height="wrap_content"
28+
android:text="@string/text_language"
29+
android:textSize="16sp" />
3430

35-
</LinearLayout>
31+
<Spinner
32+
android:id="@+id/SpnLanguages"
33+
android:layout_width="wrap_content"
34+
android:layout_height="wrap_content"
35+
android:entries="@array/array_languages" />
36+
</TableRow>
37+
38+
<TableRow android:gravity="center">
39+
<TextView
40+
android:layout_width="wrap_content"
41+
android:layout_height="wrap_content"
42+
android:text="@string/theme"
43+
android:textSize="16sp" />
44+
45+
<RadioGroup
46+
android:id="@+id/RgrThemes"
47+
android:layout_width="match_parent"
48+
android:layout_height="wrap_content"
49+
android:orientation="horizontal">
50+
<RadioButton
51+
android:id="@+id/RdbDarkTheme"
52+
android:layout_width="wrap_content"
53+
android:layout_height="wrap_content"
54+
android:textSize="16sp"
55+
android:text="@string/dark" />
56+
<RadioButton
57+
android:id="@+id/RdbLightTheme"
58+
android:layout_width="wrap_content"
59+
android:layout_height="wrap_content"
60+
android:textSize="16sp"
61+
android:text="@string/light" />
62+
<RadioButton
63+
android:id="@+id/RdbDefaultTheme"
64+
android:layout_width="wrap_content"
65+
android:layout_height="wrap_content"
66+
android:textSize="16sp"
67+
android:text="@string/defaultTheme" />
68+
</RadioGroup>
69+
</TableRow>
70+
71+
</TableLayout>
3672

3773
<TextView
3874
android:layout_width="match_parent"

‎app/src/main/res/values-de/strings.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<string name="nav_tools">Werkzeuge</string>
1919
<string name="navigation_drawer_close">Schliessschloss schließen</string>
2020
<string name="navigation_drawer_open">Öffnen Sie die Schublade</string>
21-
<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 © 2020 CodeDead</string>
21+
<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>
2222
<string name="text_compare">Vergleichen:</string>
2323
<string name="text_compare_hash">Hash vergleichen</string>
2424
<string name="text_compare_hint">Lege deinen Hash hier</string>
@@ -46,4 +46,8 @@
4646
<string name="error_copy_file">Es kann keine Kopie der ausgewählten Datei erstellt werden!</string>
4747
<string name="error_open_file">Die ausgewählte Datei kann nicht geöffnet werden!</string>
4848
<string name="error_no_file">Es wurde keine Datei ausgewählt!</string>
49+
<string name="theme">Thema</string>
50+
<string name="light">Licht</string>
51+
<string name="dark">Dunkel</string>
52+
<string name="defaultTheme">Standard</string>
4953
</resources>

‎app/src/main/res/values-fr/strings.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<string name="text_compare">Comparer:</string>
3333
<string name="navigation_drawer_open">Ouvrir le tiroir de navigation</string>
3434
<string name="navigation_drawer_close">Fermer le tiroir de navigation</string>
35-
<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 © 2020 CodeDead</string>
35+
<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>
3636
<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>
3737
<string name="text_send_mail">Envoyez-nous un e-mail</string>
3838
<string name="alert_review_text">Envisagez de laisser un commentaire si vous aimez cette application!</string>
@@ -46,4 +46,8 @@
4646
<string name="error_copy_file">Impossible de créer une copie du fichier sélectionné!</string>
4747
<string name="error_open_file">Impossible d\'ouvrir le fichier sélectionné!</string>
4848
<string name="error_no_file">Aucun fichier n\'a été sélectionné!</string>
49+
<string name="theme">Thème</string>
50+
<string name="light">Lumière</string>
51+
<string name="dark">Foncé</string>
52+
<string name="defaultTheme">Défaut</string>
4953
</resources>

‎app/src/main/res/values-it/strings.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<string name="button_support">Supporto</string>
2727
<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>
2828
<string name="nav_tools">Strumenti</string>
29-
<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 © 2020 CodeDead</string>
29+
<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>
3030
<string name="toast_settings_reset">Tutte le impostazioni sono state ripristinate!</string>
3131
<string name="toast_settings_save">Tutte le impostazioni sono state salvate!</string>
3232
<string name="text_interface">Interfaccia</string>
@@ -46,4 +46,8 @@
4646
<string name="error_copy_file">Impossibile creare una copia del file selezionato!</string>
4747
<string name="error_open_file">Impossibile aprire il file selezionato!</string>
4848
<string name="error_no_file">Nessun file è stato selezionato!</string>
49+
<string name="theme">Tema</string>
50+
<string name="light">Luce</string>
51+
<string name="dark">Buio</string>
52+
<string name="defaultTheme">Predefinito</string>
4953
</resources>

‎app/src/main/res/values-night/themes.xml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<resources xmlns:tools="http://schemas.android.com/tools">
2+
<!-- Base application theme. -->
3+
<style name="Theme.DeadHash" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
4+
<!-- Primary brand color. -->
5+
<item name="colorPrimary">@color/purple_500</item>
6+
<item name="colorPrimaryVariant">@color/purple_700</item>
7+
<item name="colorOnPrimary">@color/black</item>
8+
<!-- Secondary brand color. -->
9+
<item name="colorSecondary">@color/teal_200</item>
10+
<item name="colorSecondaryVariant">@color/teal_200</item>
11+
<item name="colorOnSecondary">@color/black</item>
12+
<!-- Status bar color. -->
13+
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
14+
<!-- Customize your theme here. -->
15+
</style>
16+
</resources>

0 commit comments

Comments
 (0)