Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-03 23:15:31 +00:00
Code Issues Releases Wiki Activity

Closes #717 - Cut off session host preview at 64

Browse Source
This commit is contained in:
Emily Kager 2019-02-27 15:32:41 -08:00 committed by Jeff Boek
parent 1d4be1b665
commit 329e05c502
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/mozilla/fenix/home/sessions/SessionsComponent.kt
View File

@ -14,8 +14,8 @@ import org.mozilla.fenix.mvi.UIComponent
import org.mozilla.fenix.mvi.ViewState import org.mozilla.fenix.mvi.ViewState
import java.net.URL import java.net.URL
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date
import java.util.Calendar import java.util.Calendar
import java.util.Date
import java.util.Locale import java.util.Locale
data class ArchivedSession( data class ArchivedSession(
@ -56,11 +56,15 @@ data class ArchivedSession(
// just want to grab the host from the URL // just want to grab the host from the URL
@SuppressWarnings("TooGenericExceptionCaught") @SuppressWarnings("TooGenericExceptionCaught")
val urlFormatter: (String) -> String = { url -> val urlFormatter: (String) -> String = { url ->
try { var formattedURL = try {
URL(url).host URL(url).host
} catch (e: Exception) { } catch (e: Exception) {
url url
} }
if (formattedURL.length > LONGEST_HOST_ON_INTERNET_LENGTH) {
formattedURL = formattedURL.take(LONGEST_HOST_ON_INTERNET_LENGTH).plus("...")
}
formattedURL
} }
_urls _urls
@ -72,6 +76,7 @@ data class ArchivedSession(
private companion object { private companion object {
private const val NUMBER_OF_URLS_TO_DISPLAY = 5 private const val NUMBER_OF_URLS_TO_DISPLAY = 5
private const val LONGEST_HOST_ON_INTERNET_LENGTH = 64
private val timeFormatter = SimpleDateFormat("h:mm a", Locale.US) private val timeFormatter = SimpleDateFormat("h:mm a", Locale.US)
private val monthFormatter = SimpleDateFormat("M", Locale.US) private val monthFormatter = SimpleDateFormat("M", Locale.US)

33
app/src/main/res/layout/session_item.xml
View File

@ -2,22 +2,19 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- 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 - 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/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="@android:color/white" android:background="@android:color/white"
app:cardElevation="1dp" android:clipChildren="true"
app:cardCornerRadius="10dp" app:cardCornerRadius="10dp"
android:clipChildren="true"> app:cardElevation="5dp">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/session_item" android:id="@+id/session_item"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/session_card_padding"> android:paddingBottom="@dimen/session_card_padding">
@ -26,23 +23,23 @@
android:id="@+id/session_card_thumbnail" android:id="@+id/session_card_thumbnail"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_session_thumbnail_placeholder_blue"
android:layout_margin="@dimen/session_card_padding" android:layout_margin="@dimen/session_card_padding"
app:layout_constraintTop_toTopOf="parent" android:src="@drawable/ic_session_thumbnail_placeholder_blue"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/session_card_timestamp" android:id="@+id/session_card_timestamp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:textColor="@color/photonInk80" android:textColor="@color/photonInk80"
android:textSize="16sp" android:textSize="16sp"
android:layout_marginStart="12dp" app:layout_constraintEnd_toStartOf="@id/session_card_overflow_button"
android:layout_marginBottom="2dp"
android:layout_marginEnd="12dp"
app:layout_constraintStart_toEndOf="@+id/session_card_thumbnail" app:layout_constraintStart_toEndOf="@+id/session_card_thumbnail"
app:layout_constraintTop_toTopOf="@id/session_card_thumbnail" app:layout_constraintTop_toTopOf="@id/session_card_thumbnail" />
app:layout_constraintEnd_toStartOf="@id/session_card_overflow_button"/>
<TextView <TextView
android:id="@+id/session_card_titles" android:id="@+id/session_card_titles"
@ -50,9 +47,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/photonGrey50" android:textColor="@color/photonGrey50"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintTop_toBottomOf="@+id/session_card_timestamp" app:layout_constraintEnd_toEndOf="@id/session_card_timestamp"
app:layout_constraintStart_toStartOf="@id/session_card_timestamp" app:layout_constraintStart_toStartOf="@id/session_card_timestamp"
app:layout_constraintEnd_toEndOf="@id/session_card_timestamp"/> app:layout_constraintTop_toBottomOf="@+id/session_card_timestamp" />
<TextView <TextView
android:id="@+id/session_card_extras" android:id="@+id/session_card_extras"
@ -60,8 +57,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/photonGrey50" android:textColor="@color/photonGrey50"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintTop_toBottomOf="@+id/session_card_titles" app:layout_constraintStart_toStartOf="@id/session_card_titles"
app:layout_constraintStart_toStartOf="@id/session_card_titles" /> app:layout_constraintTop_toBottomOf="@+id/session_card_titles" />
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/bottomBarrier" android:id="@+id/bottomBarrier"