Skip to content

Commit

Permalink
Updated products and upgraded Android Studio
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeisfeld
jeisfeld committed May 30, 2022
1 parent 626b8d5 commit 251fd84
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 50 deletions.
12 changes: 6 additions & 6 deletions LifxAppEclipse/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<classpathentry kind="lib" path="libs-local/annotation-1.3.0.jar"/>
<classpathentry kind="lib" path="libs-local/core-1.7.0.jar"/>
<classpathentry kind="lib" path="libs-local/appcompat-1.4.1.jar"/>
<classpathentry kind="lib" path="libs-local/constraintlayout-2.1.3.jar"/>
<classpathentry kind="lib" path="libs-local/material-1.5.0.jar"/>
<classpathentry kind="lib" path="libs-local/constraintlayout-2.1.4.jar"/>
<classpathentry kind="lib" path="libs-local/material-1.6.0.jar"/>
<classpathentry kind="lib" path="libs-local/savedstate-1.1.0.jar"/>
<classpathentry kind="lib" path="libs-local/lifecycle-viewmodel-2.4.1.jar"/>
<classpathentry kind="lib" path="libs-local/lifecycle-livedata-core-2.4.1.jar"/>
Expand All @@ -31,9 +31,9 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="libs-local/customview-1.1.0.jar"/>
<classpathentry kind="lib" path="libs-local/drawerlayout-1.1.1.jar"/>
<classpathentry kind="lib" path="libs-local/navigation-common-2.4.1.jar"/>
<classpathentry kind="lib" path="libs-local/navigation-fragment-2.4.1.jar"/>
<classpathentry kind="lib" path="libs-local/navigation-runtime-2.4.1.jar"/>
<classpathentry kind="lib" path="libs-local/navigation-ui-2.4.1.jar"/>
<classpathentry kind="lib" path="libs-local/navigation-common-2.4.2.jar"/>
<classpathentry kind="lib" path="libs-local/navigation-fragment-2.4.2.jar"/>
<classpathentry kind="lib" path="libs-local/navigation-runtime-2.4.2.jar"/>
<classpathentry kind="lib" path="libs-local/navigation-ui-2.4.2.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
97 changes: 62 additions & 35 deletions LifxJava/src/de/jeisfeld/lifx/lan/type/Product.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,55 +18,82 @@ public enum Product {
LIFX_WHITE_900_BR30_H(19, "LIFX White 900 BR30 (High Voltage)", true, false, false, false, false, 2700, 6500, false, false, 0),
LIFX_COLOR_1000_BR30(20, "LIFX Color 1000 BR30", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_COLOR_1000_2(22, "LIFX Color 1000", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_A19(27, "LIFX A19", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_BR30(28, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_A19_NIGHT_VISION(29, "LIFX A19 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_BR30_NIGHT_VISION(30, "LIFX BR30 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_A19(27, "LIFX A19", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_BR30(28, "LIFX BR30", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_A19_NIGHT_VISION(29, "LIFX A19 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_BR30_NIGHT_VISION(30, "LIFX BR30 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_Z(31, "LIFX Z", true, true, false, false, true, 2500, 9000, false, false, Long.MAX_VALUE),
LIFX_Z_2(32, "LIFX Z 2", true, true, false, false, true, 2500, 9000, false, false, 1532997580),
LIFX_DOWNLIGHT(36, "LIFX Downlight", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_DOWNLIGHT_2(37, "LIFX Downlight", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_BEAM(38, "LIFX Beam", true, true, false, false, true, 2500, 9000, false, false, 1532997580),
LIFX_Z_2(32, "LIFX Z 2", true, true, false, false, true, 1500, 9000, false, false, 1532997580),
LIFX_DOWNLIGHT(36, "LIFX Downlight", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_DOWNLIGHT_2(37, "LIFX Downlight", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_BEAM(38, "LIFX Beam", true, true, false, false, true, 1500, 9000, false, false, 1532997580),
LIFX_DOWNLIGHT_WHITE_TO_WARM(39, "LIFX Downlight White to Warm", true, false, false, false, false, 1500, 9000, false, false, 0),
LIFX_DOWNLIGHT_3(40, "LIFX Downlight", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_A19_2(43, "LIFX A19", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_BR30_2(44, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_PLUS__A19_2(45, "LIFX+ A19", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_PLUS_BR30_2(46, "LIFX+ BR30", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_MINI(49, "LIFX Mini", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_MINI_WHITE_TO_WARM(50, "LIFX Mini White to Warm", true, false, false, false, false, 1500, 4000, false, false, 0),
LIFX_DOWNLIGHT_3(40, "LIFX Downlight", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_A19_2(43, "LIFX A19", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_BR30_2(44, "LIFX BR30", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_PLUS__A19_2(45, "LIFX+ A19", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_PLUS_BR30_2(46, "LIFX+ BR30", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_MINI(49, "LIFX Mini", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_MINI_WHITE_TO_WARM(50, "LIFX Mini White to Warm", true, false, false, false, false, 1500, 9000, false, false, 0),
LIFX_MINI_WHITE(51, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_GU10(52, "LIFX GU10", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_GU10_2(53, "LIFX GU10", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_GU10(52, "LIFX GU10", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_GU10_2(53, "LIFX GU10", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_TILE(55, "LIFX Tile", true, true, false, true, false, 2500, 9000, true, false, 0),
LIFX_CANDLE(57, "LIFX Candle", true, true, false, true, false, 2500, 9000, false, false, 0),
LIFX_MINI_COLOR(59, "LIFX Mini Color", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_MINI_WHITE_TO_WARM_2(60, "LIFX Mini White to Warm", true, false, false, false, false, 1500, 4000, false, false, 0),
LIFX_CANDLE(57, "LIFX Candle", true, true, false, true, false, 1500, 9000, false, false, 0),
LIFX_MINI_COLOR(59, "LIFX Mini Color", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_MINI_WHITE_TO_WARM_2(60, "LIFX Mini White to Warm", true, false, false, false, false, 1500, 9000, false, false, 0),
LIFX_MINI_WHITE_2(61, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_A19_3(62, "LIFX A19", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_BR30_3(63, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_PLUS__A19_3(64, "LIFX+ A19", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_PLUS_BR30_3(65, "LIFX+ BR30", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_A19_3(62, "LIFX A19", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_BR30_3(63, "LIFX BR30", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_PLUS__A19_3(64, "LIFX+ A19", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_PLUS_BR30_3(65, "LIFX+ BR30", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_MINI_WHITE_3(66, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_CANDLE_2(68, "LIFX Candle", true, true, false, true, false, 2500, 9000, false, false, 0),
LIFX_CANDLE_2(68, "LIFX Candle", true, true, false, true, false, 1500, 9000, false, false, 0),
LIFX_CANDLE_WHITE_TO_WARM(81, "LIFX Candle White to Warm", true, false, false, true, false, 2200, 6500, false, false, 0),
LIFX_FILAMENT_CLEAR(82, "LIFX Filament Clear", true, false, false, false, false, 2100, 2100, false, false, 0),
LIFX_FILAMENT_AMBER(85, "LIFX Filament Amber", true, false, false, false, false, 2000, 2000, false, false, 0),
LIFX_MINI_WHITE_4(88, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_MINI_WHITE_4(87, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_MINI_WHITE_5(88, "LIFX Mini White", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_SWITCH(89, "LIFX Switch", false, false, false, false, false, 0, 0, false, false, 0),
LIFX_CLEAN(90, "LIFX Clean", true, false, false, false, false, 2700, 2700, false, true, 0),
LIFX_COLOR(91, "LIFX Color", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_COLOR_2(92, "LIFX Color", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_CLEAN(90, "LIFX Clean", true, true, false, false, false, 1500, 9000, false, true, 0),
LIFX_COLOR(91, "LIFX Color", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_COLOR_2(92, "LIFX Color", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_A19_US(93, "LIFX A19 US", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_BR30_4(94, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_CANDLE_WHITE_TO_WARM_2(96, "LIFX Candle White to Warm", true, false, false, true, false, 2200, 6500, false, false, 0),
LIFX_A19_4(97, "LIFX A19", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_BR30_5(98, "LIFX BR30", true, true, false, false, false, 2500, 9000, false, false, 0),
LIFX_CLEAN_2(99, "LIFX Clean", true, false, false, false, false, 2700, 2700, false, true, 0),
LIFX_A19_4(97, "LIFX A19", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_BR30_5(98, "LIFX BR30", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_CLEAN_2(99, "LIFX Clean", true, true, false, false, false, 1500, 9000, false, true, 0),
LIFX_FILAMENT_CLEAR_2(100, "LIFX Filament Clear", true, false, false, false, false, 2100, 2100, false, false, 0),
LIFX_FILAMENT_AMBER_2(101, "LIFX Filament Amber", true, false, false, false, false, 2000, 2000, false, false, 0),
LIFX_A19_NIGHT_VISION_2(109, "LIFX A19 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_BR30_NIGHT_VISION_2(110, "LIFX BR30 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_A19_NIGHT_VISION_3(111, "LIFX A19 Night Vision", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_A19_NIGHT_VISION_2(109, "LIFX A19 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_BR30_NIGHT_VISION_2(110, "LIFX BR30 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_A19_NIGHT_VISION_3(111, "LIFX A19 Night Vision", true, true, true, false, false, 1500, 9000, false, false, 0),
LIFX_BR30_NIGHT_VISION_INTL(112, "LIFX BR30 Night Vision Intl", true, true, true, false, false, 2500, 9000, false, false, 0),
LIFX_MINI_WW_US(113, "LIFX Mini WW US", true, false, false, false, false, 2200, 6500, false, false, 0),
LIFX_MINI_WW_INTL(114, "LIFX Mini WW Intl", true, false, false, false, false, 2200, 6500, false, false, 0),
LIFX_SWITCH_2(115, "LIFX Switch", false, false, false, false, false, 0, 0, false, false, 0),
LIFX_SWITCH_3(116, "LIFX Switch", false, false, false, false, false, 0, 0, false, false, 0),
LIFX_Z_US(117, "LIFX Z US", true, true, false, false, true, 1500, 9000, false, false, 0),
LIFX_Z_INTL(118, "LIFX Z Intl", true, true, false, false, true, 1500, 9000, false, false, 0),
LIFX_BEAM_US(119, "LIFX Beam US", true, true, false, false, true, 1500, 9000, false, false, 0),
LIFX_BEAM_INTL(120, "LIFX Beam Intl", true, true, false, false, true, 1500, 9000, false, false, 0),
LIFX_COLOR_US(123, "LIFX Color US", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_COLOR_INTL(124, "LIFX Color Intl", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_WHITE_TO_WARM_US(125, "LIFX White to Warm US", true, false, false, false, false, 1500, 9000, false, false, 0),
LIFX_WHITE_TO_WARM_INTL(126, "LIFX White to Warm Intl", true, false, false, false, false, 1500, 9000, false, false, 0),
LIFX_WHITE_US(127, "LIFX White US", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_WHITE_INTL(128, "LIFX White Intl", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_COLOR_US_2(129, "LIFX Color US", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_COLOR_INTL_2(130, "LIFX Color Intl", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_WHITE_TO_WARM_US_2(131, "LIFX White to Warm US", true, false, false, false, false, 1500, 9000, false, false, 0),
LIFX_WHITE_TO_WARM_INTL_2(132, "LIFX White to Warm Intl", true, false, false, false, false, 1500, 9000, false, false, 0),
LIFX_WHITE_US_2(133, "LIFX White US", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_WHITE_INTL_2(134, "LIFX White Intl", true, false, false, false, false, 2700, 2700, false, false, 0),
LIFX_GU10_COLOR_US(135, "LIFX GU10 Color US", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_GU10_COLOR_INTL(136, "LIFX GU10 Color Intl", true, true, false, false, false, 1500, 9000, false, false, 0),
LIFX_CANDLE_COLOR_US(137, "LIFX Candle Color US", true, true, false, true, false, 1500, 9000, false, false, 0),
LIFX_CANDLE_COLOR_INTL(138, "LIFX Candle Color Intl", true, true, false, true, false, 1500, 9000, false, false, 0),

// JAVADOC:ON
/**
Expand Down
1 change: 0 additions & 1 deletion LifxTools/.idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions LifxTools/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@ android {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
namespace 'de.jeisfeld.lifx.app'
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.navigation:navigation-fragment:2.4.1'
implementation 'androidx.navigation:navigation-ui:2.4.1'
implementation 'com.google.android.material:material:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment:2.4.2'
implementation 'androidx.navigation:navigation-ui:2.4.2'
implementation 'androidx.fragment:fragment:1.4.1'
implementation 'androidx.preference:preference:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
Expand Down
3 changes: 1 addition & 2 deletions LifxTools/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.jeisfeld.lifx.app">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
Expand Down
2 changes: 1 addition & 1 deletion LifxTools/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.2'
classpath 'com.android.tools.build:gradle:7.2.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion LifxTools/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

0 comments on commit 251fd84

Please sign in to comment.