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
3a4f0937
Commit
3a4f0937
authored
Mar 05, 2019
by
Christophe Henry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solves
#20
: Add linebreak between article title and url
parent
affe46b5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
18 deletions
+24
-18
app/src/main/java/fr/chenry/android/freshrss/FreshRSSApplication.kt
...in/java/fr/chenry/android/freshrss/FreshRSSApplication.kt
+3
-4
app/src/main/java/fr/chenry/android/freshrss/components/subscriptionarticles/SubscriptionArticlesDetailFragment.kt
...ubscriptionarticles/SubscriptionArticlesDetailFragment.kt
+18
-12
app/src/main/java/fr/chenry/android/freshrss/utils/Try.kt
app/src/main/java/fr/chenry/android/freshrss/utils/Try.kt
+2
-1
build.gradle
build.gradle
+1
-1
No files found.
app/src/main/java/fr/chenry/android/freshrss/FreshRSSApplication.kt
View file @
3a4f0937
...
...
@@ -10,6 +10,7 @@ import com.facebook.stetho.Stetho
import
fr.chenry.android.freshrss.RefresherService.RefresherBinder
import
fr.chenry.android.freshrss.store.Store
import
fr.chenry.android.freshrss.store.database.FreshRSSDabatabase
import
fr.chenry.android.freshrss.utils.Try
import
fr.chenry.android.freshrss.utils.whenNotNull
import
nl.komponents.kovenant.android.startKovenant
import
nl.komponents.kovenant.android.stopKovenant
...
...
@@ -32,13 +33,11 @@ class FreshRSSApplication: Application() {
bindService
(
Intent
(
this
,
RefresherService
::
class
.
java
),
serviceConnection
,
Context
.
BIND_AUTO_CREATE
)
Store
.
debugMode
=
t
ry
{
Store
.
debugMode
=
T
ry
{
val
properties
=
Properties
()
properties
.
load
(
baseContext
.
assets
.
open
(
"config.properties"
))
properties
.
getProperty
(
"debug"
,
"false"
)
!!
.
toBoolean
()
}
catch
(
_
:
Throwable
)
{
false
}
}.
getOrDefault
(
false
)
if
(
Store
.
debugMode
)
Stetho
.
initializeWithDefaults
(
this
)
}
...
...
app/src/main/java/fr/chenry/android/freshrss/components/subscriptionarticles/SubscriptionArticlesDetailFragment.kt
View file @
3a4f0937
...
...
@@ -82,20 +82,9 @@ class SubscriptionArticlesDetailFragment: Fragment() {
}
private
fun
setupShareAction
(
menu
:
Menu
)
{
val
intent
=
Intent
(
Intent
.
ACTION_SEND
).
apply
{
type
=
"text/plain"
val
regex
=
"\\s*[^\\p{L}]*\\s*${Pattern.quote(article.author)}\\s*\\W*\\s*"
.
toRegex
(
IGNORE_CASE
)
val
computedTitle
=
regex
.
replace
(
article
.
title
,
""
)
val
computedAuthor
=
if
(
article
.
author
.
isBlank
())
""
else
" — ${article.author}"
val
comutedUrl
=
if
(
article
.
href
.
isBlank
())
""
else
"\n${article.href}"
val
intantValue
=
"${computedTitle.capitalize()}${computedAuthor.capitalizeFull()}$comutedUrl"
putExtra
(
Intent
.
EXTRA_TEXT
,
intantValue
)
}
menu
.
findItem
(
R
.
id
.
action_share
)
.
let
{
MenuItemCompat
.
getActionProvider
(
it
)
as
ShareActionProvider
}
.
setShareIntent
(
intent
)
.
setShareIntent
(
ShareIntent
())
}
private
fun
setupOpenInBrowser
(
menu
:
Menu
)
{
...
...
@@ -164,4 +153,21 @@ class SubscriptionArticlesDetailFragment: Fragment() {
return
true
}
inner
class
ShareIntent
:
Intent
(
Intent
.
ACTION_SEND
)
{
private
val
stripAuthorRegex
=
"\\s*[^\\p{L}]*\\s*${Pattern.quote(article.author)}\\s*\\W*\\s*"
.
toRegex
(
IGNORE_CASE
)
private
val
articleTitle
get
()
=
stripAuthorRegex
.
replace
(
article
.
title
,
""
).
capitalize
()
private
val
articleAuthor
get
()
=
if
(
article
.
author
.
isBlank
())
""
else
"— ${article.author}"
.
capitalizeFull
()
private
val
articleShareString
get
()
=
"""
$articleTitle $articleAuthor
${article.href}
"""
.
trimIndent
().
trim
()
init
{
type
=
"text/plain"
putExtra
(
Intent
.
EXTRA_TEXT
,
articleShareString
)
}
}
}
app/src/main/java/fr/chenry/android/freshrss/utils/Try.kt
View file @
3a4f0937
...
...
@@ -4,7 +4,7 @@ class Try<T: Any>(body: () -> T) {
private
lateinit
var
_error
:
Throwable
private
lateinit
var
_value
:
T
val
isSuccess
:
Boolean
get
()
=
::
_
error
.
isInitialized
val
isSuccess
:
Boolean
get
()
=
::
_
value
.
isInitialized
val
value
:
T
get
()
=
_value
val
error
:
Throwable
get
()
=
_error
...
...
@@ -19,4 +19,5 @@ class Try<T: Any>(body: () -> T) {
fun
<
U
:
Any
>
map
(
body
:
(
Try
<
T
>)
->
U
):
Try
<
U
>
=
Try
{
body
(
this
)}
fun
<
U
:
Any
>
whenSuccess
(
body
:
(
T
)
->
U
):
Try
<
T
>
=
if
(
isSuccess
)
body
(
value
).
let
{
this
}
else
this
fun
<
U
:
Any
>
whenError
(
body
:
(
Throwable
)
->
U
):
Try
<
T
>
=
if
(!
isSuccess
)
body
(
error
).
let
{
this
}
else
this
fun
getOrDefault
(
default
:
T
)
=
if
(
isSuccess
)
value
else
default
}
\ No newline at end of file
build.gradle
View file @
3a4f0937
...
...
@@ -10,7 +10,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.3.
1
'
classpath
'com.android.tools.build:gradle:3.3.
2
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath
"org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath
"android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0-rc02"
...
...
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