Louvorg/ReaderForSelfoss-multiplatform
Louvorg/ReaderForSelfoss-multiplatform
3
2
Fork 2
Code Issues 16 Pull Requests Projects 1 Releases 65 Wiki Activity

Compare commits

base: Louvorg:ab0678d61e80c64d73b2c260633281843d826e76
Branches Tags
Louvorg:master
Louvorg:email-mapper
Louvorg:cleaning
Louvorg:v124041081
Louvorg:v124030731
Louvorg:v124020451
Louvorg:v124010301
Louvorg:v124010191
Louvorg:v124010032
Louvorg:v124010031
Louvorg:v123113311
Louvorg:v123102961
Louvorg:v123102852
Louvorg:v123102851
Louvorg:v123102841
Louvorg:v123061811
Louvorg:v123061651
Louvorg:v123051471
Louvorg:v123051331
Louvorg:v123051321
Louvorg:v123051301
Louvorg:v123051211
Louvorg:v123041021
Louvorg:v123030851
Louvorg:v123030751
Louvorg:v123030681
Louvorg:v123030621
Louvorg:v123020572
Louvorg:v123020571
Louvorg:v123020523
Louvorg:v123020522
Louvorg:v123020521
Louvorg:v123020511
Louvorg:v123020491
Louvorg:v123010301
Louvorg:v123010281
Louvorg:v123010261
Louvorg:v123010241
Louvorg:v123010041
Louvorg:v122123641
Louvorg:v122123631
Louvorg:v122123621
Louvorg:v122123611
Louvorg:v122123602
Louvorg:v122123601
Louvorg:v122123571
Louvorg:v122123532
Louvorg:v122123531
Louvorg:v122123522
Louvorg:v122123521
Louvorg:v122123483
Louvorg:v122123482
Louvorg:v122123481
Louvorg:v122123461
Louvorg:v122123431
Louvorg:v122123421
Louvorg:v122123391
Louvorg:v122123381
Louvorg:v122123371
Louvorg:v122123351
Louvorg:v122113181
Louvorg:v122113172
Louvorg:v122113171
Louvorg:v122113161
Louvorg:v122113131
Louvorg:v122113101
Louvorg:v122102881
Louvorg:v122092701
Louvorg:v122092691
Louvorg:v122092671
Louvorg:v122092572
Louvorg:v122092561
..
compare: Louvorg:95e76a55dae61614db4d926ee6273b8c06692143
Branches Tags
Louvorg:master
Louvorg:email-mapper
Louvorg:cleaning
Louvorg:v124041081
Louvorg:v124030731
Louvorg:v124020451
Louvorg:v124010301
Louvorg:v124010191
Louvorg:v124010032
Louvorg:v124010031
Louvorg:v123113311
Louvorg:v123102961
Louvorg:v123102852
Louvorg:v123102851
Louvorg:v123102841
Louvorg:v123061811
Louvorg:v123061651
Louvorg:v123051471
Louvorg:v123051331
Louvorg:v123051321
Louvorg:v123051301
Louvorg:v123051211
Louvorg:v123041021
Louvorg:v123030851
Louvorg:v123030751
Louvorg:v123030681
Louvorg:v123030621
Louvorg:v123020572
Louvorg:v123020571
Louvorg:v123020523
Louvorg:v123020522
Louvorg:v123020521
Louvorg:v123020511
Louvorg:v123020491
Louvorg:v123010301
Louvorg:v123010281
Louvorg:v123010261
Louvorg:v123010241
Louvorg:v123010041
Louvorg:v122123641
Louvorg:v122123631
Louvorg:v122123621
Louvorg:v122123611
Louvorg:v122123602
Louvorg:v122123601
Louvorg:v122123571
Louvorg:v122123532
Louvorg:v122123531
Louvorg:v122123522
Louvorg:v122123521
Louvorg:v122123483
Louvorg:v122123482
Louvorg:v122123481
Louvorg:v122123461
Louvorg:v122123431
Louvorg:v122123421
Louvorg:v122123391
Louvorg:v122123381
Louvorg:v122123371
Louvorg:v122123351
Louvorg:v122113181
Louvorg:v122113172
Louvorg:v122113171
Louvorg:v122113161
Louvorg:v122113131
Louvorg:v122113101
Louvorg:v122102881
Louvorg:v122092701
Louvorg:v122092691
Louvorg:v122092671
Louvorg:v122092572
Louvorg:v122092561

