Skip to content

Commit

Permalink
textfield text colors for new flutter version
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonIT committed Dec 3, 2019
1 parent 970870d commit 5d29816
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 102 deletions.
111 changes: 37 additions & 74 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,74 +1,37 @@
# Miscellaneous
*.class
*.log
*.pyc
*.swp
.DS_Store
.atom/
.buildlog/
.history
.svn/

# IntelliJ related
*.iml
*.ipr
*.iws
.idea/

# The .vscode folder contains launch configuration and tasks you configure in
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
#.vscode/

# Flutter/Dart/Pub related
**/doc/api/
.dart_tool/
.flutter-plugins
.packages
.pub-cache/
.pub/
/build/

# Android related
**/android/**/gradle-wrapper.jar
**/android/.gradle
**/android/captures/
**/android/gradlew
**/android/gradlew.bat
**/android/key.properties
**/android/local.properties
**/android/**/GeneratedPluginRegistrant.java

# iOS/XCode related
**/ios/**/*.mode1v3
**/ios/**/*.mode2v3
**/ios/**/*.moved-aside
**/ios/**/*.pbxuser
**/ios/**/*.perspectivev3
**/ios/**/*sync/
**/ios/**/.sconsign.dblite
**/ios/**/.tags*
**/ios/**/.vagrant/
**/ios/**/DerivedData/
**/ios/**/Icon?
**/ios/**/Pods/
**/ios/**/.symlinks/
**/ios/**/profile
**/ios/**/xcuserdata
**/ios/.generated/
**/ios/Flutter/App.framework
**/ios/Flutter/Flutter.framework
**/ios/Flutter/Generated.xcconfig
**/ios/Flutter/app.flx
**/ios/Flutter/app.zip
**/ios/Flutter/flutter_assets/
**/ios/Flutter/flutter_export_environment.sh
**/ios/ServiceDefinitions.json
**/ios/Runner/GeneratedPluginRegistrant.*

# Exceptions to above rules.
!**/ios/**/default.mode1v3
!**/ios/**/default.mode2v3
!**/ios/**/default.pbxuser
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
# Miscellaneous
*.class
*.log
*.pyc
*.swp
.DS_Store
.atom/
.buildlog/
.history
.svn/

# IntelliJ related
*.iml
*.ipr
*.iws
.idea/

# The .vscode folder contains launch configuration and tasks you configure in
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
#.vscode/

# Flutter/Dart/Pub related
**/doc/api/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
.pub-cache/
.pub/
/build/

# Web related
lib/generated_plugin_registrant.dart

# Exceptions to above rules.
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
8 changes: 8 additions & 0 deletions android/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
gradle-wrapper.jar
/.gradle
/captures/
/gradlew
/gradlew.bat
/local.properties
GeneratedPluginRegistrant.java
/key.properties
32 changes: 32 additions & 0 deletions ios/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
*.mode1v3
*.mode2v3
*.moved-aside
*.pbxuser
*.perspectivev3
**/*sync/
.sconsign.dblite
.tags*
**/.vagrant/
**/DerivedData/
Icon?
**/Pods/
**/.symlinks/
profile
xcuserdata
**/.generated/
Flutter/App.framework
Flutter/Flutter.framework
Flutter/Flutter.podspec
Flutter/Generated.xcconfig
Flutter/app.flx
Flutter/app.zip
Flutter/flutter_assets/
Flutter/flutter_export_environment.sh
ServiceDefinitions.json
Runner/GeneratedPluginRegistrant.*

# Exceptions to above rules.
!default.mode1v3
!default.mode2v3
!default.pbxuser
!default.perspectivev3
4 changes: 4 additions & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ class _TimeTrackerState extends State<TimeTracker> {
state.comment = text;
api.setTrackerState(state);
},
style: TextStyle(color: CupertinoTheme.of(context).primaryContrastingColor),
),
),
Padding(
Expand Down Expand Up @@ -1136,6 +1137,7 @@ class _CredentialsPageState extends State<CredentialsPage> {
placeholder: "Firmen ID",
autocorrect: false,
maxLines: 1,
style: TextStyle(color: CupertinoTheme.of(context).primaryContrastingColor),
),
),
Padding(
Expand All @@ -1145,6 +1147,7 @@ class _CredentialsPageState extends State<CredentialsPage> {
placeholder: "Nutzer",
autocorrect: false,
maxLines: 1,
style: TextStyle(color: CupertinoTheme.of(context).primaryContrastingColor),
),
),
Padding(
Expand All @@ -1160,6 +1163,7 @@ class _CredentialsPageState extends State<CredentialsPage> {
if (value.isEmpty) showPassword = false;
});
},
style: TextStyle(color: CupertinoTheme.of(context).primaryContrastingColor),
),
),
Padding(
Expand Down
42 changes: 14 additions & 28 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.36.4"
analyzer_plugin:
dependency: transitive
description:
name: analyzer_plugin
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.1"
app_review:
dependency: "direct main"
description:
Expand All @@ -28,7 +21,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.10"
version: "2.0.11"
args:
dependency: transitive
description:
Expand All @@ -42,7 +35,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.0"
version: "2.4.0"
boolean_selector:
dependency: transitive
description:
Expand Down Expand Up @@ -70,7 +63,7 @@ packages:
name: build_daemon
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.2"
build_resolvers:
dependency: transitive
description:
Expand All @@ -84,7 +77,7 @@ packages:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.1"
version: "1.7.2"
build_runner_core:
dependency: transitive
description:
Expand All @@ -98,21 +91,14 @@ packages:
name: built_collection
url: "https://pub.dartlang.org"
source: hosted
version: "4.2.2"
version: "4.3.0"
built_value:
dependency: transitive
description:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "6.8.2"
built_value_generator:
dependency: transitive
description:
name: built_value_generator
url: "https://pub.dartlang.org"
source: hosted
version: "6.8.2"
version: "7.0.0"
charcode:
dependency: transitive
description:
Expand All @@ -133,7 +119,7 @@ packages:
name: code_builder
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.0"
version: "3.2.1"
collection:
dependency: transitive
description:
Expand Down Expand Up @@ -168,7 +154,7 @@ packages:
name: cupertino_icons
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
version: "0.1.3"
dart_style:
dependency: transitive
description:
Expand Down Expand Up @@ -383,14 +369,14 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.5"
version: "0.12.6"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.7"
version: "1.1.8"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -432,7 +418,7 @@ packages:
name: package_info
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.0+11"
version: "0.4.0+12"
package_resolver:
dependency: transitive
description:
Expand Down Expand Up @@ -570,7 +556,7 @@ packages:
name: stream_transform
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.19"
version: "0.0.20"
string_scanner:
dependency: transitive
description:
Expand Down Expand Up @@ -598,7 +584,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.5"
version: "0.2.11"
timing:
dependency: transitive
description:
Expand Down Expand Up @@ -670,5 +656,5 @@ packages:
source: hosted
version: "2.2.0"
sdks:
dart: ">=2.5.0 <3.0.0"
dart: ">=2.6.0 <3.0.0"
flutter: ">=1.9.1+hotfix.5 <2.0.0"

0 comments on commit 5d29816

Please sign in to comment.