forked from jens/Automation
Additional variables
This commit is contained in:
@ -32,7 +32,7 @@ public class ActivityManageActionSpeakText extends Activity
|
||||
@Override
|
||||
public void onClick(View v)
|
||||
{
|
||||
if(etSpeakText.getText().toString().length()>0)
|
||||
if(!etSpeakText.getText().toString().isEmpty())
|
||||
{
|
||||
if(resultingAction == null)
|
||||
{
|
||||
|
@ -96,6 +96,7 @@ import java.security.cert.CertificateException;
|
||||
import java.security.cert.X509Certificate;
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
@ -717,7 +718,9 @@ public class Miscellaneous extends Service
|
||||
source.contains("[H]") ||
|
||||
source.contains("[i]") ||
|
||||
source.contains("[s]") ||
|
||||
source.contains("[ms]")
|
||||
source.contains("[ms]") ||
|
||||
source.contains("[w]") ||
|
||||
source.contains("[F]")
|
||||
)
|
||||
{
|
||||
Calendar cal = Calendar.getInstance();
|
||||
@ -785,6 +788,24 @@ public class Miscellaneous extends Service
|
||||
{
|
||||
source = source.replace("[ms]", String.valueOf(cal.get(Calendar.MILLISECOND)));
|
||||
}
|
||||
|
||||
if(source.contains("[w]"))
|
||||
{
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("EEEE");
|
||||
Date d = new Date();
|
||||
String dayOfTheWeek = sdf.format(d);
|
||||
// source = source.replace("[w]", LocalDate.now().getDayOfWeek().name());
|
||||
source = source.replace("[w]", dayOfTheWeek);
|
||||
}
|
||||
|
||||
if(source.contains("[F]"))
|
||||
{
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("MMMM");
|
||||
Date d = new Date();
|
||||
String month = sdf.format(d);
|
||||
// source = source.replace("[F]", LocalDate.now().getMonth().name());
|
||||
source = source.replace("[F]", month);
|
||||
}
|
||||
}
|
||||
|
||||
if(source.contains("[notificationTitle]"))
|
||||
|
Reference in New Issue
Block a user