Skip to content

UI on Android #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

UI on Android #111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94ea445
UI on Android
tweiss9 Apr 26, 2023
3dedfae
double pop fix on calender
tweiss9 Apr 27, 2023
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
2 changes: 1 addition & 1 deletion project/lib/calendar/calendar_selection.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class CalendarSelection extends StatelessWidget {
style: const TextStyle(fontSize: 10)),
SizedBox(
width: screenWidth,
height: 32,
height: MediaQuery.of(context).viewPadding.bottom,
)
],
),
Expand Down
4 changes: 2 additions & 2 deletions project/lib/calendar/link_calendar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ class _CalendarState extends State<Calendar> {
),
const Text(
style: TextStyle(fontSize: 15),
"Link third-party calendars to be used "),
const Text("with Round (optional)"),
"Link your Google Calendar Here"),
const Text("(optional)"),
Padding(
padding: const EdgeInsets.fromLTRB(50, 50, 50, 150),
child: PlatformElevatedButton(
Expand Down
2 changes: 1 addition & 1 deletion project/lib/group/group_creation.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class _GroupCreationState extends State<GroupCreation> {
style: const TextStyle(fontSize: 10)),
SizedBox(
width: screenWidth,
height: 32,
height: MediaQuery.of(context).viewPadding.bottom,
)
],
),
Expand Down
72 changes: 0 additions & 72 deletions project/lib/group/group_home_new.dart
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions project/lib/home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,7 @@ class _HomeScreen extends State<HomeScreen> {
),
),
Positioned(
width: screenWidth - 32,
height: 0.20 * screenHeight - 16,
left: 16,
bottom: 0,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
Expand Down
54 changes: 27 additions & 27 deletions project/lib/new_group_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ class _NewGroupView extends State<NewGroupView> {
}

void popMain() {
Navigator.of(context).pop();
Navigator.pop(context);
Navigator.pop(context);
}

Future<void> leaveGroup() async {
Expand Down Expand Up @@ -385,13 +386,17 @@ class _NewGroupView extends State<NewGroupView> {
children: [
Row(
children: [
GestureDetector(child: Padding(padding: EdgeInsets.fromLTRB(32, 0, 16, 0), child: SizedBox(child: Image.asset("images/$name" + "App.png"), width: 48, height: 48,),), onTap: () => socialTap(name)),
GestureDetector(child: Padding(padding: EdgeInsets.fromLTRB(32, 0, 16, 0), child: SizedBox(width: 48, height: 48,child: Image.asset("images/$name" + "App.png"),),), onTap: () => socialTap(name)),
Container(padding: EdgeInsets.fromLTRB(0, 0, 0, 0), width: barWidth, height: 32, decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.elliptical(48, 48)),
border: Border.all(color: Colors.white),
),
child: Align(
// FIXME / WONTFIX: Known issue - Inside Bar UI will clip beyond bounds for small fractions
// Ex: 1/24. Not fixing bc it is unlikely to happen in practice (groups aren't that large)
// Push to later sprint if possible
alignment: Alignment.centerLeft,
// FIXME / WONTFIX: Known issue - Inside Bar UI will clip beyond bounds for small fractions
// Ex: 1/24. Not fixing bc it is unlikely to happen in practice (groups aren't that large)
// Push to later sprint if possible
Expand All @@ -401,7 +406,6 @@ class _NewGroupView extends State<NewGroupView> {
borderRadius: BorderRadius.all(Radius.elliptical(200000, 200000)),
border: Border.all(color: roundPurple),
)),
alignment: Alignment.centerLeft,
),
),
Padding(padding: EdgeInsets.fromLTRB(8, 0, 8, 0), child: PlatformText(count.toString(), style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 18),),)
Expand Down Expand Up @@ -488,7 +492,7 @@ class _NewGroupView extends State<NewGroupView> {

mainWidgets.add(
Container(width: screenWidth - 32,
height: (screenWidth - 32) * (2.6/5),
height: screenWidth - 140,
decoration: BoxDecoration(
color: roundPurple,
borderRadius: BorderRadius.all(Radius.elliptical(48, 48)),
Expand All @@ -497,32 +501,33 @@ class _NewGroupView extends State<NewGroupView> {
child: Row(
children: [
Container(
child: Column(
children: [
PlatformText(new DateFormat.MMMM().format(appointment!).toString(), style: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: roundPurple, height: 1.3),),
PlatformText(new DateFormat.d().format(appointment!).toString(), style: TextStyle(fontSize: 96, fontWeight: FontWeight.w900, color: roundPurple, height: 1.0)),
PlatformText(new DateFormat.jm().format(appointment!).toString(), style: TextStyle(fontSize: 36, fontWeight: FontWeight.w900, color: roundPurple, height: 0.8)),
],
),
width: (screenWidth - 64) * 0.6,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.elliptical(48, 48)),
border: Border.all(color: Colors.white)
),
child: Column(
children: [
PlatformText(new DateFormat.MMMM().format(appointment!).toString(), style: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: roundPurple, height: 1.3),),
PlatformText(new DateFormat.d().format(appointment!).toString(), style: TextStyle(fontSize: 50, fontWeight: FontWeight.w900, color: roundPurple, height: 1.0)),
PlatformText(new DateFormat.jm().format(appointment!).toString(), style: TextStyle(fontSize: 36, fontWeight: FontWeight.w900, color: roundPurple, height: 0.8)),
],
),
),
Container(
width: (screenWidth - 64) * 0.475,
child: GestureDetector(
onTap: showRSVPList,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
PlatformText(rsvped.length.toString() + " Confirmed", style: TextStyle(fontSize: 22, fontWeight: FontWeight.bold)),
// align this text below to the center
PlatformText("${rsvped.length} Confirmed", style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold,)),
PlatformText(infoString, style: TextStyle(fontSize: 16,), textAlign: TextAlign.center),
],
),
onTap: showRSVPList,
),
width: (screenWidth - 64) * 0.475,
)
],
),
Expand All @@ -535,12 +540,11 @@ class _NewGroupView extends State<NewGroupView> {
padding: EdgeInsets.fromLTRB(32, 32, 32, 32),
child: Container(
width: screenWidth - 64,
child: PlatformTextButton(child:
child: PlatformTextButton(color: roundPurple,
onPressed: handleCalendarRequest,child:
PlatformText(appointment != null ? "Request Another Time" : "Generate a New Round Up", style:
TextStyle(color: Colors.white, fontWeight: FontWeight.bold)
),
color: roundPurple,
onPressed: handleCalendarRequest,
),
),
),
Expand Down Expand Up @@ -572,7 +576,7 @@ class _NewGroupView extends State<NewGroupView> {
PlatformText(parsedMembers[index].name, style: TextStyle(fontSize: 20),),
Expanded(flex: 1,
child: Align(alignment: Alignment.centerRight,
child: PlatformTextButton(child: PlatformText("View Profile", style: TextStyle(color: Colors.white),), padding: EdgeInsets.fromLTRB(16, 0, 16, 0), color: roundPurple, onPressed: () => profileTap(index),),
child: PlatformTextButton(padding: EdgeInsets.fromLTRB(16, 0, 16, 0), color: roundPurple, onPressed: () => profileTap(index),child: PlatformText("View Profile", style: TextStyle(color: Colors.white, fontSize: 12),),),
)
,)
],
Expand All @@ -584,20 +588,20 @@ class _NewGroupView extends State<NewGroupView> {
mainWidgets.add(SizedBox(width: screenWidth, height: 16,));

mainWidgets.add(
PlatformTextButton(child: PlatformText(isAdmin ? "Delete Circle" : "Leave Group", style: TextStyle(color: Colors.white), selectionColor: Colors.white), onPressed: triggerDelete, color: roundRed,)
PlatformTextButton(onPressed: triggerDelete, color: roundRed,child: PlatformText(isAdmin ? "Delete Circle" : "Leave Group", style: TextStyle(color: Colors.white), selectionColor: Colors.white),)
);

mainWidgets.add(SizedBox(width: screenWidth, height: 16,));

return PlatformScaffold(
appBar: PlatformAppBar(title: PlatformText(group.emoji + " " + group.name, style: TextStyle(color: Colors.black)), backgroundColor: group.color, trailingActions: [
appBar: PlatformAppBar(title: PlatformText(group.emoji + " " + group.name, style: TextStyle(color: Colors.white)), backgroundColor: group.color, trailingActions: [

Padding(padding: EdgeInsets.fromLTRB(32, 0, 16, 0), child: GestureDetector(child: Icon(PlatformIcons(context).book, color: Colors.black), onTap: () => calendar(),),),
Padding(padding: EdgeInsets.fromLTRB(0, 0, 0, 4), child: GestureDetector(child: Icon(PlatformIcons(context).share, color: Colors.black), onTap: () => share(),),)
Padding(padding: EdgeInsets.fromLTRB(32, 0, 24, 0), child: GestureDetector(child: Icon(PlatformIcons(context).book, color: Colors.white), onTap: () => calendar(),),),
Padding(padding: EdgeInsets.fromLTRB(0, 0, 10, 4), child: GestureDetector(child: Icon(PlatformIcons(context).share, color: Colors.white), onTap: () => share(),),)

// Padding(padding: EdgeInsets.zero, child: SizedBox(width: 80, height: 80, child: PlatformIconButton(icon: Icon(PlatformIcons(context).book), color: Colors.black, onPressed: () => calendar(), cupertino: (context, platform) => CupertinoIconButtonData(color: Colors.transparent),)),),
// Padding(padding: EdgeInsets.zero, child: SizedBox(width: 80, height: 80, child: PlatformIconButton(icon: Icon(PlatformIcons(context).share), color: Colors.black, onPressed: () => share(), cupertino: (context, platform) => CupertinoIconButtonData(color: Colors.transparent),)),)
], material: (context, platform) => MaterialAppBarData(iconTheme: IconThemeData(color: Colors.black))),
], material: (context, platform) => MaterialAppBarData(iconTheme: IconThemeData(color: Colors.white))),
body: SingleChildScrollView(
child: Column(
children: mainWidgets,
Expand Down Expand Up @@ -782,10 +786,6 @@ class _NewGroupView extends State<NewGroupView> {
)));
}
);




}),
],
cancelAction: CancelAction(title: PlatformText('Cancel', style: TextStyle(color: Colors.white),)),// onPressed parameter is optional by default will dismiss the ActionSheet
Expand Down
2 changes: 1 addition & 1 deletion project/lib/onboarding/explainer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class Explainer extends StatelessWidget {
style: const TextStyle(fontSize: 10)),
SizedBox(
width: screenWidth,
height: 32,
height: MediaQuery.of(context).viewPadding.bottom,
)
],
),
Expand Down
6 changes: 3 additions & 3 deletions project/lib/onboarding/signin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class SignIn extends StatelessWidget {
isAntiAlias: true,
),
SizedBox(width: screenWidth, height: 8),
PlatformText("Round the world",
PlatformText("Sign In",
style: const TextStyle(fontSize: 36, fontWeight: FontWeight.w600),
textAlign: TextAlign.center),
SizedBox(width: screenWidth, height: 32),
Expand Down Expand Up @@ -159,13 +159,13 @@ class SignIn extends StatelessWidget {
padding: EdgeInsets.zero,
onPressed: () => buttonPress(context),
)),
SizedBox(width: screenWidth, height: 16),
SizedBox(width: screenWidth, height: 20),
PlatformText("© 2023 Round Corp\nFrom Philly with Love 🤍",
textAlign: TextAlign.center,
style: const TextStyle(fontSize: 10)),
SizedBox(
width: screenWidth,
height: 32,
height: MediaQuery.of(context).viewPadding.bottom,
)
],
),
Expand Down
8 changes: 4 additions & 4 deletions project/lib/onboarding/signup.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ class SignUp extends StatelessWidget {
isAntiAlias: true,
),
SizedBox(width: screenWidth, height: 8),
PlatformText("Be Round or\nbe square",
style: const TextStyle(fontSize: 36, fontWeight: FontWeight.w600),
PlatformText("Sign Up",
style: const TextStyle(fontSize: 32, fontWeight: FontWeight.w600),
textAlign: TextAlign.center),
SizedBox(width: screenWidth, height: 32),

Expand Down Expand Up @@ -230,13 +230,13 @@ class SignUp extends StatelessWidget {
padding: EdgeInsets.zero,
onPressed: () => buttonPress(context),
)),
SizedBox(width: screenWidth, height: 16),
SizedBox(width: screenWidth, height: 20),
PlatformText("© 2023 Round Corp\nFrom Philly with Love 🤍",
textAlign: TextAlign.center,
style: const TextStyle(fontSize: 10)),
SizedBox(
width: screenWidth,
height: 32,
height: MediaQuery.of(context).viewPadding.bottom,
)
],
),
Expand Down
12 changes: 6 additions & 6 deletions project/lib/onboarding/social_onboarding.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,17 @@ class SocialOnboarding extends StatelessWidget {
),
SizedBox(width: screenWidth, height: 8),
PlatformText("Get Around",
style: const TextStyle(fontSize: 36, fontWeight: FontWeight.w600)),
SizedBox(width: screenWidth, height: 32),
style: const TextStyle(fontSize: 20, fontWeight: FontWeight.w600)),
SizedBox(width: screenWidth, height: 12),
Padding(
padding:
EdgeInsets.symmetric(horizontal: screenWidth / 8, vertical: 0),
child: PlatformText(
"Save third-party usernames to be used with Round (optional)",
textAlign: TextAlign.center,
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400),
style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w400),
)),
const SizedBox(height: 32),
const SizedBox(height: 12),
SizedBox(
width: screenWidth * (3 / 4),
child: Row(
Expand Down Expand Up @@ -243,13 +243,13 @@ class SocialOnboarding extends StatelessWidget {
padding: EdgeInsets.zero,
onPressed: () => buttonPress(context),
)),
SizedBox(width: screenWidth, height: 16),
SizedBox(width: screenWidth, height: 12),
PlatformText("© 2023 Round Corp\nFrom Philly with Love 🤍",
textAlign: TextAlign.center,
style: const TextStyle(fontSize: 10)),
SizedBox(
width: screenWidth,
height: 32,
height: MediaQuery.of(context).viewPadding.bottom,
)
],
),
Expand Down
Loading