-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* this way if you have many devices you can easily find the correct one * removed the blur effect, as it didn't have a visual effect anymore, but did cost alot of perfomance * fixed remove device function, since the code was never migrated so it just pooped the dialog instead of doing something * started using the riverpod generator, since this will be easier to understand for new people, what it actually does * added new log screen in the heater model, since these devices send logs which are interesting to see, when something doesn't work * fixed connection beeing broke when one unfocuses the app, since on windows this isn't needed whatsover and on android the wrong check was used * reworked the add devices dialog, so multiple devices can be added at the same time by ticking the checkbox of each one
- Loading branch information
Showing
12 changed files
with
370 additions
and
163 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,88 @@ | ||
| def localProperties = new Properties() | ||
| def localPropertiesFile = rootProject.file('local.properties') | ||
| if (localPropertiesFile.exists()) { | ||
| localPropertiesFile.withReader('UTF-8') { reader -> | ||
| localProperties.load(reader) | ||
| } | ||
| } | ||
|
|
||
| def flutterRoot = localProperties.getProperty('flutter.sdk') | ||
| if (flutterRoot == null) { | ||
| throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") | ||
| } | ||
|
|
||
| def flutterVersionCode = localProperties.getProperty('flutter.versionCode') | ||
| if (flutterVersionCode == null) { | ||
| flutterVersionCode = '1.1' | ||
| } | ||
|
|
||
| def flutterVersionName = localProperties.getProperty('flutter.versionName') | ||
| if (flutterVersionName == null) { | ||
| flutterVersionName = '1.1' | ||
| } | ||
|
|
||
| def keystoreProperties = new Properties() | ||
| def keystorePropertiesFile = rootProject.file('key.properties') | ||
| if (keystorePropertiesFile.exists()) { | ||
| keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) | ||
| } | ||
|
|
||
| apply plugin: 'com.android.application' | ||
| apply plugin: 'kotlin-android' | ||
| apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" | ||
|
|
||
| android { | ||
| compileSdkVersion 33 | ||
|
|
||
| sourceSets { | ||
| main.java.srcDirs += 'src/main/kotlin' | ||
| } | ||
|
|
||
| lintOptions { | ||
| disable 'InvalidPackage' | ||
| } | ||
|
|
||
| defaultConfig { | ||
| // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). | ||
| applicationId "de.susch19.smarthome" | ||
| resValue "string", "app_name", "Smarthome" | ||
| minSdkVersion 16 | ||
| targetSdkVersion 31 | ||
| versionCode flutterVersionCode.toInteger() | ||
| versionName flutterVersionName | ||
| } | ||
|
|
||
| signingConfigs { | ||
| release { | ||
| keyAlias keystoreProperties['keyAlias'] | ||
| keyPassword keystoreProperties['keyPassword'] | ||
| storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null | ||
| storePassword keystoreProperties['storePassword'] | ||
| } | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| signingConfig signingConfigs.release | ||
| } | ||
| profile { | ||
| applicationIdSuffix ".profile" | ||
| versionNameSuffix "-profile" | ||
| resValue "string", "app_name", "Smarthome Profile" | ||
|
|
||
| } | ||
| debug { | ||
| applicationIdSuffix ".debug" | ||
| versionNameSuffix "-debug" | ||
| resValue "string", "app_name", "Smarthome Debug" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| flutter { | ||
| source '../..' | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | ||
| } | ||
| def localProperties = new Properties() | ||
| def localPropertiesFile = rootProject.file('local.properties') | ||
| if (localPropertiesFile.exists()) { | ||
| localPropertiesFile.withReader('UTF-8') { reader -> | ||
| localProperties.load(reader) | ||
| } | ||
| } | ||
|
|
||
| def flutterRoot = localProperties.getProperty('flutter.sdk') | ||
| if (flutterRoot == null) { | ||
| throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") | ||
| } | ||
|
|
||
| def flutterVersionCode = localProperties.getProperty('flutter.versionCode') | ||
| if (flutterVersionCode == null) { | ||
| flutterVersionCode = '1.1' | ||
| } | ||
|
|
||
| def flutterVersionName = localProperties.getProperty('flutter.versionName') | ||
| if (flutterVersionName == null) { | ||
| flutterVersionName = '1.1' | ||
| } | ||
|
|
||
| def keystoreProperties = new Properties() | ||
| def keystorePropertiesFile = rootProject.file('key.properties') | ||
| if (keystorePropertiesFile.exists()) { | ||
| keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) | ||
| } | ||
|
|
||
| apply plugin: 'com.android.application' | ||
| apply plugin: 'kotlin-android' | ||
| apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" | ||
|
|
||
| android { | ||
| compileSdkVersion 33 | ||
|
|
||
| sourceSets { | ||
| main.java.srcDirs += 'src/main/kotlin' | ||
| } | ||
|
|
||
| lintOptions { | ||
| disable 'InvalidPackage' | ||
| } | ||
|
|
||
| defaultConfig { | ||
| // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). | ||
| applicationId "de.susch19.smarthome" | ||
| resValue "string", "app_name", "Smarthome" | ||
| minSdkVersion flutter.minSdkVersion | ||
| targetSdkVersion 31 | ||
| versionCode flutterVersionCode.toInteger() | ||
| versionName flutterVersionName | ||
| } | ||
|
|
||
| signingConfigs { | ||
| release { | ||
| keyAlias keystoreProperties['keyAlias'] | ||
| keyPassword keystoreProperties['keyPassword'] | ||
| storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null | ||
| storePassword keystoreProperties['storePassword'] | ||
| } | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| signingConfig signingConfigs.release | ||
| } | ||
| profile { | ||
| applicationIdSuffix ".profile" | ||
| versionNameSuffix "-profile" | ||
| resValue "string", "app_name", "Smarthome Profile" | ||
|
|
||
| } | ||
| debug { | ||
| applicationIdSuffix ".debug" | ||
| versionNameSuffix "-debug" | ||
| resValue "string", "app_name", "Smarthome Debug" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| flutter { | ||
| source '../..' | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.