diff --git a/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt b/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt deleted file mode 100644 index 0bae27b20..000000000 --- a/app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt +++ /dev/null @@ -1,117 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.home - -import android.graphics.PorterDuff.Mode.SRC_IN -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.core.content.ContextCompat -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import kotlinx.android.extensions.LayoutContainer -import kotlinx.android.synthetic.main.session_bottom_sheet.view.* -import org.mozilla.fenix.R -import org.mozilla.fenix.ThemeManager -import org.mozilla.fenix.ext.getColorFromAttr -import org.mozilla.fenix.utils.ItsNotBrokenSnack - -class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer { - sealed class SessionType { - data class Current(override val titles: List) : SessionType() - data class Private(override val titles: List) : SessionType() - - abstract val titles: List - } - - private var sessionType: SessionType? = null - var onDelete: ((SessionType) -> Unit)? = null - - override val containerView: View? - get() = view - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setStyle(BottomSheetDialogFragment.STYLE_NORMAL, R.style.CurrentSessionBottomSheetDialogTheme) - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - val view = inflater.inflate(R.layout.session_bottom_sheet, container, false) - - view.current_session_card_title.text = getCardTitle() - view.current_session_card_tab_list.text = getTabTitles() - view.archive_session_button.apply { - val drawable = ContextCompat.getDrawable(context!!, R.drawable.ic_tab_collection) - drawable?.setColorFilter( - ContextCompat.getColor( - context!!, - ThemeManager.resolveAttribute(R.attr.accent, context!!) - ), SRC_IN - ) - setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) - setOnClickListener { - dismiss() - } - } - - view.delete_session_button.apply { - val drawable = ContextCompat.getDrawable(context!!, R.drawable.ic_delete) - drawable?.setColorFilter( - R.attr.destructive.getColorFromAttr(context), SRC_IN - ) - setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) - } - - view.send_and_share_session_button.apply { - val drawable = ContextCompat.getDrawable(context!!, R.drawable.mozac_ic_share) - drawable?.setColorFilter( - ContextCompat.getColor( - context!!, - ThemeManager.resolveAttribute(R.attr.primaryText, context!!) - ), SRC_IN - ) - setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) - } - - view.send_and_share_session_button.setOnClickListener { - ItsNotBrokenSnack(context!!).showSnackbar(issueNumber = "244") - } - - view.delete_session_button.setOnClickListener { - sessionType?.apply { onDelete?.invoke(this) } - dismiss() - } - - return view - } - - private fun getCardTitle(): String? { - return sessionType?.let { - when (it) { - is SessionType.Current -> getString(R.string.tab_header_label) - is SessionType.Private -> getString(R.string.tabs_header_private_title) - } - } - } - - private fun getTabTitles(): String? { - return sessionType?.titles?.joinToString(", ") { - if (it.length > maxTitleLength) it.substring(0, - maxTitleLength - ) + "..." else it - } - } - - companion object { - const val maxTitleLength = 20 - const val overflowFragmentTag = "sessionOverflow" - - fun create(sessionType: SessionType): SessionBottomSheetFragment { - val fragment = SessionBottomSheetFragment() - fragment.sessionType = sessionType - return fragment - } - } -} diff --git a/app/src/main/res/drawable/ic_session_thumbnail_placeholder_greyscale.xml b/app/src/main/res/drawable/ic_session_thumbnail_placeholder_greyscale.xml deleted file mode 100644 index a8abc6705..000000000 --- a/app/src/main/res/drawable/ic_session_thumbnail_placeholder_greyscale.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/session_list_empty_bg.xml b/app/src/main/res/drawable/session_list_empty_bg.xml deleted file mode 100644 index a81773c4e..000000000 --- a/app/src/main/res/drawable/session_list_empty_bg.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/session_sheet_background.xml b/app/src/main/res/drawable/session_sheet_background.xml deleted file mode 100644 index 43f91c6b7..000000000 --- a/app/src/main/res/drawable/session_sheet_background.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/layout/session_bottom_sheet.xml b/app/src/main/res/layout/session_bottom_sheet.xml deleted file mode 100644 index 411c944fa..000000000 --- a/app/src/main/res/layout/session_bottom_sheet.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/session_item.xml b/app/src/main/res/layout/session_item.xml deleted file mode 100644 index 534dac35d..000000000 --- a/app/src/main/res/layout/session_item.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/session_list_header.xml b/app/src/main/res/layout/session_list_header.xml deleted file mode 100644 index d607ba493..000000000 --- a/app/src/main/res/layout/session_list_header.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7df2d18a2..756bcfe2d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -334,11 +334,6 @@ Sammlung umbenennen Tabs öffnen - - Löschen - - %1$d Websites… diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index b21783046..d1f3ab67e 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -23,9 +23,9 @@ %1$s borra tus búsquedas e historial de navegación cuando cierras una sesión privada - Aunque no te hace anónimo para los sitios web o proveedor de servicios de Internet, + Aunque no te hace anónimo para los sitios web o proveedor de servicios de Internet, te ayuda a mantener en privado lo que haces en línea frente a cualquier otra persona que use este dispositivo. \n\nMitos comunes sobre la navegación privada - + Eliminar sesión @@ -331,12 +331,6 @@ Cambiar nombre a colección Abrir pestañas - - Eliminar - - - Sitios %1$d… diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6ec2bdcb8..ae616b715 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -23,7 +23,7 @@ %1$s borra tus búsquedas e historial de navegación cuando cierras una sesión privada -        Aunque no te hace anónimo para los sitios web o proveedor de servicios de Internet, +        Aunque no te hace anónimo para los sitios web o proveedor de servicios de Internet,         te ayuda a mantener en privado lo que haces en línea frente a cualquier otra persona que use este dispositivo. \n\nMitos comunes sobre la navegación privada               @@ -337,11 +337,6 @@ Cambiar el nombre a la colección Abrir pestañas - - Eliminar - - Sitios %1$d… diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 04d5d7965..ef3ac8fdc 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -338,11 +338,6 @@ Renommer la collection Ouvrir les onglets - - Supprimer - - %1$d sites… diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 57d9e437b..db83e95cb 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -340,12 +340,6 @@ Rinomina raccolta Apri schede - - Elimina - - - %1$d siti... diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4ee5f73c7..85b006d4c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -327,11 +327,6 @@ コレクションの名前を変更 タブを開く - - 削除 - - %1$d サイト… diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 728e20c84..a0046959e 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -330,11 +330,6 @@ 모음집 이름 변경 열린 탭 - - 삭제 - - 사이트 %1$d개… @@ -682,9 +677,9 @@ 개인 정보 보호 - 우리는 %s가 무엇을 온라인에서 공유하고 우리와 공유할지 + 우리는 %s가 무엇을 온라인에서 공유하고 우리와 공유할지 사용자가 제어할 수 있게 만들었습니다. - +      개인 정보 보호 정책 읽기 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 66dc9b924..423ce597a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -338,11 +338,6 @@ Переименовать коллекцию Открытые вкладки - - Удалить - - %1$d сайт(а)… diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cb7c2d4dd..fca317bad 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -341,12 +341,6 @@ 重命名收藏集 打开标签页 - - 删除 - - - 还有 %1$d 个网站… @@ -611,7 +605,7 @@ - The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. + The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. 中文字体测试:天地玄黄,宇宙洪荒。日月盈昃,辰宿列张。 放大或缩小网站上的文字 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f018dd250..161f20f0d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -336,11 +336,6 @@ 更名收藏集 開啟分頁 - - 刪除 - - 還有 %1$d 個網站… @@ -602,7 +597,7 @@ - The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. + The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. 中文字型測試:「永東國酬,愛鬱。靈鷹袋!」 放大或縮小網站上的文字 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 67f5a484a..52f449454 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -331,11 +331,6 @@ Rename collection Open tabs - - Delete - - %1$d sites… diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 99b19311e..e8c0867e7 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -211,22 +211,6 @@ true - - - -