Skip to content

Commit dd30fbf

Browse files
mariodantasmariodantas
committed
Migrated Gradle version to 7.5, Migrated to AndroidX, added more languages
1 parent 8028d73 commit dd30fbf

File tree

12 files changed

+188
-105
lines changed

12 files changed

+188
-105
lines changed

‎easypasscodelock/src/main/java/p32929/easypasscodelock/Activities/LockscreenActivity.java

+81-87
Original file line numberDiff line numberDiff line change
@@ -71,117 +71,111 @@ private void initViews() {
7171
textViewHAHA = findViewById(R.id.span_text);
7272
textViewDot = findViewById(R.id.dotText);
7373
TextView textViewForgotPassword = findViewById(R.id.forgot_pass_textview);
74-
Button buttonTick = findViewById(R.id.lbtnEnter);
74+
Button buttonEnter = findViewById(R.id.lbtnEnter);
7575
ImageButton imageButtonDelete = findViewById(R.id.lbtnDelete);
7676
RelativeLayout relativeLayoutBackground = findViewById(R.id.background_layout);
7777
relativeLayoutBackground.setBackgroundColor(EasyLock.backgroundColor);
7878

7979
textViewForgotPassword.setOnClickListener(EasyLock.onClickListener);
8080

81-
imageButtonDelete.setOnClickListener(new View.OnClickListener() {
82-
@Override
83-
public void onClick(View view) {
84-
if (passString.length() > 0)
85-
passString = passString.substring(0, passString.length() - 1);
86-
textViewDot.setText(passString);
87-
}
81+
imageButtonDelete.setOnClickListener(view -> {
82+
if (passString.length() > 0)
83+
passString = passString.substring(0, passString.length() - 1);
84+
textViewDot.setText(passString);
8885
});
8986

90-
buttonTick.setOnClickListener(new View.OnClickListener() {
91-
@Override
92-
public void onClick(View view) {
87+
buttonEnter.setOnClickListener(view -> {
88+
89+
//
90+
switch (status) {
91+
case checkStatus:
92+
if (passString != null && passString.equals(realPass)) {
93+
finish();
94+
} else {
95+
passString = "";
96+
textViewDot.setText(passString);
97+
Toast.makeText(this, getString(R.string.incorrect_password_txt), Toast.LENGTH_SHORT).show();
98+
}
99+
break;
93100

94101
//
95-
switch (status) {
96-
case checkStatus:
97-
if (passString.equals(realPass)) {
98-
finish();
99-
} else {
100-
passString = "";
101-
textViewDot.setText(passString);
102-
Toast.makeText(LockscreenActivity.this, getString(R.string.incorrect_password_txt), Toast.LENGTH_SHORT).show();
103-
}
104-
break;
102+
case setStatus:
103+
//
104+
tempPass = passString;
105+
passString = "";
106+
status = setStatus1;
105107

108+
textViewHAHA.setText(R.string.confirm_password_txt);
109+
textViewDot.setText(passString);
110+
break;
111+
112+
//
113+
case setStatus1:
106114
//
107-
case setStatus:
108-
//
115+
if (passString.equals(tempPass)) {
116+
EasylockSP.put("password", passString);
117+
Toast.makeText(LockscreenActivity.this, getString(R.string.password_is_set_txt), Toast.LENGTH_SHORT).show();
118+
gotoActivity();
119+
} else {
120+
109121
tempPass = passString;
110122
passString = "";
111-
status = setStatus1;
123+
tempPass = "";
124+
status = setStatus;
112125

113-
textViewHAHA.setText(R.string.confirm_password_txt);
114126
textViewDot.setText(passString);
115-
break;
116-
117-
//
118-
case setStatus1:
119-
//
120-
if (passString.equals(tempPass)) {
121-
EasylockSP.put("password", passString);
122-
Toast.makeText(LockscreenActivity.this, getString(R.string.password_is_set_txt), Toast.LENGTH_SHORT).show();
123-
gotoActivity();
124-
} else {
125-
126-
tempPass = passString;
127-
passString = "";
128-
tempPass = "";
129-
status = setStatus;
130-
131-
textViewDot.setText(passString);
132-
textViewHAHA.setText(R.string.enter_a_new_password_txt);
133-
Toast.makeText(LockscreenActivity.this, getString(R.string.please_enter_a_new_password_again_txt), Toast.LENGTH_SHORT).show();
134-
}
135-
break;
136-
137-
//
138-
case changeStatus:
139-
if (passString.equals(realPass)) {
140-
tempPass = passString;
141-
passString = "";
142-
tempPass = "";
143-
status = changeStatus1;
144-
145-
textViewHAHA.setText(R.string.enter_a_new_password_txt);
146-
textViewDot.setText(passString);
147-
} else {
148-
passString = "";
149-
textViewDot.setText(passString);
150-
Toast.makeText(LockscreenActivity.this, getString(R.string.please_enter_current_password_txt), Toast.LENGTH_SHORT).show();
151-
}
152-
break;
127+
textViewHAHA.setText(R.string.enter_a_new_password_txt);
128+
Toast.makeText(LockscreenActivity.this, getString(R.string.please_enter_a_new_password_again_txt), Toast.LENGTH_SHORT).show();
129+
}
130+
break;
153131

154-
//
155-
case changeStatus1:
132+
//
133+
case changeStatus:
134+
if (passString.equals(realPass)) {
156135
tempPass = passString;
157136
passString = "";
158-
status = changeStatus2;
137+
tempPass = "";
138+
status = changeStatus1;
159139

160-
textViewHAHA.setText(R.string.confirm_password_txt);
140+
textViewHAHA.setText(R.string.enter_a_new_password_txt);
161141
textViewDot.setText(passString);
162-
break;
142+
} else {
143+
passString = "";
144+
textViewDot.setText(passString);
145+
Toast.makeText(LockscreenActivity.this, getString(R.string.please_enter_current_password_txt), Toast.LENGTH_SHORT).show();
146+
}
147+
break;
163148

164-
//
165-
case changeStatus2:
166-
if (passString.equals(tempPass)) {
167-
EasylockSP.put("password", passString);
168-
Toast.makeText(LockscreenActivity.this, getString(R.string.password_changed_txt), Toast.LENGTH_SHORT).show();
169-
gotoActivity();
170-
} else {
171-
172-
tempPass = passString;
173-
passString = "";
174-
tempPass = "";
175-
status = changeStatus1;
176-
177-
textViewDot.setText(passString);
178-
textViewHAHA.setText(R.string.enter_a_new_password_txt);
179-
Toast.makeText(LockscreenActivity.this, getString(R.string.please_enter_a_new_password_again_txt), Toast.LENGTH_SHORT).show();
180-
}
181-
break;
182-
}
149+
//
150+
case changeStatus1:
151+
tempPass = passString;
152+
passString = "";
153+
status = changeStatus2;
154+
155+
textViewHAHA.setText(R.string.confirm_password_txt);
156+
textViewDot.setText(passString);
157+
break;
183158

159+
//
160+
case changeStatus2:
161+
if (passString.equals(tempPass)) {
162+
EasylockSP.put("password", passString);
163+
Toast.makeText(LockscreenActivity.this, getString(R.string.password_changed_txt), Toast.LENGTH_SHORT).show();
164+
gotoActivity();
165+
} else {
166+
167+
tempPass = passString;
168+
passString = "";
169+
tempPass = "";
170+
status = changeStatus1;
171+
172+
textViewDot.setText(passString);
173+
textViewHAHA.setText(R.string.enter_a_new_password_txt);
174+
Toast.makeText(LockscreenActivity.this, getString(R.string.please_enter_a_new_password_again_txt), Toast.LENGTH_SHORT).show();
175+
}
176+
break;
184177
}
178+
185179
});
186180

187181
for (int passButtonId : passButtonIds) {

‎easypasscodelock/src/main/java/p32929/easypasscodelock/Utils/EasylockSP.java

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package p32929.easypasscodelock.Utils;
22

3+
import android.annotation.SuppressLint;
34
import android.content.Context;
45
import android.content.SharedPreferences;
56

@@ -18,24 +19,29 @@ public static void init(Context context) {
1819
}
1920

2021
//
22+
@SuppressLint("ApplySharedPref")
2123
public static void put(String title, boolean value) {
22-
sharedPreferences.edit().putBoolean(title, value).apply();
24+
sharedPreferences.edit().putBoolean(title, value).commit();
2325
}
2426

27+
@SuppressLint("ApplySharedPref")
2528
public static void put(String title, float value) {
26-
sharedPreferences.edit().putFloat(title, value).apply();
29+
sharedPreferences.edit().putFloat(title, value).commit();
2730
}
2831

32+
@SuppressLint("ApplySharedPref")
2933
public static void put(String title, int value) {
30-
sharedPreferences.edit().putInt(title, value).apply();
34+
sharedPreferences.edit().putInt(title, value).commit();
3135
}
3236

37+
@SuppressLint("ApplySharedPref")
3338
public static void put(String title, long value) {
34-
sharedPreferences.edit().putLong(title, value).apply();
39+
sharedPreferences.edit().putLong(title, value).commit();
3540
}
3641

42+
@SuppressLint("ApplySharedPref")
3743
public static void put(String title, String value) {
38-
sharedPreferences.edit().putString(title, value).apply();
44+
sharedPreferences.edit().putString(title, value).commit();
3945
}
4046

4147
//
@@ -61,7 +67,7 @@ public static String getString(String title, String defaultValue) {
6167

6268
//
6369
public static void clearAll() {
64-
sharedPreferences.edit().clear().apply();
70+
sharedPreferences.edit().clear().commit();
6571
}
6672

6773
}

‎easypasscodelock/src/main/java/p32929/easypasscodelock/Utils/LockscreenHandler.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
public class LockscreenHandler extends AppCompatActivity implements ComponentCallbacks2 {
17-
private static boolean wentToBg = false;
17+
private static boolean WentToBackground = false;
1818
private final String TAG = "EasyLock";
1919
private String packageName = "";
2020

@@ -23,28 +23,27 @@ public void onTrimMemory(int i) {
2323
super.onTrimMemory(i);
2424
ActivityManager am = (ActivityManager) this.getSystemService(ACTIVITY_SERVICE);
2525
List<ActivityManager.RunningTaskInfo> taskInfo = am.getRunningTasks(1);
26-
Log.d("topActivity", "CURRENT Activity ::"
27-
+ taskInfo.get(0).topActivity.getClassName());
26+
Log.d("Activity", "CURRENT Activity ::" + taskInfo.get(0).topActivity.getClassName());
2827

2928
if (taskInfo.size() > 0) {
3029
ComponentName componentInfo = taskInfo.get(0).topActivity;
3130
packageName = componentInfo.getPackageName();
3231
}
3332
if (!packageName.equals(getPackageName()) && i == ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) {
3433
// We're in the Background
35-
wentToBg = true;
36-
Log.d(TAG, "wentToBg: " + wentToBg);
34+
WentToBackground = true;
35+
Log.d(TAG, "WentToBackground: " + WentToBackground);
3736
}
3837
}
3938

4039
@Override
4140
protected void onResume() {
4241
super.onResume();
4342

44-
if (wentToBg && EasylockSP.getString("password", null) != null) {
43+
if (WentToBackground && EasylockSP.getString("password", null) != null) {
4544
// We're in the foreground & password != null
46-
wentToBg = false;
47-
Log.d(TAG, "wentToBg: " + wentToBg);
45+
WentToBackground = false;
46+
Log.d(TAG, "WentToBackground: " + WentToBackground);
4847

4948
EasyLock.checkPassword(this);
5049
}

‎easypasscodelock/src/main/res/layout/activity_easy_lockscreen.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
android:height="48dp"
5757
android:inputType="textPassword"
5858
android:minHeight="48dp"
59-
android:text="Dot"
6059
android:textAlignment="textEnd"
6160
android:textColor="#FFFFFF"
6261
android:textSize="24sp" />
@@ -67,7 +66,7 @@
6766
android:layout_width="48dp"
6867
android:layout_height="48dp"
6968
android:layout_margin="8dp"
70-
android:contentDescription="@string/delete_txt"
69+
android:contentDescription="@string/clear_txt"
7170
android:src="@mipmap/ic_delete_forever_white_24dp" />
7271

7372
</LinearLayout>

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

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="enter_a_new_password_txt">Geben Sie ein neues Kennwort ein</string>
4+
<string name="confirm_password_txt">Bestätigen Sie das Passwort</string>
5+
<string name="password_changed_txt">Passwort geändert</string>
6+
<string name="please_enter_a_new_password_again_txt">Geben Sie erneut ein neues Passwort ein</string>
7+
<string name="max_8_characters_txt">Maximal 8 Zahlen</string>
8+
<string name="please_enter_current_password_txt">Aktuelles Passwort eingeben</string>
9+
<string name="password_is_set_txt">Passwort erfolgreich registriert</string>
10+
<string name="incorrect_password_txt">falsches Passwort</string>
11+
<string name="password_disabled_txt">Passwort deaktiviert</string>
12+
<string name="enter_your_password_txt">Geben Sie Ihr Passwort ein</string>
13+
<string name="clear_txt">Löschen</string>
14+
<string name="forgot_password_txt">Haben Sie Ihr Passwort vergessen ?</string>
15+
</resources>

‎easypasscodelock/src/main/res/values-es/strings.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<resources>
2+
<string name="enter_a_new_password_txt">Introduzca una nueva contraseña</string>
3+
<string name="confirm_password_txt">confirmar Contraseña</string>
4+
<string name="password_changed_txt">Contraseña cambiada</string>
5+
<string name="please_enter_a_new_password_again_txt">Ingrese una nueva contraseña nuevamente</string>
6+
<string name="max_8_characters_txt">8 caracteres como máximo</string>
7+
<string name="please_enter_current_password_txt">Ingrese la contraseña actual</string>
8+
<string name="password_is_set_txt">La contraseña está configurada</string>
9+
<string name="incorrect_password_txt">Contraseña incorrecta</string>
10+
<string name="password_disabled_txt">Contraseña deshabilitada</string>
11+
<string name="enter_your_password_txt">Ingresa tu contraseña</string>
12+
<string name="clear_txt">Borrar</string>
13+
<string name="forgot_password_txt">Has olvidado tu contraseña \?</string>
14+
</resources>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<string name="incorrect_password_txt">Mot de passe incorrect</string>
1111
<string name="password_disabled_txt">Mot de passe désactivé</string>
1212
<string name="enter_your_password_txt">Entrez votre mot de passe</string>
13-
<string name="delete_txt">Effacer</string>
13+
<string name="clear_txt">Effacer</string>
1414
<string name="forgot_password_txt">Mot de passe oublié ?</string>
1515
</resources>

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

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<resources>
2+
<string name="enter_a_new_password_txt">Inserire una nuova password</string>
3+
<string name="confirm_password_txt">Conferma password</string>
4+
<string name="password_changed_txt">Password cambiata</string>
5+
<string name="please_enter_a_new_password_again_txt">Inserisci di nuovo una nuova password</string>
6+
<string name="max_8_characters_txt">Massimo 8 caratteri</string>
7+
<string name="please_enter_current_password_txt">Inserisci la password corrente</string>
8+
<string name="password_is_set_txt">La password è impostata</string>
9+
<string name="incorrect_password_txt">Password errata</string>
10+
<string name="password_disabled_txt">Password disabilitata</string>
11+
<string name="enter_your_password_txt">Inserisci la tua password</string>
12+
<string name="clear_txt">Eliminare</string>
13+
<string name="forgot_password_txt">Ha dimenticato la password ?</string>
14+
</resources>

‎easypasscodelock/src/main/res/values-pl/strings.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<resources>
2+
<string name="enter_a_new_password_txt">Wpisz nowe hasło</string>
3+
<string name="confirm_password_txt">Potwierdź hasło</string>
4+
<string name="password_changed_txt">Hasło zostało zmienione</string>
5+
<string name="please_enter_a_new_password_again_txt">Wprowadź ponownie nowe hasło</string>
6+
<string name="max_8_characters_txt">Maksymalnie 8 znaków</string>
7+
<string name="please_enter_current_password_txt">Wprowadź aktualne hasło</string>
8+
<string name="password_is_set_txt">Hasło jest ustawione</string>
9+
<string name="incorrect_password_txt">Niepoprawne hasło</string>
10+
<string name="password_disabled_txt">Hasło wyłączone</string>
11+
<string name="enter_your_password_txt">Wprowadź hasło</string>
12+
<string name="clear_txt">Usuwać</string>
13+
<string name="forgot_password_txt">Zapomniałeś hasła \?</string>
14+
</resources>

0 commit comments

Comments
 (0)