y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflicts fixes

Browse Source
This commit is contained in:
gdlbo
2023-09-25 15:45:33 +03:00
parent 9074e80478
commit 63c5262444
5 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/proguard-rules.pro
Vendored
+2 -1
View File
@@ -43,4 +43,5 @@
-keep class com.vtosters.lite.** { *; }
-keep class com.vk.** { *; }
-keep class bruhcollective.itaysonlab.libvkx.client.** { *; }
-keep class bruhcollective.itaysonlab.libvkx.client.** { *; }
-keep class com.guardanis.applock.** { *; }
app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java
+13 -6
View File
@@ -1,5 +1,8 @@
package com.guardanis.applock.activities;
import static ru.vtosters.hooks.other.ThemesUtils.getBackgroundContent;
import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr;
import static ru.vtosters.hooks.other.ThemesUtils.isDarkTheme;
import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
import android.app.Activity;
@@ -13,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity;
import com.guardanis.applock.views.LockCreationViewController;
import ru.vtosters.lite.utils.ThemesUtils;
public class LockCreationActivity extends AppCompatActivity implements LockCreationViewController.Delegate {
@@ -24,17 +26,17 @@ public class LockCreationActivity extends AppCompatActivity implements LockCreat
super.onCreate(savedInstance);
setContentView(getIdentifier("applock__activity_lock_creation", "layout"));
findViewById(getIdentifier("applock__activity_lock_creation", "id")).setBackgroundColor(ThemesUtils.getBackgroundContent());
((TextView) findViewById(getIdentifier("pin__description", "id"))).setTextColor(ThemesUtils.getTextAttr());
findViewById(getIdentifier("applock__activity_lock_creation", "id")).setBackgroundColor(getBackgroundContent());
((TextView) findViewById(getIdentifier("pin__description", "id"))).setTextColor(getTextAttr());
this.viewController = new LockCreationViewController(this, findViewById(getIdentifier("pin__container", "id")));
this.viewController.setDelegate(this);
this.viewController.setupRootFlow();
this.getWindow().setStatusBarColor(ThemesUtils.getBackgroundContent());
this.getWindow().setNavigationBarColor(ThemesUtils.getBackgroundContent());
this.getWindow().setStatusBarColor(getBackgroundContent());
this.getWindow().setNavigationBarColor(getBackgroundContent());
if (!ThemesUtils.isDarkTheme()) {
if (!isDarkTheme()) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
this.getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS);
} else {
@@ -48,4 +50,9 @@ public class LockCreationActivity extends AppCompatActivity implements LockCreat
setResult(Activity.RESULT_OK);
finish();
}
@Override
public void onPointerCaptureChanged(boolean hasCapture) {
super.onPointerCaptureChanged(hasCapture);
}
}
app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java
+14 -6
View File
@@ -13,7 +13,10 @@ import androidx.appcompat.app.AppCompatActivity;
import com.guardanis.applock.views.UnlockViewController;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.lite.utils.ThemesUtils;
import static ru.vtosters.hooks.other.ThemesUtils.getBackgroundContent;
import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr;
import static ru.vtosters.hooks.other.ThemesUtils.isDarkTheme;
public class UnlockActivity extends AppCompatActivity implements UnlockViewController.Delegate {
@@ -26,8 +29,8 @@ public class UnlockActivity extends AppCompatActivity implements UnlockViewContr
super.onCreate(savedInstance);
setContentView(AndroidUtils.getIdentifier("applock__activity_unlock", "layout"));
findViewById(AndroidUtils.getIdentifier("applock__activity_unlock", "id")).setBackgroundColor(ThemesUtils.getBackgroundContent());
((TextView) findViewById(AndroidUtils.getIdentifier("pin__description", "id"))).setTextColor(ThemesUtils.getTextAttr());
findViewById(AndroidUtils.getIdentifier("applock__activity_unlock", "id")).setBackgroundColor(getBackgroundContent());
((TextView) findViewById(AndroidUtils.getIdentifier("pin__description", "id"))).setTextColor(getTextAttr());
this.viewController = new UnlockViewController(this, findViewById(AndroidUtils.getIdentifier("pin__container", "id")));
this.viewController.setAutoAuthorizationEnabled(false); // Disable auto authorization so fingerprint doesn't crash onResume
@@ -35,10 +38,10 @@ public class UnlockActivity extends AppCompatActivity implements UnlockViewContr
this.viewController.setupRootFlow();
this.viewController.setAutoAuthorizationEnabled(true);
this.getWindow().setStatusBarColor(ThemesUtils.getBackgroundContent());
this.getWindow().setNavigationBarColor(ThemesUtils.getBackgroundContent());
this.getWindow().setStatusBarColor(getBackgroundContent());
this.getWindow().setNavigationBarColor(getBackgroundContent());
if (!ThemesUtils.isDarkTheme()) {
if (!isDarkTheme()) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
this.getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS);
} else {
@@ -77,4 +80,9 @@ public class UnlockActivity extends AppCompatActivity implements UnlockViewContr
setResult(Activity.RESULT_CANCELED);
finish();
}
@Override
public void onPointerCaptureChanged(boolean hasCapture) {
super.onPointerCaptureChanged(hasCapture);
}
}
app/src/main/java/com/guardanis/applock/pin/PINInputView.java
+1 -1
View File
@@ -16,8 +16,8 @@ import android.widget.TextView;
import java.util.WeakHashMap;
import com.guardanis.applock.AppLock;
import ru.vtosters.hooks.other.ThemesUtils;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.lite.utils.ThemesUtils;
public class PINInputView extends LinearLayout implements TextWatcher {
app/src/main/java/com/vk/api/audio/AudioGetLyrics.java
-1
View File
@@ -17,7 +17,6 @@ import java.util.ArrayList;
import ru.vtosters.lite.music.Genius;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.lite.utils.Preferences;
public class AudioGetLyrics extends ApiRequest<AudioGetLyrics.a> {
private final MusicTrack musicTrack;