Merge remote-tracking branch 'origin/master' into development
This commit is contained in:
commit
4371fb56f7
10
.idea/runConfigurations.xml
generated
10
.idea/runConfigurations.xml
generated
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="RunConfigurationProducerService">
|
|
||||||
<option name="ignoredProducers">
|
|
||||||
<set>
|
|
||||||
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
@ -11,8 +11,8 @@ android {
|
|||||||
compileSdkVersion 29
|
compileSdkVersion 29
|
||||||
buildToolsVersion '29.0.2'
|
buildToolsVersion '29.0.2'
|
||||||
useLibrary 'org.apache.http.legacy'
|
useLibrary 'org.apache.http.legacy'
|
||||||
versionCode 107
|
versionCode 108
|
||||||
versionName "1.6.36"
|
versionName "1.6.38"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
@ -225,6 +225,19 @@ public class Rule implements Comparable<Rule>
|
|||||||
return XmlFileInterface.writeFile();
|
return XmlFileInterface.writeFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean cloneRule(Context context)
|
||||||
|
{
|
||||||
|
Rule newRule = new Rule();
|
||||||
|
newRule.setName(this.getName() + " - clone");
|
||||||
|
newRule.setRuleActive(this.isRuleActive());
|
||||||
|
newRule.setRuleToggle(this.isRuleToggle());
|
||||||
|
|
||||||
|
newRule.setTriggerSet(this.getTriggerSet());
|
||||||
|
newRule.setActionSet(this.getActionSet());
|
||||||
|
|
||||||
|
return newRule.create(context);
|
||||||
|
}
|
||||||
|
|
||||||
private boolean checkBeforeSaving(Context context, boolean changeExistingRule)
|
private boolean checkBeforeSaving(Context context, boolean changeExistingRule)
|
||||||
{
|
{
|
||||||
if(this.getName() == null || this.getName().length()==0)
|
if(this.getName() == null || this.getName().length()==0)
|
||||||
|
@ -5,7 +5,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:4.2.2'
|
classpath 'com.android.tools.build:gradle:7.0.0'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
4
fastlane/metadata/android/en-US/changelogs/108.txt
Normal file
4
fastlane/metadata/android/en-US/changelogs/108.txt
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
* Translations updated.
|
||||||
|
* New action: Vibrate
|
||||||
|
* Improved speed calculation
|
||||||
|
* Position of tabbar can be chosen (top/bottom)
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
|
||||||
|
Loading…
Reference in New Issue
Block a user