From c931155e83c24ab5c0a4fe9e684a6028176b1177 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Tue, 23 Feb 2021 12:01:13 +1100 Subject: [PATCH] clean up unused dialogs --- .../LightThemeFeatureIntroBottomSheet.kt | 41 ---------- .../dialogs/MultiDeviceRemovalBottomSheet.kt | 77 ------------------- .../dialogs/OpenGroupSuggestionBottomSheet.kt | 24 ------ 3 files changed, 142 deletions(-) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LightThemeFeatureIntroBottomSheet.kt delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LightThemeFeatureIntroBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LightThemeFeatureIntroBottomSheet.kt deleted file mode 100644 index 4006da0aa7..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LightThemeFeatureIntroBottomSheet.kt +++ /dev/null @@ -1,41 +0,0 @@ -package org.thoughtcrime.securesms.loki.dialogs - -import android.app.Dialog -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.FrameLayout -import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.android.material.bottomsheet.BottomSheetDialog -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import kotlinx.android.synthetic.main.fragment_light_theme_feature_intro_bottom_sheet.* -import network.loki.messenger.R - - -class LightThemeFeatureIntroBottomSheet : BottomSheetDialogFragment() { - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate( - R.layout.fragment_light_theme_feature_intro_bottom_sheet, - container, - false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - okButton.setOnClickListener { dismiss() } - } - - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val dialog = super.onCreateDialog(savedInstanceState) - // Make the bottom sheet be expanded by default. - dialog.setOnShowListener { - val d = dialog as BottomSheetDialog - val bottomSheet = d.findViewById(com.google.android.material.R.id.design_bottom_sheet) - BottomSheetBehavior.from(bottomSheet!!).setState(BottomSheetBehavior.STATE_EXPANDED); - } - return dialog - } -} \ No newline at end of file diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt deleted file mode 100644 index 59a2664af8..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt +++ /dev/null @@ -1,77 +0,0 @@ -package org.thoughtcrime.securesms.loki.dialogs - -import android.graphics.Typeface -import android.os.Bundle -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import android.text.Spannable -import android.text.SpannableStringBuilder -import android.text.method.LinkMovementMethod -import android.text.style.ClickableSpan -import android.text.style.ForegroundColorSpan -import android.text.style.StyleSpan -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Toast -import kotlinx.android.synthetic.main.fragment_multi_device_removal_bottom_sheet.* -import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.getColorWithID -import org.session.libsession.utilities.TextSecurePreferences -import java.text.SimpleDateFormat -import java.util.* - -class MultiDeviceRemovalBottomSheet : BottomSheetDialogFragment() { - var onOKTapped: (() -> Unit)? = null - var onLinkTapped: (() -> Unit)? = null - - private val removalDate by lazy { - val timeZone = TimeZone.getTimeZone("Australia/Melbourne") - val calendar = GregorianCalendar.getInstance(timeZone) - calendar.set(2020, 8 - 1, 6, 17, 0, 0) - calendar.time - } - - private val removalDateDescription by lazy { - val formatter = SimpleDateFormat("MMMM d", Locale.getDefault()) - formatter.format(removalDate) - } - - private val explanation by lazy { - "You’re seeing this because you have a secondary device linked to your Session ID. To improve reliability and stability, we’ve decided to temporarily disable Session’s multi-device functionality. Device linking has been disabled, and existing secondary clients will be erased on $removalDateDescription.\n\nTo read more about this change, visit the Session FAQ at getsession.org/faq" - } - - private val decoratedExplanation by lazy { - val result = SpannableStringBuilder(explanation) - val removalDateStartIndex = explanation.indexOf(removalDateDescription) - val removalDateEndIndex = removalDateStartIndex + removalDateDescription.count() - result.setSpan(StyleSpan(Typeface.BOLD), removalDateStartIndex, removalDateEndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - result.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, requireContext().theme)), removalDateStartIndex, removalDateEndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - val link = "getsession.org/faq" - val linkStartIndex = explanation.indexOf(link) - val linkEndIndex = linkStartIndex + link.count() - result.setSpan(object : ClickableSpan() { - - override fun onClick(widget: View) { - try { - onLinkTapped?.invoke() - } catch (e: Exception) { - Toast.makeText(requireContext(), R.string.invalid_url, Toast.LENGTH_SHORT).show() - } - } - }, linkStartIndex, linkEndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - result.setSpan(StyleSpan(Typeface.BOLD), linkStartIndex, linkEndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - result.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, requireContext().theme)), linkStartIndex, linkEndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - result - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_multi_device_removal_bottom_sheet, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - explanationTextView.movementMethod = LinkMovementMethod.getInstance() - explanationTextView.text = decoratedExplanation - okButton.setOnClickListener { onOKTapped?.invoke() } - } -} \ No newline at end of file diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt deleted file mode 100644 index 067c100e77..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt +++ /dev/null @@ -1,24 +0,0 @@ -package org.thoughtcrime.securesms.loki.dialogs - -import android.os.Bundle -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import kotlinx.android.synthetic.main.fragment_open_group_suggestion_bottom_sheet.* -import network.loki.messenger.R - -class OpenGroupSuggestionBottomSheet : BottomSheetDialogFragment() { - var onJoinTapped: (() -> Unit)? = null - var onDismissTapped: (() -> Unit)? = null - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_open_group_suggestion_bottom_sheet, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - joinButton.setOnClickListener { onJoinTapped?.invoke() } - dismissButton.setOnClickListener { onDismissTapped?.invoke() } - } -} \ No newline at end of file