From 63c526244432732fef64c4e4bd3f6ddf3736c888 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 25 Sep 2023 15:45:33 +0300 Subject: [PATCH] conflicts fixes --- app/proguard-rules.pro | 3 ++- .../activities/LockCreationActivity.java | 19 ++++++++++++------ .../applock/activities/UnlockActivity.java | 20 +++++++++++++------ .../guardanis/applock/pin/PINInputView.java | 2 +- .../java/com/vk/api/audio/AudioGetLyrics.java | 1 - 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 7e882ce4f..b5d9643ec 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -43,4 +43,5 @@ -keep class com.vtosters.lite.** { *; } -keep class com.vk.** { *; } --keep class bruhcollective.itaysonlab.libvkx.client.** { *; } \ No newline at end of file +-keep class bruhcollective.itaysonlab.libvkx.client.** { *; } +-keep class com.guardanis.applock.** { *; } \ No newline at end of file diff --git a/app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java b/app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java index 6fc2fb59e..d3113f2c7 100644 --- a/app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java +++ b/app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java @@ -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); + } } diff --git a/app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java b/app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java index cef4afddf..da1b4c57f 100644 --- a/app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java +++ b/app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java @@ -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); + } } diff --git a/app/src/main/java/com/guardanis/applock/pin/PINInputView.java b/app/src/main/java/com/guardanis/applock/pin/PINInputView.java index 93569a12e..0c2420ad0 100644 --- a/app/src/main/java/com/guardanis/applock/pin/PINInputView.java +++ b/app/src/main/java/com/guardanis/applock/pin/PINInputView.java @@ -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 { diff --git a/app/src/main/java/com/vk/api/audio/AudioGetLyrics.java b/app/src/main/java/com/vk/api/audio/AudioGetLyrics.java index dd7b8c0ef..942aee620 100644 --- a/app/src/main/java/com/vk/api/audio/AudioGetLyrics.java +++ b/app/src/main/java/com/vk/api/audio/AudioGetLyrics.java @@ -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 { private final MusicTrack musicTrack;