From 8be0ea740cb882587c618347623a58477ad78599 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Wed, 23 Aug 2023 20:11:52 +0530 Subject: [PATCH] Drop unused code since migration to navigation components Signed-off-by: Aayush Gupta --- .../java/com/aurora/extensions/Activity.kt | 66 ------------------- .../java/com/aurora/extensions/ThemeEngine.kt | 24 +------ .../store/data/service/NotificationService.kt | 1 - .../view/epoxy/views/details/BadgeView.kt | 11 ---- .../view/epoxy/views/details/MoreBadgeView.kt | 11 ---- .../view/ui/onboarding/AccentFragment.kt | 2 +- .../store/view/ui/onboarding/ThemeFragment.kt | 2 +- .../store/view/ui/preferences/UIPreference.kt | 4 +- 8 files changed, 6 insertions(+), 115 deletions(-) delete mode 100644 app/src/main/java/com/aurora/extensions/Activity.kt diff --git a/app/src/main/java/com/aurora/extensions/Activity.kt b/app/src/main/java/com/aurora/extensions/Activity.kt deleted file mode 100644 index 28cf511b8..000000000 --- a/app/src/main/java/com/aurora/extensions/Activity.kt +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Aurora Store - * Copyright (C) 2021, Rahul Kumar Patel - * - * Aurora Store 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 2 of the License, or - * (at your option) any later version. - * - * Aurora Store 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 Aurora Store. If not, see . - * - */ - -package com.aurora.extensions - -import android.app.Activity -import android.content.Intent -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity - - -fun AppCompatActivity.restart() { - val intent = intent - overridePendingTransition(0, 0) - intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION) - finish() - overridePendingTransition(0, 0) - startActivity(intent) -} - -inline fun Activity.startActivity(): Unit = - this.startActivity(newIntent()) - -inline fun Activity.startActivity(flags: Int): Unit = - this.startActivity(newIntent(flags)) - -inline fun Activity.startActivity(extras: Bundle): Unit = - this.startActivity(newIntent(extras)) - -inline fun Activity.startActivity(flags: Int, extras: Bundle): Unit = - this.startActivity(newIntent(flags, extras)) - -inline fun Activity.startActivityForResult(requestCode: Int): Unit = - this.startActivityForResult(newIntent(), requestCode) - -inline fun Activity.startActivityForResult( - requestCode: Int, - flags: Int -): Unit = - this.startActivityForResult(newIntent(flags), requestCode) - -inline fun Activity.startActivityForResult( - extras: Bundle, requestCode: Int -): Unit = - this.startActivityForResult(newIntent(extras), requestCode) - -inline fun Activity.startActivityForResult( - extras: Bundle, requestCode: Int, flags: Int -): Unit = - this.startActivityForResult(newIntent(flags, extras), requestCode) diff --git a/app/src/main/java/com/aurora/extensions/ThemeEngine.kt b/app/src/main/java/com/aurora/extensions/ThemeEngine.kt index 6f3439aff..bf441b37f 100644 --- a/app/src/main/java/com/aurora/extensions/ThemeEngine.kt +++ b/app/src/main/java/com/aurora/extensions/ThemeEngine.kt @@ -19,7 +19,6 @@ package com.aurora.extensions -import android.content.Intent import android.content.res.Configuration import android.graphics.Color import android.os.Build @@ -30,15 +29,9 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.core.graphics.ColorUtils import androidx.fragment.app.Fragment -import com.aurora.Constants -import com.aurora.store.R import com.aurora.store.util.CommonUtil -fun Fragment.applyTheme( - themeId: Int, - shouldApplyTransition: Boolean = true, - position: Int = 2 -) { +fun Fragment.applyTheme(themeId: Int) { val themeStyle = CommonUtil.getThemeStyleById(themeId) if (themeId == 0) { @@ -50,26 +43,13 @@ fun Fragment.applyTheme( /*Apply Theme*/ requireContext().theme.applyStyle(themeStyle, true) - - /*Apply transition only on AppCompatActivity*/ - if (shouldApplyTransition) - (requireActivity() as AppCompatActivity).transitionRecreate(position) - else - (requireActivity() as AppCompatActivity).recreate() + (requireActivity() as AppCompatActivity).recreate() if (themeId == 1) { (requireActivity() as AppCompatActivity).setLightConfiguration() } } -fun AppCompatActivity.transitionRecreate(position: Int = 2) { - val intent = Intent(this, javaClass) - intent.putExtra(Constants.INT_EXTRA, position) - //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - startActivity(intent) - overridePendingTransition(R.anim.fade_in, R.anim.fade_out) -} - fun AppCompatActivity.applyTheme(themeId: Int, accentId: Int = 1) { val themeStyle = CommonUtil.getThemeStyleById(themeId) val accentStyle = CommonUtil.getAccentStyleById(accentId) diff --git a/app/src/main/java/com/aurora/store/data/service/NotificationService.kt b/app/src/main/java/com/aurora/store/data/service/NotificationService.kt index be67ef5ad..954f48038 100644 --- a/app/src/main/java/com/aurora/store/data/service/NotificationService.kt +++ b/app/src/main/java/com/aurora/store/data/service/NotificationService.kt @@ -250,7 +250,6 @@ class NotificationService : Service() { } Status.PAUSED -> { - val pauseString = getString(R.string.download_paused) progressBigText.bigText( getString( R.string.download_paused, diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt index d9b233526..bed34cf73 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt @@ -23,10 +23,8 @@ import android.content.Context import android.util.AttributeSet import android.widget.RelativeLayout import coil.load -import com.airbnb.epoxy.CallbackProp import com.airbnb.epoxy.ModelProp import com.airbnb.epoxy.ModelView -import com.airbnb.epoxy.OnViewRecycled import com.aurora.gplayapi.data.models.details.Badge import com.aurora.store.R import com.aurora.store.databinding.ViewBadgeBinding @@ -77,13 +75,4 @@ class BadgeView : RelativeLayout { B.img.load(it.url) } } - - @CallbackProp - fun click(onClickListener: OnClickListener?) { - - } - - @OnViewRecycled - fun clear() { - } } diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt index 95c42b12c..a886c32f0 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt @@ -24,10 +24,8 @@ import android.util.AttributeSet import android.widget.RelativeLayout import androidx.core.text.HtmlCompat import coil.load -import com.airbnb.epoxy.CallbackProp import com.airbnb.epoxy.ModelProp import com.airbnb.epoxy.ModelView -import com.airbnb.epoxy.OnViewRecycled import com.aurora.gplayapi.data.models.details.Badge import com.aurora.store.R import com.aurora.store.databinding.ViewMoreBadgeBinding @@ -86,13 +84,4 @@ class MoreBadgeView : RelativeLayout { } } } - - @CallbackProp - fun click(onClickListener: OnClickListener?) { - - } - - @OnViewRecycled - fun clear() { - } } diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt index 4e40d7ee8..264d694d6 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt @@ -124,7 +124,7 @@ class AccentFragment : BaseFragment() { } private fun updateAccent(accentId: Int) { - applyTheme(themeId, false) + applyTheme(themeId) save(PREFERENCE_THEME_ACCENT, accentId) } diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt index 180543bd3..e49e48ef5 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt @@ -110,7 +110,7 @@ class ThemeFragment : BaseFragment() { } private fun update(themeId: Int) { - applyTheme(themeId, false) + applyTheme(themeId) save(PREFERENCE_THEME_TYPE, themeId) } diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt index 1bcd21770..26136f8c6 100644 --- a/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt +++ b/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt @@ -71,7 +71,7 @@ class UIPreference : PreferenceFragmentCompat() { val themeId = Integer.parseInt(newValue.toString()) save(Preferences.PREFERENCE_THEME_TYPE, themeId) - applyTheme(themeId, shouldApplyTransition = false) + applyTheme(themeId) true } } @@ -86,7 +86,7 @@ class UIPreference : PreferenceFragmentCompat() { val accentId = Integer.parseInt(newValue.toString()) save(Preferences.PREFERENCE_THEME_ACCENT, accentId) - applyTheme(themeId, shouldApplyTransition = false) + applyTheme(themeId) true } }