diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index 9a7932e..5d474aa 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -1,1074 +1,828 @@ -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> master \ No newline at end of file diff --git a/Sources/justMUSIC/android/app/src/main/AndroidManifest.xml b/Sources/justMUSIC/android/app/src/main/AndroidManifest.xml index e855118..d63318f 100644 --- a/Sources/justMUSIC/android/app/src/main/AndroidManifest.xml +++ b/Sources/justMUSIC/android/app/src/main/AndroidManifest.xml @@ -1,33 +1,35 @@ - - - - - - - - - - - + + + + - + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> + + + + + + + + + diff --git a/Sources/justMUSIC/android/app/src/profile/AndroidManifest.xml b/Sources/justMUSIC/android/app/src/profile/AndroidManifest.xml index 8ffe024..a5cc1f7 100644 --- a/Sources/justMUSIC/android/app/src/profile/AndroidManifest.xml +++ b/Sources/justMUSIC/android/app/src/profile/AndroidManifest.xml @@ -1,7 +1,9 @@ - + - + + \ No newline at end of file diff --git a/Sources/justMUSIC/lib/components/post_button_component.dart b/Sources/justMUSIC/lib/components/post_button_component.dart index 93f75d9..45b2c47 100644 --- a/Sources/justMUSIC/lib/components/post_button_component.dart +++ b/Sources/justMUSIC/lib/components/post_button_component.dart @@ -15,6 +15,12 @@ class _PostButtonComponentState extends State with SingleTickerProviderStateMixin { late AnimationController _controller; + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + @override void initState() { super.initState(); @@ -132,14 +138,11 @@ class _PostButtonComponentState extends State ), )), ClipOval( - child: Positioned( - left: -15, - child: Padding( - padding: const EdgeInsets.only(left: 5, top: 5), - child: Image( - image: AssetImage("assets/images/rocket_button.png"), - height: 65, - ), + child: Padding( + padding: const EdgeInsets.only(left: 5, top: 5), + child: Image( + image: AssetImage("assets/images/rocket_button.png"), + height: 65, ), ), )