diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 027b4bcf..0c07aa9a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:theme="@style/Theme.Copa2022" tools:targetApi="31"> diff --git a/app/src/main/kotlin/me/dio/copa/catar/MainActivity.kt b/app/src/main/kotlin/me/dio/copa/catar/MainActivity.kt deleted file mode 100644 index 0f9470bf..00000000 --- a/app/src/main/kotlin/me/dio/copa/catar/MainActivity.kt +++ /dev/null @@ -1,44 +0,0 @@ -package me.dio.copa.catar - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -import me.dio.copa.catar.ui.theme.Copa2022Theme - -class MainActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContent { - Copa2022Theme { - // A surface container using the 'background' color from the theme - Surface( - modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colors.background - ) { - Greeting("Android") - } - } - } - } - -} - -@Composable -fun Greeting(name: String) { - Text(text = "Hello $name!") -} - -@Composable -@Preview(showBackground = true) -fun DefaultPreview() { - Copa2022Theme { - Greeting("Android") - } -} diff --git a/app/src/main/kotlin/me/dio/copa/catar/features/MainActivity.kt b/app/src/main/kotlin/me/dio/copa/catar/features/MainActivity.kt new file mode 100644 index 00000000..e95d7398 --- /dev/null +++ b/app/src/main/kotlin/me/dio/copa/catar/features/MainActivity.kt @@ -0,0 +1,40 @@ +package me.dio.copa.catar.features + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.viewModels +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import dagger.hilt.android.AndroidEntryPoint +import me.dio.copa.catar.extensions.observe +import me.dio.copa.catar.notification.scheduler.extensions.NotificationMatcherWorker +import me.dio.copa.catar.ui.theme.Copa2022Theme + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + private val viewModel by viewModels() + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + observeActions() + setContent { + Copa2022Theme { + val state by viewModel.state.collectAsState() + MainScreen(matches = state.matches, viewModel::toggleNotification) + } + } + } + + private fun observeActions() { + viewModel.action.observe(this) { action -> + when (action) { + is MainUiAction.MatchesNotFound -> TODO() + MainUiAction.Unexpected -> TODO() + is MainUiAction.DisableNotification -> + NotificationMatcherWorker.cancel(applicationContext, action.match) + is MainUiAction.EnableNotification -> + NotificationMatcherWorker.start(applicationContext, action.match) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/me/dio/copa/catar/features/MainScreen.kt b/app/src/main/kotlin/me/dio/copa/catar/features/MainScreen.kt new file mode 100644 index 00000000..e58c73df --- /dev/null +++ b/app/src/main/kotlin/me/dio/copa/catar/features/MainScreen.kt @@ -0,0 +1,150 @@ +package me.dio.copa.catar.features + +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.Card +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import coil.compose.AsyncImage +import me.dio.copa.catar.R +import me.dio.copa.catar.domain.extensions.getDate +import me.dio.copa.catar.domain.model.MatchDomain +import me.dio.copa.catar.domain.model.TeamDomain +import me.dio.copa.catar.ui.theme.Shapes + +typealias NotificationOnClick = (match: MatchDomain) -> Unit + +@Composable +fun MainScreen(matches: List, onNotificationClick: NotificationOnClick) { + Box(modifier = Modifier + .fillMaxSize() + .padding(8.dp)) { + LazyColumn (verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(matches){ match -> + MatchInfo(match, onNotificationClick) + } + } + } +} + +@Composable +fun MatchInfo(match: MatchDomain, onNotificationClick: NotificationOnClick) { + Card ( + shape = Shapes.large, + modifier = Modifier.fillMaxWidth() + ){ + Box{ + AsyncImage( + model = match.stadium.image, + contentDescription = null, + contentScale = ContentScale.Crop, + modifier = Modifier.height(160.dp) + ) + Column(modifier = Modifier.padding(16.dp)) { + Notification(match, onNotificationClick) + Title(match) + Teams(match) + } + } + } +} + +@Composable +fun Notification(match: MatchDomain, onClick: NotificationOnClick) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End + ) { + val drawable = if (match.notificationEnabled) R.drawable.ic_notifications_active + else R.drawable.ic_notifications + + Image( + painter = painterResource(id = drawable), + modifier = Modifier.clickable { + onClick(match) + }, + contentDescription = null + ) + } +} + +@Composable +fun Title(match: MatchDomain) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center + ) { + Text( + text = "${match.date.getDate()} - ${match.name}", + style = MaterialTheme.typography.h6.copy(color = Color.White) + + ) + + } +} + +@Composable +fun Teams(match: MatchDomain) { + Row ( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically + ){ + TeamItem( + team = match.team1, + ) + + Text( + text = "X", + modifier = Modifier.padding(end = 16.dp, start = 16.dp), + style = MaterialTheme.typography.h6.copy(color = Color.White) + ) + + TeamItem( + team = match.team2, + ) + } +} + +@Composable +fun TeamItem(team: TeamDomain) { + Row ( + verticalAlignment = Alignment.CenterVertically + ){ + Text( + text = team.flag, + modifier = Modifier.align(Alignment.CenterVertically), + style = MaterialTheme.typography.h3.copy(color = Color.White) + ) + + Spacer( + modifier = Modifier.size(16.dp) + ) + + Text( + text = team.displayName, + textAlign = TextAlign.Center, + style = MaterialTheme.typography.h6.copy(color = Color.White) + ) + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/me/dio/copa/catar/features/MainViewModel.kt b/app/src/main/kotlin/me/dio/copa/catar/features/MainViewModel.kt new file mode 100644 index 00000000..c74d3868 --- /dev/null +++ b/app/src/main/kotlin/me/dio/copa/catar/features/MainViewModel.kt @@ -0,0 +1,74 @@ +package me.dio.copa.catar.features + +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import me.dio.copa.catar.core.BaseViewModel +import me.dio.copa.catar.domain.model.Match +import me.dio.copa.catar.domain.model.MatchDomain +import me.dio.copa.catar.domain.usecase.DisableNotificationUseCase +import me.dio.copa.catar.domain.usecase.EnableNotificationUseCase +import me.dio.copa.catar.domain.usecase.GetMatchesUseCase +import me.dio.copa.catar.remote.NotFoundException +import me.dio.copa.catar.remote.UnexpectedException +import javax.inject.Inject + +@HiltViewModel +class MainViewModel @Inject constructor( + private val getMatchesUseCase: GetMatchesUseCase, + private val disableNotificationUseCase: DisableNotificationUseCase, + private val enableNotificationUseCase: EnableNotificationUseCase +) : BaseViewModel (MainUiState()){ + + init { + fetchMatches() + } + + private fun fetchMatches() = viewModelScope.launch { + getMatchesUseCase() + .flowOn(Dispatchers.Main) + .catch { + when(it){ + is NotFoundException -> sendAction(MainUiAction.MatchesNotFound(it.message ?: "Erro sem mensagem")) + is UnexpectedException -> sendAction(MainUiAction.Unexpected) + } + }.collect { matches -> + setState { + copy(matches = matches) + } + } + } + + fun toggleNotification(match: Match){ + viewModelScope.launch { + runCatching { + withContext(Dispatchers.Main) { + val action = if (match.notificationEnabled) { + disableNotificationUseCase(match.id) + MainUiAction.DisableNotification(match) + } else { + enableNotificationUseCase(match.id) + MainUiAction.EnableNotification(match) + } + + sendAction(action) + } + } + } + } +} + +data class MainUiState( + val matches: List = emptyList() +) + +sealed interface MainUiAction { + object Unexpected: MainUiAction + data class MatchesNotFound(val message: String) : MainUiAction + data class EnableNotification(val match: Match) : MainUiAction + data class DisableNotification(val match: Match) : MainUiAction +} \ No newline at end of file diff --git a/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/DisableNotificationUseCase.kt b/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/DisableNotificationUseCase.kt new file mode 100644 index 00000000..7c00658e --- /dev/null +++ b/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/DisableNotificationUseCase.kt @@ -0,0 +1,12 @@ +package me.dio.copa.catar.domain.usecase + +import me.dio.copa.catar.domain.repositories.MatchesRepository +import javax.inject.Inject + +class DisableNotificationUseCase @Inject constructor( + private val repository: MatchesRepository +) { + suspend operator fun invoke(id: String) { + repository.disableNotificationFor(id) + } +} \ No newline at end of file diff --git a/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/EnableNotificationUseCase.kt b/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/EnableNotificationUseCase.kt new file mode 100644 index 00000000..4e38ddc0 --- /dev/null +++ b/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/EnableNotificationUseCase.kt @@ -0,0 +1,12 @@ +package me.dio.copa.catar.domain.usecase + +import me.dio.copa.catar.domain.repositories.MatchesRepository +import javax.inject.Inject + +class EnableNotificationUseCase @Inject constructor( + private val repository: MatchesRepository +){ + suspend operator fun invoke(id: String) { + repository.enableNotificationFor(id) + } +} \ No newline at end of file diff --git a/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/GetMatchesUseCase.kt b/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/GetMatchesUseCase.kt new file mode 100644 index 00000000..c89b6512 --- /dev/null +++ b/domain/src/main/kotlin/me/dio/copa/catar/domain/usecase/GetMatchesUseCase.kt @@ -0,0 +1,14 @@ +package me.dio.copa.catar.domain.usecase + +import kotlinx.coroutines.flow.Flow +import me.dio.copa.catar.domain.model.Match +import me.dio.copa.catar.domain.repositories.MatchesRepository +import javax.inject.Inject + +class GetMatchesUseCase @Inject constructor( + private val repository: MatchesRepository +){ + suspend operator fun invoke(): Flow> { + return repository.getMatches() + } +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8eb04d9f..fe753c9d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Oct 15 16:48:08 BRT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew index 4f906e0c..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,69 +15,104 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/notification-scheduler/src/main/kotlin/me/dio/copa/catar/notification/scheduler/extensions/NotificationMatcherWorker.kt b/notification-scheduler/src/main/kotlin/me/dio/copa/catar/notification/scheduler/extensions/NotificationMatcherWorker.kt new file mode 100644 index 00000000..159cd042 --- /dev/null +++ b/notification-scheduler/src/main/kotlin/me/dio/copa/catar/notification/scheduler/extensions/NotificationMatcherWorker.kt @@ -0,0 +1,61 @@ +package me.dio.copa.catar.notification.scheduler.extensions + +import android.content.Context +import androidx.work.Data +import androidx.work.ExistingWorkPolicy +import androidx.work.OneTimeWorkRequest +import androidx.work.OneTimeWorkRequestBuilder +import androidx.work.WorkManager +import androidx.work.Worker +import androidx.work.WorkerParameters +import androidx.work.workDataOf +import me.dio.copa.catar.domain.model.MatchDomain +import java.time.Duration +import java.time.LocalDateTime + +private const val NOTIFICATION_TITLE_KEY = "NOTIFICATION_TITLE_KEY" +private const val NOTIFICATION_CONTENT_KEY = "NOTIFICATION_CONTENT_KEY" + +class NotificationMatcherWorker(private val context: Context, workerParams: WorkerParameters) : + Worker(context, workerParams) { + override fun doWork(): Result { + val title = inputData.getString("NOTIFICATION_TITLE_KEY") ?: throw IllegalArgumentException( + "title is required" + ) + val content = inputData.getString("NOTIFICATION_CONTENT_KEY") + ?: throw IllegalArgumentException("content is required") + + context.showNotification(title, content) + + return Result.success() + } + + companion object { + fun start(context: Context, match: MatchDomain) { + val (id, _, _, team1, team2, matchDate) = match + val initialDelay = Duration.between(LocalDateTime.now(), matchDate).minusMinutes(5) + val inputData = workDataOf( + NOTIFICATION_TITLE_KEY to "Se prepare que o jogo vai começar", + NOTIFICATION_CONTENT_KEY to "Hoje tem ${team1.flag} X ${team2.flag}", + ) + + WorkManager.getInstance(context) + .enqueueUniqueWork( + id, + ExistingWorkPolicy.KEEP, + createRequest(initialDelay, inputData) + ) + } + + fun cancel(context: Context, match: MatchDomain) { + WorkManager.getInstance(context) + .cancelUniqueWork(match.id) + } + + private fun createRequest(initialDelay: Duration, inputData: Data): OneTimeWorkRequest = + OneTimeWorkRequestBuilder() + .setInitialDelay(initialDelay) + .setInputData(inputData) + .build() + } +} \ No newline at end of file