Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
Expand Down Expand Up @@ -28,6 +28,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
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"
44 changes: 44 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# 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__))
target 'RunnerTests' do
inherit! :search_paths
end
end

post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
end
end
56 changes: 35 additions & 21 deletions lib/individual/donation_page.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: use_build_context_synchronously

import 'package:cura/shared/widgets/gradient_background.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -43,6 +45,33 @@ class _DonationPageState extends State<DonationPage> {

@override
Widget build(BuildContext context) {
List<String> organizationAddress = [
'India',
'United States',
'America',
'Washington',
'Paris',
'Jakarta',
'Australia',
'Lorem Ipsum'
];

List<SearchFieldListItem> newAddSuggestions = organizationAddress
.map((orgAdd) => SearchFieldListItem(orgAdd, item: orgName))
.toList();

List<String> organizationSuggestions = [
'Organisation 1',
'Organisation 2',
'Organisation 3',
'Organisation 4',
'Organisation 5',
'Organisation 6',
];

List<SearchFieldListItem> newSuggestions = organizationSuggestions
.map((orgName) => SearchFieldListItem(orgName, item: orgName))
.toList();
return ScreenUtilInit(
designSize: const Size(428, 926),
builder: (context, child) => Scaffold(
Expand Down Expand Up @@ -108,7 +137,7 @@ class _DonationPageState extends State<DonationPage> {
),
borderRadius: BorderRadius.circular(30)),
width: double.infinity,
height: 200.sp,
height: 360.sp,
child: SingleChildScrollView(
physics: const BouncingScrollPhysics(),
scrollDirection: Axis.vertical,
Expand Down Expand Up @@ -178,14 +207,7 @@ class _DonationPageState extends State<DonationPage> {
padding: EdgeInsets.fromLTRB(30.w, 0, 30.w, 0),
child: SearchField(
hint: " Enter organisation's name",
suggestions: const [
'Organisation 1',
'Organisation 2',
'Organisation 3',
'Organisation 4',
'Organisation 5',
'Organisation 6',
],
suggestions: newSuggestions,
searchInputDecoration: InputDecoration(
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
Expand Down Expand Up @@ -230,16 +252,7 @@ class _DonationPageState extends State<DonationPage> {
padding: EdgeInsets.fromLTRB(30.w, 0, 30.w, 0),
child: SearchField(
hint: "Enter Organisation's Address",
suggestions: const [
'India',
'United States',
'America',
'Washington',
'Paris',
'Jakarta',
'Australia',
'Lorem Ipsum'
],
suggestions: newAddSuggestions,
searchInputDecoration: InputDecoration(
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
Expand Down Expand Up @@ -359,7 +372,7 @@ class _DonationPageState extends State<DonationPage> {
BorderRadiusDirectional.circular(10),
color: Colors.white,
),
padding: EdgeInsets.all(15),
padding: const EdgeInsets.all(15),
width:
MediaQuery.of(context).size.width * 0.7,
height: 350,
Expand Down Expand Up @@ -411,6 +424,7 @@ class _DonationPageState extends State<DonationPage> {
child: Text(
"Continue",
style: TextStyle(

color: Colors.white,
fontSize: 20.sp,
fontWeight: FontWeight.w700),
Expand All @@ -427,4 +441,4 @@ class _DonationPageState extends State<DonationPage> {
),
);
}
}
}
52 changes: 26 additions & 26 deletions lib/individual/donor_details.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ class DonorPage extends StatelessWidget {
children: [
IconButton(
onPressed: () {},
icon: Icon(
icon:const Icon(
Icons.arrow_back_ios_new,
size: 15.0,
)),
Text(
),),
const Text(
"Donor Detail",
style: TextStyle(
fontSize: 22.0,
fontWeight: FontWeight.w700,
),
),
SizedBox(
const SizedBox(
width: 48.0,
),
],
Expand All @@ -34,15 +34,15 @@ class DonorPage extends StatelessWidget {
radius: 50.0,
child: Image.asset("assets/Heart.png"),
),
SizedBox(height: 10.0),
Text(
const SizedBox(height: 10.0),
const Text(
"Shazeb",
style:TextStyle(
fontSize: 24.0,
fontWeight: FontWeight.w700,
),
),
Text(
const Text(
"Last Connected 1 month ago",
style:TextStyle(
color: Color(0xFF777474),
Expand All @@ -53,29 +53,29 @@ class DonorPage extends StatelessWidget {
Expanded(
child: Container(
decoration: BoxDecoration(
color:Color(0xFFE0EEEF),
color:const Color(0xFFE0EEEF),
borderRadius: BorderRadius.circular(10.0),
),
padding:EdgeInsets.all(10.0),
margin:EdgeInsets.all(10.0),
child: Text("+1 879 944-4489",textAlign: TextAlign.center,),
padding:const EdgeInsets.all(10.0),
margin:const EdgeInsets.all(10.0),
child:const Text("+1 879 944-4489",textAlign: TextAlign.center,),
),
),
Expanded(
child: Container(
decoration: BoxDecoration(
color:Color(0xFFE0EEEF),
color:const Color(0xFFE0EEEF),
borderRadius: BorderRadius.circular(10.0),
),
padding:EdgeInsets.all(10.0),
margin:EdgeInsets.all(10.0),
child: Text("[email protected]",textAlign: TextAlign.center,),
padding:const EdgeInsets.all(10.0),
margin:const EdgeInsets.all(10.0),
child: const Text("[email protected]",textAlign: TextAlign.center,),
),
),
],
),
SizedBox(height: 10.0),
Text(
const SizedBox(height: 10.0),
const Text(
"Personal Information",
style:TextStyle(
fontSize: 20.0,
Expand All @@ -85,10 +85,10 @@ class DonorPage extends StatelessWidget {
Expanded(
flex:3,
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.0,vertical: 15.0),
margin: EdgeInsets.all(10.0),
padding:const EdgeInsets.symmetric(horizontal: 10.0,vertical: 15.0),
margin: const EdgeInsets.all(10.0),
decoration: BoxDecoration(
color: Color(0xFFE0EEEF),
color: const Color(0xFFE0EEEF),
borderRadius: BorderRadius.circular(15.0),
),
child: Column(children: [
Expand All @@ -103,7 +103,7 @@ class DonorPage extends StatelessWidget {
),
),
),
Text(
const Text(
"Administrative Details",
style:TextStyle(
fontSize: 20.0,
Expand All @@ -112,10 +112,10 @@ class DonorPage extends StatelessWidget {
),
Expanded(
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.0,vertical: 15.0),
margin: EdgeInsets.all(10.0),
padding:const EdgeInsets.symmetric(horizontal: 10.0,vertical: 15.0),
margin: const EdgeInsets.all(10.0),
decoration: BoxDecoration(
color: Color(0xFFE0EEEF),
color:const Color(0xFFE0EEEF),
borderRadius: BorderRadius.circular(15.0),
),
child: Column(children: [
Expand Down Expand Up @@ -149,7 +149,7 @@ class TwoTexts extends StatelessWidget {
Expanded(
child: Text(
heading,
style: TextStyle(
style:const TextStyle(
fontSize: 14.0,
fontWeight: FontWeight.w700,
),
Expand All @@ -159,7 +159,7 @@ class TwoTexts extends StatelessWidget {
child: Text(
text,
textAlign: TextAlign.end,
style: TextStyle(
style:const TextStyle(
fontSize: 14.0,
fontWeight: FontWeight.w400,
),
Expand Down
Loading