Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
LifeLogger
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PLN
LifeLogger
Commits
8508d9f6
Unverified
Commit
8508d9f6
authored
6 years ago
by
PLN (Algolia)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(model): Docs/indent/companion
parent
14592d03
master
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
7 deletions
+23
-7
DataPoint.kt
app/src/main/java/fr/plnech/lifelogger/model/DataPoint.kt
+14
-5
Log.kt
app/src/main/java/fr/plnech/lifelogger/model/Log.kt
+9
-2
No files found.
app/src/main/java/fr/plnech/lifelogger/model/DataPoint.kt
View file @
8508d9f6
...
@@ -20,9 +20,13 @@ package fr.plnech.lifelogger.model
...
@@ -20,9 +20,13 @@ package fr.plnech.lifelogger.model
import
java.util.*
import
java.util.*
import
kotlin.collections.HashMap
import
kotlin.collections.HashMap
private
const
val
NONE
:
Int
=
Int
.
MIN_VALUE
/**
* An event tracked with some associated metadata.
data class
DataPoint
(
val
date
:
Date
=
Date
(),
private
val
metadata
:
HashMap
<
String
,
Any
>
=
HashMap
())
{
*/
data class
DataPoint
(
val
date
:
Date
=
Date
(),
private
val
metadata
:
HashMap
<
String
,
Any
>
=
HashMap
()
)
{
constructor
(
name
:
String
,
count
:
Int
=
NONE
)
:
this
()
{
constructor
(
name
:
String
,
count
:
Int
=
NONE
)
:
this
()
{
metadata
[
"name"
]
=
name
metadata
[
"name"
]
=
name
...
@@ -35,11 +39,15 @@ data class DataPoint(val date: Date = Date(), private val metadata: HashMap<Stri
...
@@ -35,11 +39,15 @@ data class DataPoint(val date: Date = Date(), private val metadata: HashMap<Stri
private
val
count
:
Int
?
private
val
count
:
Int
?
get
()
=
metadata
[
"count"
].
let
{
get
()
=
metadata
[
"count"
].
let
{
if
(
it
==
NONE
)
null
else
it
if
(
it
==
NONE
)
null
else
it
}
as
Int
?
}
as
Int
?
override
fun
toString
():
String
{
override
fun
toString
():
String
{
val
b
=
StringBuilder
(
name
)
val
b
=
StringBuilder
(
name
)
count
?.
let
{
b
.
append
(
"($count)"
)}
count
?.
let
{
b
.
append
(
"($count)"
)
}
return
b
.
toString
()
return
b
.
toString
()
}
}
companion
object
{
const
val
NONE
:
Int
=
Int
.
MIN_VALUE
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app/src/main/java/fr/plnech/lifelogger/model/Log.kt
View file @
8508d9f6
...
@@ -17,7 +17,13 @@
...
@@ -17,7 +17,13 @@
package
fr.plnech.lifelogger.model
package
fr.plnech.lifelogger.model
class
Log
(
val
name
:
String
,
private
val
dataPoints
:
ArrayList
<
DataPoint
>
=
ArrayList
())
{
/**
* A Log of events to track.
*/
class
Log
(
val
name
:
String
,
private
val
dataPoints
:
ArrayList
<
DataPoint
>
=
ArrayList
()
)
{
fun
addPoint
(
dataPoint
:
DataPoint
)
{
fun
addPoint
(
dataPoint
:
DataPoint
)
{
dataPoints
.
add
(
dataPoint
)
dataPoints
.
add
(
dataPoint
)
...
@@ -25,7 +31,7 @@ class Log(val name: String, private val dataPoints : ArrayList<DataPoint> = Arra
...
@@ -25,7 +31,7 @@ class Log(val name: String, private val dataPoints : ArrayList<DataPoint> = Arra
override
fun
toString
():
String
{
override
fun
toString
():
String
{
val
b
=
StringBuilder
(
"$name: "
)
val
b
=
StringBuilder
(
"$name: "
)
dataPoints
.
forEach
({
b
.
append
(
it
).
append
(
" | "
)
})
dataPoints
.
forEach
({
b
.
append
(
it
).
append
(
" | "
)
})
return
b
.
removeSuffix
(
"| "
).
toString
()
return
b
.
removeSuffix
(
"| "
).
toString
()
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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