tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

button on feed not visible when task is checked

Browse source
This commit is contained in:
lbarraga 2023-05-09 22:29:07 +02:00
parent 529adbcab3
commit 6a560fee79
4 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/be/ugent/sel/studeez/common/composable/ButtonComposable.kt
View file

@ -20,6 +20,7 @@ import androidx.compose.material.icons.filled.Add
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
@ -84,7 +85,7 @@ fun StealthButton(
backgroundColor = MaterialTheme.colors.surface,
contentColor = MaterialTheme.colors.onSurface.copy(alpha = 0.4f)
),
border = BorderStroke(3.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.4f))
border = BorderStroke(2.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.4f))
)
}

11
app/src/main/java/be/ugent/sel/studeez/common/composable/feed/FeedEntry.kt
View file

@ -4,7 +4,10 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.Card
import androidx.compose.material.Icon
import androidx.compose.material.Text
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Info
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@ -16,6 +19,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import be.ugent.sel.studeez.R
import be.ugent.sel.studeez.common.composable.StealthButton
import be.ugent.sel.studeez.common.ext.fieldModifier
import be.ugent.sel.studeez.data.local.models.FeedEntry
import be.ugent.sel.studeez.data.local.models.timer_functional.HoursMinutesSeconds
@ -69,6 +73,7 @@ fun FeedEntry(
Text(text = HoursMinutesSeconds(feedEntry.totalStudyTime).toString())
}
}
if (!feedEntry.isArchived) {
StealthButton(
text = R.string.continue_task,
modifier = Modifier
@ -77,6 +82,12 @@ fun FeedEntry(
) {
continueWithTask()
}
} else {
Row {
Icon(imageVector = Icons.Default.Info, contentDescription = null)
Text(text = "Deleted", modifier = Modifier.padding(horizontal = 5.dp))
}
}
}
}
}

3
app/src/main/java/be/ugent/sel/studeez/data/local/models/FeedEntry.kt
View file

@ -9,5 +9,6 @@ data class FeedEntry(
val taskId: String = "", // Name of task is not unique
val subjectId: String = "",
val totalStudyTime: Int = 0,
val endTime: Timestamp = Timestamp(0, 0)
val endTime: Timestamp = Timestamp(0, 0),
val isArchived: Boolean = false
)

3
app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt
View file

@ -72,7 +72,8 @@ class FirebaseFeedDAO @Inject constructor(
taskId = task.id,
subjectId = subject.id,
totalStudyTime = sessionReport.studyTime,
endTime = sessionReport.endTime
endTime = sessionReport.endTime,
isArchived = task.completed
)
}
}