Erweiterungen
This commit is contained in:
1 parent
e16980a322
commit
88dc13391d
6 files changed
+69
-30
No files matched your search
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion flutter.compileSdkVersion
|
compileSdkVersion 34
|
||||||
ndkVersion flutter.ndkVersion
|
ndkVersion flutter.ndkVersion
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
@@ -49,10 +49,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
|
||||||
applicationId "de.assecutor.stadtbote"
|
applicationId "de.assecutor.stadtbote"
|
||||||
// You can update the following values to match your application needs.
|
|
||||||
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
|
||||||
minSdkVersion flutter.minSdkVersion
|
minSdkVersion flutter.minSdkVersion
|
||||||
targetSdkVersion flutter.targetSdkVersion
|
targetSdkVersion flutter.targetSdkVersion
|
||||||
versionCode flutterVersionCode.toInteger()
|
versionCode flutterVersionCode.toInteger()
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ class _TaskListPageState extends State<TaskListPage> {
|
|||||||
Future.delayed(const Duration(seconds: 0), () async {
|
Future.delayed(const Duration(seconds: 0), () async {
|
||||||
_taskList = await _fetchTaskList();
|
_taskList = await _fetchTaskList();
|
||||||
|
|
||||||
_commisionNumber = widget.tour.com;
|
_commisionNumber = widget.tour.com ?? "";
|
||||||
|
|
||||||
_initCompleted = true;
|
_initCompleted = true;
|
||||||
|
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ class JobTour {
|
|||||||
late String mode;
|
late String mode;
|
||||||
late String comp;
|
late String comp;
|
||||||
late String person;
|
late String person;
|
||||||
late String phone;
|
late String? phone;
|
||||||
late String street;
|
late String street;
|
||||||
late String city;
|
late String city;
|
||||||
late String com;
|
late String? com;
|
||||||
late TourPosition? pos;
|
late TourPosition? pos;
|
||||||
late List<String> rem;
|
late List<String> rem;
|
||||||
late List<TourTask> tasks;
|
late List<TourTask> tasks;
|
||||||
|
|||||||
+60
-18
@@ -94,11 +94,21 @@ int _jobTourEstimateSize(
|
|||||||
) {
|
) {
|
||||||
var bytesCount = offsets.last;
|
var bytesCount = offsets.last;
|
||||||
bytesCount += 3 + object.city.length * 3;
|
bytesCount += 3 + object.city.length * 3;
|
||||||
bytesCount += 3 + object.com.length * 3;
|
{
|
||||||
|
final value = object.com;
|
||||||
|
if (value != null) {
|
||||||
|
bytesCount += 3 + value.length * 3;
|
||||||
|
}
|
||||||
|
}
|
||||||
bytesCount += 3 + object.comp.length * 3;
|
bytesCount += 3 + object.comp.length * 3;
|
||||||
bytesCount += 3 + object.mode.length * 3;
|
bytesCount += 3 + object.mode.length * 3;
|
||||||
bytesCount += 3 + object.person.length * 3;
|
bytesCount += 3 + object.person.length * 3;
|
||||||
bytesCount += 3 + object.phone.length * 3;
|
{
|
||||||
|
final value = object.phone;
|
||||||
|
if (value != null) {
|
||||||
|
bytesCount += 3 + value.length * 3;
|
||||||
|
}
|
||||||
|
}
|
||||||
{
|
{
|
||||||
final value = object.pos;
|
final value = object.pos;
|
||||||
if (value != null) {
|
if (value != null) {
|
||||||
@@ -165,12 +175,12 @@ JobTour _jobTourDeserialize(
|
|||||||
) {
|
) {
|
||||||
final object = JobTour();
|
final object = JobTour();
|
||||||
object.city = reader.readString(offsets[0]);
|
object.city = reader.readString(offsets[0]);
|
||||||
object.com = reader.readString(offsets[1]);
|
object.com = reader.readStringOrNull(offsets[1]);
|
||||||
object.comp = reader.readString(offsets[2]);
|
object.comp = reader.readString(offsets[2]);
|
||||||
object.id = reader.readLong(offsets[3]);
|
object.id = reader.readLong(offsets[3]);
|
||||||
object.mode = reader.readString(offsets[4]);
|
object.mode = reader.readString(offsets[4]);
|
||||||
object.person = reader.readString(offsets[5]);
|
object.person = reader.readString(offsets[5]);
|
||||||
object.phone = reader.readString(offsets[6]);
|
object.phone = reader.readStringOrNull(offsets[6]);
|
||||||
object.pos = reader.readObjectOrNull<TourPosition>(
|
object.pos = reader.readObjectOrNull<TourPosition>(
|
||||||
offsets[7],
|
offsets[7],
|
||||||
TourPositionSchema.deserialize,
|
TourPositionSchema.deserialize,
|
||||||
@@ -200,7 +210,7 @@ P _jobTourDeserializeProp<P>(
|
|||||||
case 0:
|
case 0:
|
||||||
return (reader.readString(offset)) as P;
|
return (reader.readString(offset)) as P;
|
||||||
case 1:
|
case 1:
|
||||||
return (reader.readString(offset)) as P;
|
return (reader.readStringOrNull(offset)) as P;
|
||||||
case 2:
|
case 2:
|
||||||
return (reader.readString(offset)) as P;
|
return (reader.readString(offset)) as P;
|
||||||
case 3:
|
case 3:
|
||||||
@@ -210,7 +220,7 @@ P _jobTourDeserializeProp<P>(
|
|||||||
case 5:
|
case 5:
|
||||||
return (reader.readString(offset)) as P;
|
return (reader.readString(offset)) as P;
|
||||||
case 6:
|
case 6:
|
||||||
return (reader.readString(offset)) as P;
|
return (reader.readStringOrNull(offset)) as P;
|
||||||
case 7:
|
case 7:
|
||||||
return (reader.readObjectOrNull<TourPosition>(
|
return (reader.readObjectOrNull<TourPosition>(
|
||||||
offset,
|
offset,
|
||||||
@@ -370,8 +380,24 @@ extension JobTourQueryFilter
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comIsNull() {
|
||||||
|
return QueryBuilder.apply(this, (query) {
|
||||||
|
return query.addFilterCondition(const FilterCondition.isNull(
|
||||||
|
property: r'com',
|
||||||
|
));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comIsNotNull() {
|
||||||
|
return QueryBuilder.apply(this, (query) {
|
||||||
|
return query.addFilterCondition(const FilterCondition.isNotNull(
|
||||||
|
property: r'com',
|
||||||
|
));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comEqualTo(
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comEqualTo(
|
||||||
String value, {
|
String? value, {
|
||||||
bool caseSensitive = true,
|
bool caseSensitive = true,
|
||||||
}) {
|
}) {
|
||||||
return QueryBuilder.apply(this, (query) {
|
return QueryBuilder.apply(this, (query) {
|
||||||
@@ -384,7 +410,7 @@ extension JobTourQueryFilter
|
|||||||
}
|
}
|
||||||
|
|
||||||
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comGreaterThan(
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comGreaterThan(
|
||||||
String value, {
|
String? value, {
|
||||||
bool include = false,
|
bool include = false,
|
||||||
bool caseSensitive = true,
|
bool caseSensitive = true,
|
||||||
}) {
|
}) {
|
||||||
@@ -399,7 +425,7 @@ extension JobTourQueryFilter
|
|||||||
}
|
}
|
||||||
|
|
||||||
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comLessThan(
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comLessThan(
|
||||||
String value, {
|
String? value, {
|
||||||
bool include = false,
|
bool include = false,
|
||||||
bool caseSensitive = true,
|
bool caseSensitive = true,
|
||||||
}) {
|
}) {
|
||||||
@@ -414,8 +440,8 @@ extension JobTourQueryFilter
|
|||||||
}
|
}
|
||||||
|
|
||||||
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comBetween(
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> comBetween(
|
||||||
String lower,
|
String? lower,
|
||||||
String upper, {
|
String? upper, {
|
||||||
bool includeLower = true,
|
bool includeLower = true,
|
||||||
bool includeUpper = true,
|
bool includeUpper = true,
|
||||||
bool caseSensitive = true,
|
bool caseSensitive = true,
|
||||||
@@ -942,8 +968,24 @@ extension JobTourQueryFilter
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneIsNull() {
|
||||||
|
return QueryBuilder.apply(this, (query) {
|
||||||
|
return query.addFilterCondition(const FilterCondition.isNull(
|
||||||
|
property: r'phone',
|
||||||
|
));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneIsNotNull() {
|
||||||
|
return QueryBuilder.apply(this, (query) {
|
||||||
|
return query.addFilterCondition(const FilterCondition.isNotNull(
|
||||||
|
property: r'phone',
|
||||||
|
));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneEqualTo(
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneEqualTo(
|
||||||
String value, {
|
String? value, {
|
||||||
bool caseSensitive = true,
|
bool caseSensitive = true,
|
||||||
}) {
|
}) {
|
||||||
return QueryBuilder.apply(this, (query) {
|
return QueryBuilder.apply(this, (query) {
|
||||||
@@ -956,7 +998,7 @@ extension JobTourQueryFilter
|
|||||||
}
|
}
|
||||||
|
|
||||||
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneGreaterThan(
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneGreaterThan(
|
||||||
String value, {
|
String? value, {
|
||||||
bool include = false,
|
bool include = false,
|
||||||
bool caseSensitive = true,
|
bool caseSensitive = true,
|
||||||
}) {
|
}) {
|
||||||
@@ -971,7 +1013,7 @@ extension JobTourQueryFilter
|
|||||||
}
|
}
|
||||||
|
|
||||||
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneLessThan(
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneLessThan(
|
||||||
String value, {
|
String? value, {
|
||||||
bool include = false,
|
bool include = false,
|
||||||
bool caseSensitive = true,
|
bool caseSensitive = true,
|
||||||
}) {
|
}) {
|
||||||
@@ -986,8 +1028,8 @@ extension JobTourQueryFilter
|
|||||||
}
|
}
|
||||||
|
|
||||||
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneBetween(
|
QueryBuilder<JobTour, JobTour, QAfterFilterCondition> phoneBetween(
|
||||||
String lower,
|
String? lower,
|
||||||
String upper, {
|
String? upper, {
|
||||||
bool includeLower = true,
|
bool includeLower = true,
|
||||||
bool includeUpper = true,
|
bool includeUpper = true,
|
||||||
bool caseSensitive = true,
|
bool caseSensitive = true,
|
||||||
@@ -1650,10 +1692,10 @@ JobTour _$JobTourFromJson(Map<String, dynamic> json) => JobTour()
|
|||||||
..mode = json['mode'] as String
|
..mode = json['mode'] as String
|
||||||
..comp = json['comp'] as String
|
..comp = json['comp'] as String
|
||||||
..person = json['person'] as String
|
..person = json['person'] as String
|
||||||
..phone = json['phone'] as String
|
..phone = json['phone'] as String?
|
||||||
..street = json['street'] as String
|
..street = json['street'] as String
|
||||||
..city = json['city'] as String
|
..city = json['city'] as String
|
||||||
..com = json['com'] as String
|
..com = json['com'] as String?
|
||||||
..pos = json['pos'] == null
|
..pos = json['pos'] == null
|
||||||
? null
|
? null
|
||||||
: TourPosition.fromJson(json['pos'] as Map<String, dynamic>)
|
: TourPosition.fromJson(json['pos'] as Map<String, dynamic>)
|
||||||
|
|||||||
+4
-4
@@ -604,10 +604,10 @@ packages:
|
|||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: geolocator_windows
|
name: geolocator_windows
|
||||||
sha256: a92fae29779d5c6dc60e8411302f5221ade464968fe80a36d330e80a71f087af
|
sha256: "53da08937d07c24b0d9952eb57a3b474e29aae2abf9dd717f7e1230995f13f0e"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.2.2"
|
version: "0.2.3"
|
||||||
glob:
|
glob:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -700,10 +700,10 @@ packages:
|
|||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: image_picker_ios
|
name: image_picker_ios
|
||||||
sha256: fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3
|
sha256: "917a5cadd67d052554cfb258595e54217de53fac5b52939426e26319a02e6297"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.8.9+1"
|
version: "0.8.9+2"
|
||||||
image_picker_linux:
|
image_picker_linux:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
|||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 217.0.0+8
|
version: 218.0.0+9
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=2.19.6 <3.0.0'
|
sdk: '>=2.19.6 <3.0.0'
|
||||||
|
|||||||
Reference in new issue
Block a user