diff --git a/app/build.gradle b/app/build.gradle index 61bdc69..0946b1e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,18 +60,18 @@ android { } dependencies { - googlePlayFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0' - googlePlayFlavorImplementation 'com.google.android.gms:play-services-location:17.1.0' + googlePlayFlavorImplementation 'com.google.firebase:firebase-appindexing:20.0.0' + googlePlayFlavorImplementation 'com.google.android.gms:play-services-location:18.0.0' - apkFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0' - apkFlavorImplementation 'com.google.android.gms:play-services-location:17.1.0' + apkFlavorImplementation 'com.google.firebase:firebase-appindexing:20.0.0' + apkFlavorImplementation 'com.google.android.gms:play-services-location:18.0.0' implementation 'com.linkedin.dexmaker:dexmaker:2.25.0' implementation 'org.apache.commons:commons-lang3:3.0' - implementation "androidx.security:security-crypto:1.0.0" - implementation "androidx.security:security-identity-credential:1.0.0-alpha02" - implementation 'androidx.appcompat:appcompat:1.2.0' + //implementation "androidx.security:security-crypto:1.0.0" + //implementation "androidx.security:security-identity-credential:1.0.0-alpha02" + implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'com.google.android.material:material:1.3.0' testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.2' diff --git a/app/src/apkFlavor/AndroidManifest.xml b/app/src/apkFlavor/AndroidManifest.xml index 053d4a9..acac67e 100644 --- a/app/src/apkFlavor/AndroidManifest.xml +++ b/app/src/apkFlavor/AndroidManifest.xml @@ -146,6 +146,7 @@ + @@ -185,7 +186,6 @@ - @@ -204,8 +204,6 @@ - - diff --git a/app/src/fdroidFlavor/AndroidManifest.xml b/app/src/fdroidFlavor/AndroidManifest.xml index 85793ce..b43e4ff 100644 --- a/app/src/fdroidFlavor/AndroidManifest.xml +++ b/app/src/fdroidFlavor/AndroidManifest.xml @@ -143,6 +143,7 @@ + diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml index cbe2abb..71eee3e 100644 --- a/app/src/googlePlayFlavor/AndroidManifest.xml +++ b/app/src/googlePlayFlavor/AndroidManifest.xml @@ -137,6 +137,7 @@ + diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java b/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java new file mode 100644 index 0000000..6f40466 --- /dev/null +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java @@ -0,0 +1,57 @@ +package com.jens.automation2; + +import android.Manifest; +import android.app.Activity; +import android.content.Context; +import android.os.Build; +import android.os.Bundle; +import android.os.VibrationEffect; +import android.os.Vibrator; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +public class ActivityManageActionVibrate extends Activity +{ + TextView etVibratePattern; + Button bTestVibratePattern, bSaveVibratePattern; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_manage_action_vibrate); + + etVibratePattern = (EditText)findViewById(R.id.etVibratePattern); + bTestVibratePattern = (Button)findViewById(R.id.bTestVibratePattern); + bSaveVibratePattern = (Button)findViewById(R.id.bSaveVibratePattern); + + bTestVibratePattern.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View v) + { + if(ActivityPermissions.havePermission(Manifest.permission.VIBRATE, ActivityManageActionVibrate.this)) + { + String vibrateDurations[] = etVibratePattern.getText().toString().split(","); + + for(String duration : vibrateDurations) + { + Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + { + vibrator.vibrate(VibrationEffect.createOneShot(Long.parseLong(duration), VibrationEffect.DEFAULT_AMPLITUDE)); + } + else + { + vibrator.vibrate(Long.parseLong(duration)); + } + } + } + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_manage_action_vibrate.xml b/app/src/main/res/layout/activity_manage_action_vibrate.xml new file mode 100644 index 0000000..102d0e9 --- /dev/null +++ b/app/src/main/res/layout/activity_manage_action_vibrate.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + +