diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index afd2fc5..e002f36 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 64aef38..5bb0b75 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 807978a..23b3056 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 0d4ef76..3cdf395 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index e9e3fd5..e7b4a9e 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/logo.jpg b/assets/logo.jpg new file mode 100644 index 0000000..92cc503 Binary files /dev/null and b/assets/logo.jpg differ diff --git a/assets/logo.png b/assets/logo.png deleted file mode 100644 index 14c17b5..0000000 Binary files a/assets/logo.png and /dev/null differ diff --git a/lib/presentation/details_page/details_page.dart b/lib/presentation/details_page/details_page.dart index 35bd1e1..423df5c 100644 --- a/lib/presentation/details_page/details_page.dart +++ b/lib/presentation/details_page/details_page.dart @@ -10,27 +10,26 @@ class DetailsPage extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( appBar: AppBar(), - body: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(bottom: 16.0), - child: Image.network( - data.image ?? '', + body: Padding( + padding: const EdgeInsets.all(20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Center( + child: Image.network( + data.image ?? '', + ), ), - ), - Padding( - padding: const EdgeInsets.only(bottom: 4.0), - child: Text( - data.text, - style: Theme.of(context).textTheme.headlineLarge, - ), - ), - Text( - data.descriptionText, - style: Theme.of(context).textTheme.bodyLarge, - ) - ], + const SizedBox(height: 20), + Text(data.text, + style: + const TextStyle(fontSize: 24, fontWeight: FontWeight.bold)), + const SizedBox(height: 10), + Text(data.descriptionText, + style: const TextStyle(fontSize: 22, color: Colors.black87)), + // Add more details here as needed + ], + ), ), ); } diff --git a/lib/presentation/home_page/card.dart b/lib/presentation/home_page/card.dart index be7cd9a..4f79598 100644 --- a/lib/presentation/home_page/card.dart +++ b/lib/presentation/home_page/card.dart @@ -46,9 +46,9 @@ class _Card extends StatelessWidget { onTap: onTap, child: Container( margin: const EdgeInsets.all(16), - constraints: const BoxConstraints(minHeight: 160), + constraints: const BoxConstraints(minHeight: 240), decoration: BoxDecoration( - color: Colors.white70, + color: Colors.white30, borderRadius: BorderRadius.circular(20), boxShadow: [ BoxShadow( @@ -59,73 +59,70 @@ class _Card extends StatelessWidget { ), ], ), - child: IntrinsicHeight( - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ClipRRect( - borderRadius: const BorderRadius.only( - bottomLeft: Radius.circular(20), - topLeft: Radius.circular(20), - ), - child: SizedBox( - height: double.infinity, - width: 120, - child: Stack( - children: [ - Positioned.fill( - child: Image.network( - image ?? '', - fit: BoxFit.cover, - errorBuilder: (_, __, ___) => const Placeholder(), - ), + child: Column( + children: [ + ClipRRect( + borderRadius: const BorderRadius.only( + topLeft: Radius.circular(20), + topRight: Radius.circular(20), + ), + child: SizedBox( + height: 160, + width: double.infinity, + child: Stack( + children: [ + Positioned.fill( + child: Image.network( + image ?? '', + fit: BoxFit.contain, + errorBuilder: (_, __, ___) => const Placeholder(), ), - ], - ), + ), + ], ), ), - Expanded( - child: Padding( - padding: const EdgeInsets.only(left: 16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - text, - style: Theme.of(context).textTheme.headlineSmall, - ), - Text( - descriptionText, - style: Theme.of(context).textTheme.bodyLarge, - ) - ], + ), + Padding( + padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + text, + style: Theme.of(context).textTheme.headlineSmall, + textAlign: TextAlign.center, ), - ), + Text( + descriptionText, + style: Theme.of(context).textTheme.bodyLarge, + textAlign: TextAlign.center, + ), + ], ), - Align( - alignment: Alignment.bottomRight, - child: Padding( - padding: const EdgeInsets.only(left: 8, right: 16, bottom: 16), - child: GestureDetector( - onTap: () => onLike?.call(id, text, isLiked), - child: AnimatedSwitcher( - duration: const Duration(milliseconds: 200), - child: isLiked - ? const Icon( - Icons.favorite, - color: Colors.redAccent, - key: ValueKey(0), - ) - : const Icon( - Icons.favorite_border, - key: ValueKey(1), - ), + ), + Align( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.only(left: 8, right: 16, bottom: 16), + child: GestureDetector( + onTap: () => onLike?.call(id, text, isLiked), + child: AnimatedSwitcher( + duration: const Duration(milliseconds: 200), + child: isLiked + ? const Icon( + Icons.favorite, + color: Colors.redAccent, + key: ValueKey(0), + ) + : const Icon( + Icons.favorite_border, + key: ValueKey(1), ), ), ), ), - ], - ), + ), + ], ), ), ); diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart index 43612c2..77d9e25 100644 --- a/lib/presentation/home_page/home_page.dart +++ b/lib/presentation/home_page/home_page.dart @@ -187,7 +187,7 @@ class _BodyState extends State<_Body> { '$title ${isLiked ? context.locale.liked : context.locale.disliked}', style: Theme.of(context).textTheme.bodyLarge, ), - backgroundColor: Colors.orangeAccent, + backgroundColor: Colors.white, duration: const Duration(seconds: 1), )); }); diff --git a/pubspec.yaml b/pubspec.yaml index d75c500..2c18d83 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,7 +47,7 @@ dev_dependencies: flutter_icons: android: "ic_launcher" - image_path: "assets/logo.png" + image_path: "assets/logo.jpg" min_sdk_android: 21 flutter: