From db65edb7df9b15b9d8aebbdc40b5e9ab5f18edf7 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 6 Feb 2023 11:05:18 -0400 Subject: [PATCH] Mark DSL api discouraged. --- .../securesms/components/settings/DSLSettingsActivity.kt | 2 ++ .../securesms/components/settings/DSLSettingsAdapter.kt | 2 ++ .../components/settings/DSLSettingsBottomSheetFragment.kt | 2 ++ .../securesms/components/settings/DSLSettingsFragment.kt | 2 ++ .../java/org/thoughtcrime/securesms/components/settings/dsl.kt | 3 +++ 5 files changed, 11 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt index 136427f88..6ef032ccf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components.settings import android.os.Bundle import androidx.activity.OnBackPressedCallback +import androidx.annotation.Discouraged import androidx.navigation.NavController import androidx.navigation.Navigation import androidx.navigation.fragment.NavHostFragment @@ -10,6 +11,7 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme import org.thoughtcrime.securesms.util.DynamicTheme +@Discouraged("The DSL API can be completely replaced by compose. See ComposeFragment or ComposeBottomSheetFragment for an alternative to this API") open class DSLSettingsActivity : PassphraseRequiredActivity() { protected open val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme() diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt index 3fda7366b..06a679123 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt @@ -10,6 +10,7 @@ import android.widget.ImageView import android.widget.RadioButton import android.widget.TextView import androidx.annotation.CallSuper +import androidx.annotation.Discouraged import androidx.core.content.ContextCompat import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.switchmaterial.SwitchMaterial @@ -27,6 +28,7 @@ import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder import org.thoughtcrime.securesms.util.views.LearnMoreTextView import org.thoughtcrime.securesms.util.visible +@Discouraged("The DSL API can be completely replaced by compose. See ComposeFragment or ComposeBottomSheetFragment for an alternative to this API") class DSLSettingsAdapter : MappingAdapter() { init { registerFactory(ClickPreference::class.java, LayoutFactory(::ClickPreferenceViewHolder, R.layout.dsl_preference_item)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt index ba9d5d4b9..094274729 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt @@ -7,6 +7,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.EdgeEffect +import androidx.annotation.Discouraged import androidx.annotation.LayoutRes import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager @@ -15,6 +16,7 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment import org.thoughtcrime.securesms.util.WindowUtil +@Discouraged("The DSL API can be completely replaced by compose. See ComposeFragment or ComposeBottomSheetFragment for an alternative to this API") abstract class DSLSettingsBottomSheetFragment( @LayoutRes private val layoutId: Int = R.layout.dsl_settings_bottom_sheet, val layoutManagerProducer: (Context) -> RecyclerView.LayoutManager = { context -> LinearLayoutManager(context) }, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt index 1cacaf9cf..98f12b7a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.view.View import android.widget.EdgeEffect import androidx.annotation.CallSuper +import androidx.annotation.Discouraged import androidx.annotation.LayoutRes import androidx.annotation.MenuRes import androidx.annotation.StringRes @@ -20,6 +21,7 @@ import org.thoughtcrime.securesms.util.Material3OnScrollHelper import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter import java.lang.UnsupportedOperationException +@Discouraged("The DSL API can be completely replaced by compose. See ComposeFragment or ComposeBottomSheetFragment for an alternative to this API") abstract class DSLSettingsFragment( @StringRes private val titleId: Int = -1, @MenuRes private val menuId: Int = -1, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt index 315398841..414051e6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components.settings import androidx.annotation.CallSuper +import androidx.annotation.Discouraged import androidx.annotation.Px import androidx.annotation.StringRes import org.thoughtcrime.securesms.components.settings.models.AsyncSwitch @@ -12,12 +13,14 @@ import org.thoughtcrime.securesms.components.settings.models.Text import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList +@Discouraged("The DSL API can be completely replaced by compose. See ComposeFragment or ComposeBottomSheetFragment for an alternative to this API") fun configure(init: DSLConfiguration.() -> Unit): DSLConfiguration { val configuration = DSLConfiguration() configuration.init() return configuration } +@Discouraged("The DSL API can be completely replaced by compose. See ComposeFragment or ComposeBottomSheetFragment for an alternative to this API") class DSLConfiguration { private val children = arrayListOf>()