Skip to content
Snippets Groups Projects
Commit a78605c0 authored by Erik Hinkelmanns's avatar Erik Hinkelmanns
Browse files

Merge remote-tracking branch 'origin/WirMachenFirebaseMitRein' into music_player

# Conflicts:
#	lib/classification/classification.dart
parents b573e963 6fad6397
Branches
Tags
No related merge requests found
......@@ -9,7 +9,6 @@ import 'package:page_transition/page_transition.dart';
import 'package:google_fonts/google_fonts.dart';
import '../homepage.dart';
import '../main.dart';
/*
Klasse zum Einloggen
......@@ -36,7 +35,7 @@ class _LoginPageState extends State<LoginPage> {
return Stack(
children: <Widget>[
Image.asset("assets/ambientL.jpeg",
Image.asset("ambientL.jpeg",
alignment: Alignment.centerLeft,
height: MediaQuery.of(context).size.height,
width: MediaQuery.of(context).size.width,),
......
......@@ -74,10 +74,10 @@ class MoodPage extends State<StateMoodPage> {
}
//sendet den befehl music zum passenden genre rauszusuchen
_changeMusic() async {
//code zum musik ändern
String hexcode = selectedMood.red.toRadixString(16) + selectedMood.green.toRadixString(16) + selectedMood.blue.toRadixString(16);
String genre = await changeFirebase().getGenreByHex(hexcode);
print("genre = " + genre);
//playGenre();
}
//vergleicht zwei farben auf ähnlichkeit
_getColorDistance(Color c1, Color c2) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment