diff --git a/LED-master/.gitignore b/LED-master/.gitignore index afbdab3..cfb7164 100644 --- a/LED-master/.gitignore +++ b/LED-master/.gitignore @@ -1,6 +1,5 @@ .gradle /local.properties -/.idea/workspace.xml -/.idea/libraries +/.idea .DS_Store /build diff --git a/LED-master/.idea/caches/build_file_checksums.ser b/LED-master/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 5a3b454..0000000 Binary files a/LED-master/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/LED-master/.idea/codeStyles/Project.xml b/LED-master/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/LED-master/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/LED-master/.idea/gradle.xml b/LED-master/.idea/gradle.xml deleted file mode 100644 index 7ac24c7..0000000 --- a/LED-master/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/LED-master/.idea/misc.xml b/LED-master/.idea/misc.xml deleted file mode 100644 index 99202cc..0000000 --- a/LED-master/.idea/misc.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/LED-master/.idea/modules.xml b/LED-master/.idea/modules.xml deleted file mode 100644 index 7e7d0e9..0000000 --- a/LED-master/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/LED-master/.idea/runConfigurations.xml b/LED-master/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/LED-master/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/LED-master/LED-master.zip b/LED-master/LED-master.zip new file mode 100644 index 0000000..0f7cf2a Binary files /dev/null and b/LED-master/LED-master.zip differ diff --git a/LED-master/LED.iml b/LED-master/LED.iml deleted file mode 100644 index 3040dcf..0000000 --- a/LED-master/LED.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/LED-master/app/app.iml b/LED-master/app/app.iml deleted file mode 100644 index 8454a93..0000000 --- a/LED-master/app/app.iml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/LED-master/app/build.gradle b/LED-master/app/build.gradle index 6975e5e..301bf94 100644 --- a/LED-master/app/build.gradle +++ b/LED-master/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 30 + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.led.led_on_off" - minSdkVersion 14 - targetSdkVersion 21 + minSdkVersion 24 + targetSdkVersion 30 versionCode 1 versionName "1.0" } @@ -20,6 +20,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:21.0.3' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.3.1' } diff --git a/LED-master/app/src/main/java/com/led_on_off/led/AboutActivity.java b/LED-master/app/src/main/java/com/led_on_off/led/AboutActivity.java index 49627e6..f7cd3ec 100644 --- a/LED-master/app/src/main/java/com/led_on_off/led/AboutActivity.java +++ b/LED-master/app/src/main/java/com/led_on_off/led/AboutActivity.java @@ -3,10 +3,10 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; -public class AboutActivity extends ActionBarActivity +public class AboutActivity extends AppCompatActivity { @Override diff --git a/LED-master/app/src/main/java/com/led_on_off/led/DeviceList.java b/LED-master/app/src/main/java/com/led_on_off/led/DeviceList.java index c1c10b7..8857f15 100644 --- a/LED-master/app/src/main/java/com/led_on_off/led/DeviceList.java +++ b/LED-master/app/src/main/java/com/led_on_off/led/DeviceList.java @@ -1,7 +1,7 @@ package com.led_on_off.led; import android.content.Intent; -import android.support.v7.app.ActionBarActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; @@ -19,7 +19,7 @@ import java.util.Set; -public class DeviceList extends ActionBarActivity +public class DeviceList extends AppCompatActivity { //widgets Button btnPaired; diff --git a/LED-master/app/src/main/java/com/led_on_off/led/ledControl.java b/LED-master/app/src/main/java/com/led_on_off/led/ledControl.java index bd990b1..e9d227e 100644 --- a/LED-master/app/src/main/java/com/led_on_off/led/ledControl.java +++ b/LED-master/app/src/main/java/com/led_on_off/led/ledControl.java @@ -1,6 +1,6 @@ package com.led_on_off.led; -import android.support.v7.app.ActionBarActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; @@ -20,7 +20,7 @@ import java.util.UUID; -public class ledControl extends ActionBarActivity { +public class ledControl extends AppCompatActivity { // Button btnOn, btnOff, btnDis; Button On, Off, Discnt, Abt; @@ -132,14 +132,14 @@ private void msg(String s) Toast.makeText(getApplicationContext(),s,Toast.LENGTH_LONG).show(); } - public void about(View v) - { - if(v.getId() == R.id.abt) - { - Intent i = new Intent(this, AboutActivity.class); - startActivity(i); - } - } +// public void about(View v) +// { +// if(v.getId() == R.id.abt) +// { +// Intent i = new Intent(this, AboutActivity.class); +// startActivity(i); +// } +// } @Override public boolean onCreateOptionsMenu(Menu menu) { diff --git a/LED-master/build.gradle b/LED-master/build.gradle index a6fcfe1..474acdb 100644 --- a/LED-master/build.gradle +++ b/LED-master/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { - jcenter() + mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:4.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { - jcenter() + mavenCentral() + google() } } diff --git a/LED-master/gradle.properties b/LED-master/gradle.properties index 1d3591c..915f0e6 100644 --- a/LED-master/gradle.properties +++ b/LED-master/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/LED-master/gradle/wrapper/gradle-wrapper.properties b/LED-master/gradle/wrapper/gradle-wrapper.properties index 0c71e76..35e4c55 100644 --- a/LED-master/gradle/wrapper/gradle-wrapper.properties +++ b/LED-master/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Fri Jul 29 21:37:13 EDT 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +zipStoreBase=GRADLE_USER_HOME