No commits in common. "ab0678d61e80c64d73b2c260633281843d826e76" and "95e76a55dae61614db4d926ee6273b8c06692143" have entirely different histories.
ab0678d61e ... 95e76a55da

6 changed files with 63 additions and 74 deletions
Show Stats Expand all files Collapse all files

2
androidApp/build.gradle.kts
View File

@ -66,7 +66,7 @@ android {
jvmTarget = "11" jvmTarget = "11"
} }
compileSdk = 33 compileSdk = 33
buildToolsVersion = "33.0.0" buildToolsVersion = "31.0.0"
buildFeatures { buildFeatures {
viewBinding = true viewBinding = true
} }

1
androidApp/src/main/AndroidManifest.xml
View File

@ -2,7 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

3
androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
View File

@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.View.GONE import android.view.View.GONE
@ -86,7 +85,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
repository.getSources().forEach { source -> repository.getSources().forEach { source ->
val c = Chip(context) val c = Chip(context)
c.ellipsize = TextUtils.TruncateAt.END
Glide.with(context) Glide.with(context)
.load(source.getIcon(repository.baseUrl)) .load(source.getIcon(repository.baseUrl))
@ -160,7 +158,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
tags.forEach { tag -> tags.forEach { tag ->
val c = Chip(context) val c = Chip(context)
c.ellipsize = TextUtils.TruncateAt.END
c.text = tag.tag c.text = tag.tag
try { try {

123
androidApp/src/main/res/layout/filter_fragment.xml
View File

@ -17,80 +17,73 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:visibility="gone" /> tools:visibility="gone" />
<androidx.core.widget.NestedScrollView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/filterView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true"> android:visibility="gone"
tools:visibility="visible">
<androidx.constraintlayout.widget.ConstraintLayout <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/filterView" android:id="@+id/floatingActionButton2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:clickable="true"
app:backgroundTint="@color/colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:rippleColor="@color/colorAccentDark"
app:srcCompat="@drawable/ic_menu_search_white_24dp" />
<TextView
android:id="@+id/filterTagsTitle"
style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="16dp"
android:text="@string/filter_item_tags"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.chip.ChipGroup
android:id="@+id/tagsGroup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:layout_marginStart="16dp"
tools:visibility="visible"> android:layout_marginTop="24dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
app:singleSelection="true">
<TextView </com.google.android.material.chip.ChipGroup>
android:id="@+id/filterTagsTitle"
style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="16dp"
android:text="@string/filter_item_tags"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/filterSourcesTitle" android:id="@+id/filterSourcesTitle"
style="@style/MaterialAlertDialog.MaterialComponents.Title.Text" style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:text="@string/filter_item_sources" android:text="@string/filter_item_sources"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tagsGroup" /> app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
<com.google.android.material.chip.ChipGroup <com.google.android.material.chip.ChipGroup
android:id="@+id/tagsGroup" android:id="@+id/sourcesGroup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle" app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
app:singleSelection="true">
</com.google.android.material.chip.ChipGroup> </com.google.android.material.chip.ChipGroup>
<com.google.android.material.chip.ChipGroup
android:id="@+id/sourcesGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
</com.google.android.material.chip.ChipGroup>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:clickable="true"
app:backgroundTint="@color/colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:rippleColor="@color/colorAccentDark"
app:srcCompat="@drawable/ic_menu_search_white_24dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
build.gradle.kts
View File

@ -7,8 +7,8 @@ buildscript {
plugins { plugins {
//trick: for the same plugin versions in all sub-modules //trick: for the same plugin versions in all sub-modules
id("com.android.application").version("7.4.0").apply(false) id("com.android.application").version("7.3.1").apply(false)
id("com.android.library").version("7.4.0").apply(false) id("com.android.library").version("7.3.1").apply(false)
kotlin("android").version("1.7.20").apply(false) kotlin("android").version("1.7.20").apply(false)
kotlin("multiplatform").version("1.7.20").apply(false) kotlin("multiplatform").version("1.7.20").apply(false)
id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false) id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Jan 23 20:47:46 CET 2023 #Wed Feb 09 17:05:19 CET 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME