From d2d57b97e16704df580b4e49b78a3c40e89cf295 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sun, 26 Nov 2023 04:27:58 -0700 Subject: [PATCH] late night changes --- data/src/main/assets/changelog.json | 2 +- presentation/build.gradle | 2 +- .../common/androidxcompat/RxDrawerLayout.java | 69 ------------------- .../QKSMS/common/androidxcompat/drawerOpen.kt | 1 + 4 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java diff --git a/data/src/main/assets/changelog.json b/data/src/main/assets/changelog.json index a5d71b80..a66f5821 100644 --- a/data/src/main/assets/changelog.json +++ b/data/src/main/assets/changelog.json @@ -2,7 +2,7 @@ [ { "versionCode": "2221", - "versionName": "4.0.0", + "versionName": "4.0.4", "fixed": [ "Revived!", "Crash when deleting scheduled messages", diff --git a/presentation/build.gradle b/presentation/build.gradle index de2be065..c7a5eb26 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -31,7 +31,7 @@ android { minSdkVersion 23 targetSdkVersion 33 versionCode 2221 - versionName "4.0.0" + versionName "4.0.4" setProperty("archivesBaseName", "QKSMS-v${versionName}") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java deleted file mode 100644 index 0e11544b..00000000 --- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.common.androidxcompat; - -import androidx.annotation.CheckResult; -import androidx.annotation.NonNull; -import androidx.drawerlayout.widget.DrawerLayout; -import com.jakewharton.rxbinding2.InitialValueObservable; -import io.reactivex.functions.Consumer; - -import static com.jakewharton.rxbinding2.internal.Preconditions.checkNotNull; - -public final class RxDrawerLayout { - /** - * Create an observable of the open state of the drawer of {@code view}. - *

- * Warning: The created observable keeps a strong reference to {@code view}. Unsubscribe - * to free this reference. - *

- * Note: A value will be emitted immediately on subscribe. - */ - @CheckResult - @NonNull - public static InitialValueObservable drawerOpen( - @NonNull DrawerLayout view, int gravity) { - checkNotNull(view, "view == null"); - return new DrawerLayoutDrawerOpenedObservable(view, gravity); - } - - /** - * An action which sets whether the drawer with {@code gravity} of {@code view} is open. - *

- * Warning: The created observable keeps a strong reference to {@code view}. Unsubscribe - * to free this reference. - */ - @CheckResult @NonNull public static Consumer open( - @NonNull final DrawerLayout view, final int gravity) { - checkNotNull(view, "view == null"); - return new Consumer() { - @Override public void accept(Boolean aBoolean) { - if (aBoolean) { - view.openDrawer(gravity); - } else { - view.closeDrawer(gravity); - } - } - }; - } - - private RxDrawerLayout() { - throw new AssertionError("No instances."); - } -} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt index de22b50c..b7d46abd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt @@ -23,6 +23,7 @@ package dev.octoshrimpy.quik.common.androidxcompat import androidx.annotation.CheckResult import androidx.drawerlayout.widget.DrawerLayout import com.jakewharton.rxbinding2.InitialValueObservable +import com.jakewharton.rxbinding2.support.v4.widget.RxDrawerLayout import io.reactivex.functions.Consumer /**