Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
FreshRSS-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
30
Issues
30
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Christophe Henry
FreshRSS-Android
Commits
d82382d9
Commit
d82382d9
authored
Feb 20, 2019
by
Christophe Henry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solves
#4
: Display is not refreshed as the data change
parent
3bc4c92e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
10 deletions
+48
-10
app/src/main/java/fr/chenry/android/freshrss/components/subscriptions/AllSubscriptionsFragment.kt
...hrss/components/subscriptions/AllSubscriptionsFragment.kt
+6
-1
app/src/main/java/fr/chenry/android/freshrss/components/subscriptions/FavoritesSubscriptionsFragment.kt
...omponents/subscriptions/FavoritesSubscriptionsFragment.kt
+17
-0
app/src/main/java/fr/chenry/android/freshrss/components/subscriptions/MainSubscriptionFragment.kt
...hrss/components/subscriptions/MainSubscriptionFragment.kt
+9
-3
app/src/main/java/fr/chenry/android/freshrss/components/subscriptions/UnreadSubscriptionsFragment.kt
...s/components/subscriptions/UnreadSubscriptionsFragment.kt
+1
-2
app/src/main/java/fr/chenry/android/freshrss/store/dao/common/Subscription.kt
.../chenry/android/freshrss/store/dao/common/Subscription.kt
+11
-3
app/src/main/java/fr/chenry/android/freshrss/store/databindingsupport/viewmodels/UnreadSubscriptionsViewModel.kt
...bindingsupport/viewmodels/UnreadSubscriptionsViewModel.kt
+4
-1
No files found.
app/src/main/java/fr/chenry/android/freshrss/components/subscriptions/AllSubscriptionsFragment.kt
View file @
d82382d9
package
fr.chenry.android.freshrss.components.subscriptions
import
androidx.lifecycle.LiveData
import
androidx.lifecycle.MutableLiveData
import
fr.chenry.android.freshrss.store.*
import
fr.chenry.android.freshrss.store.dao.common.Subscription
import
fr.chenry.android.freshrss.store.dao.common.Subscriptions
class
AllSubscriptionsFragment
:
SubscriptionsFragment
()
{
override
val
subscriptions
:
Subscriptions
get
()
=
Store
.
subscriptions
.
values
override
val
liveData
:
LiveData
<
Subscriptions
>
=
MutableLiveData
<
Subscriptions
>().
apply
{
this
.
value
=
Store
.
subscriptions
.
values
Store
.
subscriptions
.
observeForever
{
this
.
value
=
Store
.
subscriptions
.
values
}
}
override
fun
onClick
(
subscription
:
Subscription
)
{
Router
.
navigate
(
RouteName
.
SUBSCRIPTION_ARTICLES_ALL
,
mapOf
(
"id"
to
subscription
.
id
))
...
...
app/src/main/java/fr/chenry/android/freshrss/components/subscriptions/FavoritesSubscriptionsFragment.kt
0 → 100644
View file @
d82382d9
package
fr.chenry.android.freshrss.components.subscriptions
import
android.os.Bundle
import
androidx.lifecycle.*
import
fr.chenry.android.freshrss.store.RouteName
import
fr.chenry.android.freshrss.store.Router
import
fr.chenry.android.freshrss.store.dao.common.Subscription
import
fr.chenry.android.freshrss.store.dao.common.Subscriptions
import
fr.chenry.android.freshrss.store.databindingsupport.viewmodels.UnreadSubscriptionsViewModel
class
FavoritesSubscriptionsFragment
:
SubscriptionsFragment
()
{
override
val
liveData
=
MutableLiveData
<
Subscriptions
>().
apply
{
this
.
value
=
listOf
()}
override
fun
onClick
(
subscription
:
Subscription
)
{
Router
.
navigate
(
RouteName
.
SUBSCRIPTION_ARTICLES_UNREAD
,
mapOf
(
"id"
to
subscription
.
id
))
}
}
app/src/main/java/fr/chenry/android/freshrss/components/subscriptions/MainSubscriptionFragment.kt
View file @
d82382d9
...
...
@@ -3,12 +3,14 @@ package fr.chenry.android.freshrss.components.subscriptions
import
android.os.Bundle
import
android.view.*
import
androidx.fragment.app.Fragment
import
androidx.lifecycle.LiveData
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
fr.chenry.android.freshrss.R
import
fr.chenry.android.freshrss.store.Store
import
fr.chenry.android.freshrss.store.dao.common.Subscription
import
fr.chenry.android.freshrss.store.dao.common.Subscriptions
import
fr.chenry.android.freshrss.utils.e
import
fr.chenry.android.freshrss.utils.getOrDefault
import
kotlinx.android.synthetic.main.fragment_main_subscription.*
import
kotlin.reflect.KClass
...
...
@@ -17,7 +19,7 @@ class MainSubscriptionFragment: Fragment() {
private
val
fragment
:
KClass
<
out
SubscriptionsFragment
>
get
()
=
when
(
Store
.
subscriptionsSection
.
value
)
{
SubscriptionSection
.
ALL
->
AllSubscriptionsFragment
::
class
SubscriptionSection
.
FAVORITES
->
All
SubscriptionsFragment
::
class
SubscriptionSection
.
FAVORITES
->
Favorites
SubscriptionsFragment
::
class
SubscriptionSection
.
UNREAD
->
UnreadSubscriptionsFragment
::
class
else ->
TODO
(
"Handle bad section"
)
}
...
...
@@ -73,14 +75,18 @@ class MainSubscriptionFragment: Fragment() {
}
abstract
class
SubscriptionsFragment
:
Fragment
()
{
abstract
val
subscriptions
:
Subscriptions
abstract
val
liveData
:
LiveData
<
Subscriptions
>
val
subscriptions
:
Subscriptions
get
()
=
liveData
.
value
?:
listOf
()
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?):
View
?
{
val
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_subscriptions
,
container
,
false
)
view
.
findViewById
<
RecyclerView
>(
R
.
id
.
subscriptions_list
).
let
{
it
.
layoutManager
=
LinearLayoutManager
(
context
,
RecyclerView
.
VERTICAL
,
false
)
it
.
adapter
=
RecyclerViewAdapter
(
this
)
it
.
adapter
=
RecyclerViewAdapter
(
this
).
apply
{
liveData
.
observeForever
{
this
.
notifyDataSetChanged
()}
}
}
return
view
...
...
app/src/main/java/fr/chenry/android/freshrss/components/subscriptions/UnreadSubscriptionsFragment.kt
View file @
d82382d9
...
...
@@ -9,9 +9,8 @@ import fr.chenry.android.freshrss.store.dao.common.Subscriptions
import
fr.chenry.android.freshrss.store.databindingsupport.viewmodels.UnreadSubscriptionsViewModel
class
UnreadSubscriptionsFragment
:
SubscriptionsFragment
()
{
private
lateinit
var
model
:
UnreadSubscriptionsViewModel
override
val
subscriptions
:
Subscriptions
get
()
=
model
.
subscriptions
override
val
liveData
get
()
=
model
.
subscriptions
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
...
...
app/src/main/java/fr/chenry/android/freshrss/store/dao/common/Subscription.kt
View file @
d82382d9
package
fr.chenry.android.freshrss.store.dao.common
import
androidx.databinding.BaseObservable
import
androidx.databinding.Bindable
import
fr.chenry.android.freshrss.BR
import
fr.chenry.android.freshrss.store.dao.store.ItemId
import
fr.chenry.android.freshrss.utils.escapeHtml4
import
fr.chenry.android.freshrss.utils.unescapeHtml4
...
...
@@ -16,13 +19,18 @@ typealias Subscriptions = List<Subscription>
@Serializable
data class
Subscription
(
val
id
:
String
,
@Serializable
(
with
=
HtmlEntitiesSerializer
::
class
)
val
title
:
String
,
@Serializable
(
with
=
HtmlEntitiesSerializer
::
class
)
val
title
:
String
,
val
categories
:
List
<
SubscriptionCategory
>,
val
url
:
String
,
val
htmlUrl
:
String
)
{
@Transient
)
:
BaseObservable
()
{
@Transient
@
get
:
Bindable
var
unreadCount
=
0
set
(
value
)
{
field
=
value
notifyPropertyChanged
(
BR
.
unreadCount
)
}
@Transient
var
unreadList
=
listOf
<
ItemId
>()
}
...
...
app/src/main/java/fr/chenry/android/freshrss/store/databindingsupport/viewmodels/UnreadSubscriptionsViewModel.kt
View file @
d82382d9
...
...
@@ -14,7 +14,10 @@ class UnreadSubscriptionsViewModel: ViewModel() {
}
}
val
subscriptions
:
Subscriptions
get
()
=
liveData
.
value
?.
values
?:
listOf
()
val
subscriptions
=
MutableLiveData
<
Subscriptions
>().
apply
{
this
.
value
=
liveData
.
value
?.
values
?:
listOf
()
liveData
.
observeForever
{
this
.
value
=
liveData
.
value
?.
values
?:
listOf
()}
}
private
fun
load
():
MapList
<
String
,
Subscription
>
{
if
(
Store
.
subscriptions
.
isNullOrEmpty
())
return
MapList
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment