Skip to content

Commit

Permalink
Merge branch 'main' into 12-quality-create-a-release-upload-mechanism
Browse files Browse the repository at this point in the history
  • Loading branch information
SaicharanKandukuri authored Oct 15, 2022
2 parents 867bf24 + cb214d8 commit 36b66f6
Show file tree
Hide file tree
Showing 20 changed files with 1,232 additions and 9 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ Please follow the [contributing guidelines](CONTRIBUTION.md) to contribute to th
<img src="https://contrib.rocks/image?repo=GDSCParulUniversity/Habit-Tracker-App" />
</a>


Binary file added assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/images/one.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/images/three.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/images/two.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ios/Flutter/Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"
1 change: 1 addition & 0 deletions ios/Flutter/Release.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"
41 changes: 41 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

project 'Runner', {
'Debug' => :debug,
'Profile' => :release,
'Release' => :release,
}

def flutter_root
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
unless File.exist?(generated_xcode_build_settings_path)
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
end

File.foreach(generated_xcode_build_settings_path) do |line|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
return matches[1].strip if matches
end
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
end

require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)

flutter_ios_podfile_setup

target 'Runner' do
use_frameworks!
use_modular_headers!

flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end

post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
end
end
14 changes: 14 additions & 0 deletions lib/common/constants/colors.dart
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
import 'package:flutter/material.dart';

class AppColors {
//light
static const Color primaryColor = Colors.red;
static const Color pinkLight = Color(0xffff7b7e);
static const Color pink = Color(0xffff6266);
static const Color buttonColor = Color(0xffff575b);
static const Color backgroundLight = Colors.white;
static Color greyColor = Colors.grey.shade200;

//dark
static const Color primaryDark = Colors.black;
}

8 changes: 8 additions & 0 deletions lib/common/constants/headings.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const String trackerAppBarHeading = 'Create New Task';
const String trackerTitle = 'Title';
const String trackerDate = 'Date';
const String trackerStartTime = 'Start Time';
const String trackerSelectCat = 'Select Category';
const String trackerWorkingSes = 'Working Session';
const String trackerLongBreak = 'Long Break';
const String trackerShortBreak = 'Short Break';
20 changes: 20 additions & 0 deletions lib/common/constants/textstyles.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:google_fonts/google_fonts.dart';

class MyTextStyle {
static TextStyle headingStyle = GoogleFonts.poppins(
textStyle: TextStyle(
color: Colors.black,
fontSize: 22.sp,
fontWeight: FontWeight.bold,
),
);
static TextStyle subHeadingStyle = GoogleFonts.poppins(
textStyle: TextStyle(
color: Colors.black,
fontSize: 18.sp,
fontWeight: FontWeight.w500,
),
);
}
74 changes: 74 additions & 0 deletions lib/common/constants/theme.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import 'package:flutter/material.dart';
import 'package:habit_tracker_app/common/constants/textstyles.dart';

import 'colors.dart';

ThemeData lightTheme() {
return ThemeData(
primaryColor: AppColors.primaryColor,
scaffoldBackgroundColor: AppColors.backgroundLight,
appBarTheme: AppBarTheme(
backgroundColor: AppColors.backgroundLight,
),
secondaryHeaderColor: AppColors.primaryColor,
textTheme: lightTextTheme(),
buttonTheme: ButtonThemeData(
buttonColor: AppColors.primaryColor,
disabledColor: AppColors.backgroundLight,
),
iconTheme: IconThemeData(
color: AppColors.primaryColor,
),
errorColor: AppColors.primaryColor,
);
}

ThemeData darkTheme() {
return ThemeData(
primaryColor: AppColors.primaryDark,
scaffoldBackgroundColor: AppColors.primaryDark,
textTheme: darkTextTheme(),
);
}

TextTheme lightTextTheme() {
/*
displayLarge, displayMedium, displaySmall
headlineMedium, headlineSmall
titleLarge, titleMedium, titleSmall
bodyLarge, bodyMedium, bodySmall
labelLarge, labelSmall
*/
return TextTheme(
/*
thin -> 10
small -> 12
normal -> 14
large -> 16
*/
titleLarge: MyTextStyle.headingStyle.copyWith(
fontWeight: FontWeight.w500,
),
titleMedium: MyTextStyle.headingStyle.copyWith(
fontWeight: FontWeight.w600,
),
titleSmall: MyTextStyle.headingStyle.copyWith(
fontWeight: FontWeight.w700,
),
bodyLarge: MyTextStyle.headingStyle.copyWith(
fontWeight: FontWeight.w700,
),
bodySmall: MyTextStyle.headingStyle.copyWith(
fontWeight: FontWeight.w700,
),
labelLarge: MyTextStyle.headingStyle,
bodyMedium: MyTextStyle.headingStyle,
displaySmall: MyTextStyle.headingStyle,
);
}

TextTheme darkTextTheme() {
return TextTheme(
bodyText1: MyTextStyle.headingStyle,
);
}
26 changes: 20 additions & 6 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import 'package:flutter/material.dart';
import 'package:habit_tracker_app/screens/splash_screen.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:habit_tracker_app/common/constants/theme.dart';
import 'package:habit_tracker_app/routes/router.dart';
import 'package:habit_tracker_app/screens/screens.dart';


void main() {
runApp(const MyApp());
}
Expand All @@ -10,12 +15,21 @@ class MyApp extends StatelessWidget {

@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'Habit Tracker App',
theme: ThemeData(
primarySwatch: Colors.blue,
),
initialRoute: SplashScreen.routeName,
return ScreenUtilInit(
designSize: const Size(380, 720),
minTextAdapt: true,
splitScreenMode: true,
builder: (context, child) {
return MaterialApp(
debugShowCheckedModeBanner: false,
title: 'Habit Tracker App',
darkTheme: darkTheme(),
theme: lightTheme(),
initialRoute: SplashScreen.routeName,
onGenerateRoute: generateRoute,
home: child,
);
},
);
}
}
Loading

0 comments on commit 36b66f6

Please sign in to comment.