Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ jobs:
sed -i -e '/START Non-FOSS component/,/END Non-FOSS component/d' app/build.gradle.kts

- name: Build F-Droid variant
run: ./gradlew :app:assembleRelease :app:check :app:lint --stacktrace
run: ./gradlew :app:assembleRelease :app:check :app:lint --stacktrace
6 changes: 6 additions & 0 deletions app/src/main/java/dev/dimension/flare/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.dimension.flare

import android.content.Context
import android.content.Intent
import android.net.ConnectivityManager
import android.net.Network
import android.net.NetworkCapabilities
Expand Down Expand Up @@ -52,6 +53,11 @@ class MainActivity : ComponentActivity() {
}
}

override fun onNewIntent(intent: Intent) {
setIntent(intent)
super.onNewIntent(intent)
}

override fun onResume() {
super.onResume()
videoDownloadHelper.onResume()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ import android.net.Uri
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.ui.ComposeUiFlags
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.core.content.IntentCompat
import dev.dimension.flare.ui.FlareApp
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toPersistentList

class ShortcutComposeActivity : ComponentActivity() {
@OptIn(ExperimentalComposeUiApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
ComposeUiFlags.isMediaQueryIntegrationEnabled = true
super.onCreate(savedInstanceState)
val initialText =
when {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Card
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ScaffoldDefaults
Expand Down Expand Up @@ -57,13 +56,13 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.toSize
import dev.dimension.flare.R
import dev.dimension.flare.common.PagingState
import dev.dimension.flare.common.onLoading
import dev.dimension.flare.common.onSuccess
import dev.dimension.flare.common.refreshSuspend
import dev.dimension.flare.data.datasource.microblog.ProfileTab
import dev.dimension.flare.data.model.VideoAutoplay
import dev.dimension.flare.model.AccountType
import dev.dimension.flare.model.MicroBlogKey
import dev.dimension.flare.ui.common.items
import dev.dimension.flare.ui.component.BackButton
import dev.dimension.flare.ui.component.FlareScaffold
import dev.dimension.flare.ui.component.FlareTopAppBar
Expand Down Expand Up @@ -546,56 +545,45 @@ private fun ProfileMediaTab(
horizontalArrangement = Arrangement.spacedBy(8.dp),
contentPadding = PaddingValues(vertical = 8.dp, horizontal = screenHorizontalPadding),
) {
mediaState
.onSuccess {
items(itemCount) { index ->
val item = get(index)
if (item != null) {
val media = item.media
MediaItem(
media = media,
showCountdown = false,
modifier =
Modifier
.clip(MaterialTheme.shapes.medium)
.clipToBounds()
.clickable {
val content = item.status
if (content is UiTimelineV2.Post) {
onItemClicked(
item.statusKey,
item.index,
when (media) {
is UiMedia.Image -> media.previewUrl
is UiMedia.Video -> media.thumbnailUrl
is UiMedia.Gif -> media.previewUrl
else -> null
},
)
}
items(
mediaState,
key = {
it.key
},
loadingContent = {
Box(
modifier =
Modifier
.size(120.dp)
.placeholder(true),
)
},
) { item ->
val media = item.media
MediaItem(
media = media,
showCountdown = false,
modifier =
Modifier
.clip(MaterialTheme.shapes.medium)
.clipToBounds()
.clickable {
val content = item.status
if (content is UiTimelineV2.Post) {
onItemClicked(
item.statusKey,
item.index,
when (media) {
is UiMedia.Image -> media.previewUrl
is UiMedia.Video -> media.thumbnailUrl
is UiMedia.Gif -> media.previewUrl
else -> null
},
)
} else {
Card {
Box(
modifier =
Modifier
.size(120.dp)
.placeholder(true),
)
}
}
}
}.onLoading {
items(10) {
Box(
modifier =
Modifier
.size(120.dp)
.placeholder(true),
)
}
}
)
}
},
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
Expand Down Expand Up @@ -92,13 +93,20 @@ internal fun RssDetailScreen(
val context = LocalContext.current
FlareScaffold(
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
containerColor = MaterialTheme.colorScheme.surface,
topBar = {
FlareTopAppBar(
title = {},
navigationIcon = {
BackButton(onBack)
},
scrollBehavior = scrollBehavior,
colors =
TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.surface,
scrolledContainerColor = MaterialTheme.colorScheme.surface,
actionIconContentColor = MaterialTheme.colorScheme.primary,
),
actions = {
IconButton(
onClick = {
Expand Down Expand Up @@ -165,7 +173,7 @@ internal fun RssDetailScreen(
Column(
modifier =
Modifier
.fillMaxWidth()
.fillMaxSize()
.verticalScroll(rememberScrollState()),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Expand Down
14 changes: 13 additions & 1 deletion app/src/main/res/values-af-rZA/changelog.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
<resources>
<string name="changelog_current">
<![CDATA[
<span>Weergawe %1$s:</span>
<ul>
<li>Deck Mode bygevoeg vir ’n meerkolom-tydlynervaring.</li>
<li>Ryker tydlynoortjie-aanpassing bygevoeg, insluitend ikone, filters, groepe en voorkoms per oortjie.</li>
<li>Regex-ondersteuning vir plaaslike sleutelwoordfilters bygevoeg.</li>
<li>Werkverrigtingverbeterings en foutoplossings.</li>
</ul>
]]>
</string>
</resources>
15 changes: 9 additions & 6 deletions app/src/main/res/values-ar-rSA/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
<resources>
<string name="changelog_title">مرحبا بعودتك!</string>
<string name="changelog_message">لقد قمنا ببعض التغييرات منذ آخر تسجيل دخولك. وفيما يلي التفاصيل:</string>
<string name="changelog_current"><![CDATA[ <span>الإصدار %1$s:</span>
<string name="changelog_current">
<![CDATA[
<span>الإصدار %1$s:</span>
<ul>
<li>إضافة أوضاع جديدة لعرض الخط الزمني، بما في ذلك تصميم المعرض.</li>
<li>تحسين قراءة RSS ، المشاركة والترجمة والموجزات.</li>
<li>إعادة تنظيم إعدادات الظهور لتخصيص أسهل.</li>
<li>إصلاحات الشوائب وتحسينات الأداء.</li>
<li>تمت إضافة وضع Deck لتجربة خط زمني متعددة الأعمدة.</li>
<li>تمت إضافة تخصيص أوسع لتبويبات الخط الزمني، بما في ذلك الأيقونات والمرشحات والمجموعات والمظهر لكل تبويب.</li>
<li>تمت إضافة دعم regex لمرشحات الكلمات المفتاحية المحلية.</li>
<li>تحسينات في الأداء وإصلاحات للأخطاء.</li>
</ul>
]]></string>
]]>
</string>
</resources>
11 changes: 11 additions & 0 deletions app/src/main/res/values-bg-rBG/changelog.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="changelog_title">Добре дошли отново!</string>
<string name="changelog_current">
<![CDATA[
<span>Версия %1$s:</span>
<ul>
<li>Добавен е Deck Mode за времева линия с няколко колони.</li>
<li>Добавено е по-богато персонализиране на разделите във времевата линия, включително икони, филтри, групи и външен вид за всеки раздел.</li>
<li>Добавена е поддръжка на regex за локални филтри по ключови думи.</li>
<li>Подобрения в производителността и корекции на грешки.</li>
</ul>
]]>
</string>
</resources>
14 changes: 13 additions & 1 deletion app/src/main/res/values-ca-rES/changelog.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
<resources>
<string name="changelog_current">
<![CDATA[
<span>Versió %1$s:</span>
<ul>
<li>S’ha afegit el Deck Mode per a una experiència de línia de temps amb diverses columnes.</li>
<li>S’ha afegit una personalització més completa de les pestanyes de la línia de temps, incloent-hi icones, filtres, grups i aparença per pestanya.</li>
<li>S’ha afegit compatibilitat amb regex per als filtres locals de paraules clau.</li>
<li>Millores de rendiment i correccions d’errors.</li>
</ul>
]]>
</string>
</resources>
11 changes: 11 additions & 0 deletions app/src/main/res/values-cs-rCZ/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,15 @@
<resources>
<string name="changelog_title">Vítejte zpět!</string>
<string name="changelog_message">Od posledního přihlášení jsme provedli nějaké změny. Zde jsou detaily:</string>
<string name="changelog_current">
<![CDATA[
<span>Verze %1$s:</span>
<ul>
<li>Přidán Deck Mode pro vícesloupcové zobrazení časové osy.</li>
<li>Přidáno bohatší přizpůsobení karet časové osy včetně ikon, filtrů, skupin a vzhledu jednotlivých karet.</li>
<li>Přidána podpora regex pro místní filtry klíčových slov.</li>
<li>Vylepšení výkonu a opravy chyb.</li>
</ul>
]]>
</string>
</resources>
15 changes: 9 additions & 6 deletions app/src/main/res/values-da-rDK/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
<resources>
<string name="changelog_title">Velkommen tilbage!</string>
<string name="changelog_message">Vi har foretaget nogle ændringer siden du sidst er logget ind. Her er detaljerne:</string>
<string name="changelog_current"><![CDATA[ <span>Version %1$s:</span>
<string name="changelog_current">
<![CDATA[
<span>Version %1$s:</span>
<ul>
<li>Tilføjet nye tidslinje visningstilstande, herunder et Galleri layout.</li>
<li>Forbedret RSS-læsning, deling, oversættelse og resuméer.</li>
<li>Omorganiseret udseende indstillinger for lettere tilpasning.</li>
<li>Fejlrettelser og forbedringer af ydeevnen.</li>
<li>Tilføjet Deck Mode til en tidslinjeoplevelse med flere kolonner.</li>
<li>Tilføjet mere avanceret tilpasning af tidslinjefaner, herunder ikoner, filtre, grupper og udseende pr. fane.</li>
<li>Tilføjet regex-understøttelse for lokale nøgleordsfiltre.</li>
<li>Ydelsesforbedringer og fejlrettelser.</li>
</ul>
]]></string>
]]>
</string>
</resources>
16 changes: 9 additions & 7 deletions app/src/main/res/values-de-rDE/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
<resources>
<string name="changelog_title">Willkommen zurück!</string>
<string name="changelog_message">Seit der letzten Anmeldung haben wir einige Änderungen vorgenommen. Hier sind die Details:</string>
<string name="changelog_current"><![CDATA[ <span>Version %1$s:</span>
<string name="changelog_current">
<![CDATA[
<span>Version %1$s:</span>
<ul>
<li>Neue Timeline-Anzeigemodi hinzugefügt inklusive Galerie-Layout.</li>

<li>Verbessertes RSS-Lesen teilen, übersetzen und zusammenfassen.</li>
<li>Umorganisierte Darstellungseinstellungen für einfachere Anpassung.</li>
<li>Fehlerbehebungen und Leistungsverbesserungen.</li>
<li>Deck Mode für eine mehrspaltige Timeline-Ansicht hinzugefügt.</li>
<li>Erweiterte Anpassung von Timeline-Tabs hinzugefügt, einschließlich Symbolen, Filtern, Gruppen und Erscheinungsbild pro Tab.</li>
<li>Regex-Unterstützung für lokale Schlüsselwortfilter hinzugefügt.</li>
<li>Leistungsverbesserungen und Fehlerbehebungen.</li>
</ul>
]]></string>
]]>
</string>
</resources>
15 changes: 9 additions & 6 deletions app/src/main/res/values-el-rGR/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
<resources>
<string name="changelog_title">Καλώς ήρθατε!</string>
<string name="changelog_message">Έχουμε κάνει κάποιες αλλαγές από τότε που συνδεθήκατε την τελευταία φορά. Εδώ είναι οι λεπτομέρειες:</string>
<string name="changelog_current"><![CDATA[ <span>Έκδοση %1$s:</span>
<string name="changelog_current">
<![CDATA[
<span>Έκδοση %1$s:</span>
<ul>
<li>Προστέθηκε νέα λειτουργία εμφάνισης χρονοδιαγράμματος, συμπεριλαμβανομένης μιας διάταξης συλλογής.</li>
<li>Βελτιωμένη ανάγνωση RSS, από κοινού, μετάφραση και περιλήψεις.</li>
<li>Επανοργανωμένες ρυθμίσεις εμφάνισης για ευκολότερη προσαρμογή.</li>
<li>Διορθώσεις σφαλμάτων και βελτιώσεις απόδοσης.</li>
<li>Προστέθηκε το Deck Mode για εμπειρία χρονολογίου πολλών στηλών.</li>
<li>Προστέθηκε πιο πλούσια προσαρμογή καρτελών χρονολογίου, με εικονίδια, φίλτρα, ομάδες και εμφάνιση ανά καρτέλα.</li>
<li>Προστέθηκε υποστήριξη regex για τοπικά φίλτρα λέξεων-κλειδιών.</li>
<li>Βελτιώσεις απόδοσης και διορθώσεις σφαλμάτων.</li>
</ul>
]]></string>
]]>
</string>
</resources>
15 changes: 9 additions & 6 deletions app/src/main/res/values-es-rES/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
<resources>
<string name="changelog_title">¡Bienvenido de nuevo!</string>
<string name="changelog_message">Hemos realizado algunos cambios desde la última vez que iniciaste sesión. Estos son los detalles:</string>
<string name="changelog_current"><![CDATA[ <span>Versión %1$s:</span>
<string name="changelog_current">
<![CDATA[
<span>Versión %1$s:</span>
<ul>
<li>Se añadieron nuevos modos de visualización de timeline, incluyendo un diseño de galería.</li>
<li>Lectura RSS mejorada, compartir, traducir y resumir.</li>
<li>Ajustes de apariencia reorganizados para una personalización más fácil.</li>
<li>correcciones de errores y mejoras de rendimiento.</li>
<li>Se añadió Deck Mode para una experiencia de línea de tiempo con varias columnas.</li>
<li>Se añadió una personalización más completa de las pestañas de la línea de tiempo, incluyendo iconos, filtros, grupos y apariencia por pestaña.</li>
<li>Se añadió compatibilidad con regex para los filtros locales de palabras clave.</li>
<li>Mejoras de rendimiento y correcciones de errores.</li>
</ul>
]]></string>
]]>
</string>
</resources>
Loading
Loading