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 079cdc6..4f16953 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 c38f3cb..0ae8956 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 7b140e5..cf1d094 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 7c9e96a..7d2f354 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 d8afeec..eff1947 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/OpSo_about.png b/assets/OpSo_about.png new file mode 100644 index 0000000..bff8b5e Binary files /dev/null and b/assets/OpSo_about.png differ diff --git a/assets/OpSo_main.png b/assets/OpSo_main.png new file mode 100644 index 0000000..6eb63e3 Binary files /dev/null and b/assets/OpSo_main.png differ diff --git a/assets/logo.png b/assets/logo.png deleted file mode 100644 index 3982ba0..0000000 Binary files a/assets/logo.png and /dev/null differ diff --git a/assets/splash screen.png b/assets/splash screen.png deleted file mode 100644 index 77834c6..0000000 Binary files a/assets/splash screen.png and /dev/null differ diff --git a/assets/splash_main.png b/assets/splash_main.png new file mode 100644 index 0000000..6a13019 Binary files /dev/null and b/assets/splash_main.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 5d1bdb0..55dc7bd 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 14aa014..02dfa5b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index ef5e3f3..bda16a2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 85268bf..ab83c48 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 96a1245..be39cd6 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 8145b41..2b6641e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 39e8111..206cf4a 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index ef5e3f3..bda16a2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index c42c7c4..f01b648 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index c29901f..9501e69 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png index 013d730..4f7c590 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png index 5e48a22..21bda10 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png index f24095b..924ad75 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png index 01f1eeb..2b6dbbe 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index c29901f..9501e69 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index cf30c8a..5a2e779 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png index 079cdc6..4f16953 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png index 7c9e96a..7d2f354 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index d092a03..88478bc 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index d806617..f7303b0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index fff9350..397d475 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/ChatBotPage.dart b/lib/ChatBotPage.dart index 95f36b8..7cd32d8 100644 --- a/lib/ChatBotPage.dart +++ b/lib/ChatBotPage.dart @@ -2,7 +2,8 @@ import 'package:adaptive_theme/adaptive_theme.dart'; import 'package:flutter/material.dart'; import 'package:google_generative_ai/google_generative_ai.dart'; -const apiKey = 'put-gemini-api-key'; +// Replace with your actual Gemini API key +const apiKey = 'api-key'; class ChatBotPage extends StatefulWidget { const ChatBotPage({Key? key}) : super(key: key); @@ -43,8 +44,7 @@ class _ChatBotPageState extends State { final content = [Content.text(prompt)]; final response = await _model!.generateContent(content); setState(() { - final botText = response.text!.replaceAll('*', ''); // Remove asterisks - _messages.add({"sender": "bot", "text": botText}); + _messages.add({"sender": "bot", "text": response.text!}); }); } } @@ -124,6 +124,7 @@ class _ChatBotPageState extends State { ); } + @override void dispose() { _controller.dispose(); @@ -131,6 +132,7 @@ class _ChatBotPageState extends State { } } + void main() { runApp(const MaterialApp( home: ChatBotPage(), diff --git a/lib/about.dart b/lib/about.dart index b95e68c..809b464 100644 --- a/lib/about.dart +++ b/lib/about.dart @@ -25,7 +25,7 @@ class AboutScreen extends StatelessWidget { children: [ // Image Image.asset( - 'assets/logo.png', + 'assets/OpSo_about.png', width: ScreenUtil().setWidth(250), height: ScreenUtil().setHeight(250), fit: BoxFit.contain, diff --git a/lib/landing_page.dart b/lib/landing_page.dart index 1d7a89b..8a36491 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -1,109 +1,109 @@ -import 'package:flutter/material.dart'; -import 'package:animated_text_kit/animated_text_kit.dart'; -import 'package:opso/home_page.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; +// import 'package:flutter/material.dart'; +// import 'package:animated_text_kit/animated_text_kit.dart'; +// import 'package:opso/home_page.dart'; +// import 'package:flutter_screenutil/flutter_screenutil.dart'; -class LandingPage extends StatefulWidget { - const LandingPage({super.key}); +// class LandingPage extends StatefulWidget { +// const LandingPage({super.key}); - @override - State createState() => _LandingPageState(); -} +// @override +// State createState() => _LandingPageState(); +// } -class _LandingPageState extends State { - @override - Widget build(BuildContext context) { - ScreenUtilInit( - designSize: Size(360, 690), - ); - // double width = MediaQuery.of(context).size.width; - // double height = MediaQuery.of(context).size.height; - return Scaffold( - body: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.all(20), - child: Container( - child: Column( - children: [ - Center( - child: Container( - width: 360.w, - height: (690.h) / 2, - decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/landing.webp"), - fit: BoxFit.contain), - ), - ), - ), - Center( - child: SizedBox( - child: DefaultTextStyle( - style: TextStyle( - fontSize: 50.sp, - ), - child: AnimatedTextKit( - animatedTexts: [ - ColorizeAnimatedText( - 'Unlock your potential', - textStyle: TextStyle( - fontSize: 20.sp, fontWeight: FontWeight.w700), - colors: [ - const Color.fromRGBO(255, 183, 77, 1), - const Color.fromARGB(255, 231, 225, 208) - ], - ), - ], - isRepeatingAnimation: true, - ), - ), - ), - ), - const Padding(padding: EdgeInsets.only(top: 20)), - Center( - child: SizedBox( - child: Text( - "Contribute to Open Source", - style: TextStyle( - fontWeight: FontWeight.w400, fontSize: 20.sp), - ), - ), - ), - const Padding(padding: EdgeInsets.only(top: 30)), - Center( - child: SizedBox( - width: 250.w, - height: 60.h, - child: ElevatedButton( - style: ElevatedButton.styleFrom( - backgroundColor: - const Color.fromRGBO(255, 183, 77, 1), - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.all(Radius.circular(20)), - )), - onPressed: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => HomePage())); - }, - child: Text( - "Get started", - style: TextStyle( - color: Colors.white, - fontSize: (MediaQuery.of(context).size.width < - MediaQuery.of(context).size.height) - ? 19.sp - : 19.sh), - ), - ), - ), - ), - ], - ), - ), - ), - ), - ); - } -} +// class _LandingPageState extends State { +// @override +// Widget build(BuildContext context) { +// ScreenUtilInit( +// designSize: Size(360, 690), +// ); +// // double width = MediaQuery.of(context).size.width; +// // double height = MediaQuery.of(context).size.height; +// return Scaffold( +// body: SingleChildScrollView( +// child: Padding( +// padding: const EdgeInsets.all(20), +// child: Container( +// child: Column( +// children: [ +// Center( +// child: Container( +// width: 360.w, +// height: (690.h) / 2, +// decoration: const BoxDecoration( +// image: DecorationImage( +// image: AssetImage("assets/landing.webp"), +// fit: BoxFit.contain), +// ), +// ), +// ), +// Center( +// child: SizedBox( +// child: DefaultTextStyle( +// style: TextStyle( +// fontSize: 50.sp, +// ), +// child: AnimatedTextKit( +// animatedTexts: [ +// ColorizeAnimatedText( +// 'Unlock your potential', +// textStyle: TextStyle( +// fontSize: 20.sp, fontWeight: FontWeight.w700), +// colors: [ +// const Color.fromRGBO(255, 183, 77, 1), +// const Color.fromARGB(255, 231, 225, 208) +// ], +// ), +// ], +// isRepeatingAnimation: true, +// ), +// ), +// ), +// ), +// const Padding(padding: EdgeInsets.only(top: 20)), +// Center( +// child: SizedBox( +// child: Text( +// "Contribute to Open Source", +// style: TextStyle( +// fontWeight: FontWeight.w400, fontSize: 20.sp), +// ), +// ), +// ), +// const Padding(padding: EdgeInsets.only(top: 30)), +// Center( +// child: SizedBox( +// width: 250.w, +// height: 60.h, +// child: ElevatedButton( +// style: ElevatedButton.styleFrom( +// backgroundColor: +// const Color.fromRGBO(255, 183, 77, 1), +// shape: const RoundedRectangleBorder( +// borderRadius: BorderRadius.all(Radius.circular(20)), +// )), +// onPressed: () { +// Navigator.push( +// context, +// MaterialPageRoute( +// builder: (context) => HomePage())); +// }, +// child: Text( +// "Get started", +// style: TextStyle( +// color: Colors.white, +// fontSize: (MediaQuery.of(context).size.width < +// MediaQuery.of(context).size.height) +// ? 19.sp +// : 19.sh), +// ), +// ), +// ), +// ), +// ], +// ), +// ), +// ), +// ), +// ); +// } +// } diff --git a/lib/main.dart b/lib/main.dart index 2143ad0..7f441ae 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -65,7 +65,7 @@ class OpSoApp extends StatelessWidget { const MajorLeagueHackingFellowship(), "/linux_foundation": (context) => const LinuxFoundation(), "/GithubCampus": (context) => const GithubCampus(), - "/landing_page": (context) => const LandingPage(), + // "/landing_page": (context) => const LandingPage(), '/splash_screen': (context) => SplashScreen(), }, title: 'OpSo', diff --git a/lib/programs screen/hacktoberfest_screen.dart b/lib/programs screen/hacktoberfest_screen.dart index 583a469..ba4e238 100644 --- a/lib/programs screen/hacktoberfest_screen.dart +++ b/lib/programs screen/hacktoberfest_screen.dart @@ -125,13 +125,13 @@ class _HacktoberfestState extends State { Padding( padding: EdgeInsets.symmetric(vertical: pad), child: Text( - '1. First, go to GitHub.\n\n' - '2. Click on "Issues.\n\n' - '3. Use the filter: is:open is:issue archived:false label:hacktoberfest.\n\n' - '4. Solve issues and make your contributions.\n\n', + '1. First, go to GitHub.\n' + '2. Click on "Issues.\n' + '3. Use the filter: is:open is:issue archived:false label:hacktoberfest.\n' + '4. Solve issues and make your contributions.', style: TextStyle( fontSize: contentSize, - height: 1.5, // Adjusts line spacing + height: 2, // Adjusts line spacing ), ), ), diff --git a/lib/splash_screen.dart b/lib/splash_screen.dart index 3771e51..97be098 100644 --- a/lib/splash_screen.dart +++ b/lib/splash_screen.dart @@ -11,7 +11,7 @@ class _SplashScreenState extends State { void initState() { super.initState(); Timer(Duration(seconds: 3), () { - Navigator.of(context).pushReplacementNamed('/landing_page'); + Navigator.of(context).pushReplacementNamed('/progarm_page'); }); } @@ -24,7 +24,7 @@ class _SplashScreenState extends State { width: screenSize.width, height: screenSize.height, child: Image.asset( - 'assets/splash screen.png', + 'assets/splash_main.png', fit: BoxFit.cover, ), ), diff --git a/pubspec.yaml b/pubspec.yaml index e016287..081c028 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,7 +60,7 @@ dev_dependencies: flutter_icons: android: true ios: true - image_path: "assets/logo.png" + image_path: "assets/OpSo_main.png" # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter packages. @@ -94,7 +94,8 @@ flutter: - assets/projects/swoc/ - assets/projects/hyperledger/ - assets/projects/linux_foundation/ - - assets/splash screen.png + - assets/splash_main.png + - assets/OpSo_about.png - assets/github_swag.png - assets/fossasia.png - assets/sokde.png