penguin86/luna-tracker
1
2
Fork 3
Code Issues 13 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Feature collection #19

Open
mwarning wants to merge 37 commits from mwarning/luna-tracker:bottle_time into master
pull from: mwarning/luna-tracker:bottle_time
merge into: penguin86:master
Conversation 13 Commits 37 Files Changed 35
-9
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 16e5b39d6f - Show all commits
app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
-9
View File
@@ -695,9 +695,6 @@ class MainActivity : AppCompatActivity() {
var nextEvent = getNextSameEvent(current, templates) var nextEvent = getNextSameEvent(current, templates)
notesET.setText(current.notes) notesET.setText(current.notes)
if (useQuantity) {
qtyET.setText(current.quantity.toString())
}
if (nextEvent == null && current != event) { if (nextEvent == null && current != event) {
nextEvent = event nextEvent = event
@@ -706,9 +703,6 @@ class MainActivity : AppCompatActivity() {
if (nextEvent != null) { if (nextEvent != null) {
nextTextView.setOnClickListener { nextTextView.setOnClickListener {
notesET.setText(nextEvent.notes) notesET.setText(nextEvent.notes)
if (useQuantity) {
qtyET.setText(nextEvent.quantity.toString())
}
updateContent(nextEvent) updateContent(nextEvent)
} }
nextTextView.alpha = 1.0f nextTextView.alpha = 1.0f
@@ -720,9 +714,6 @@ class MainActivity : AppCompatActivity() {
if (prevEvent != null) { if (prevEvent != null) {
prevTextView.setOnClickListener { prevTextView.setOnClickListener {
notesET.setText(prevEvent.notes) notesET.setText(prevEvent.notes)
if (useQuantity) {
qtyET.setText(prevEvent.quantity.toString())
}
updateContent(prevEvent) updateContent(prevEvent)
} }
prevTextView.alpha = 1.0f prevTextView.alpha = 1.0f