Skip to content
This repository has been archived by the owner on Jul 12, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' of https://github.com/langx/langx-flutter into fe…
Browse files Browse the repository at this point in the history
…ature-community-filters

# Conflicts:
#	lib/pages/home/community.dart
  • Loading branch information
Addison1 committed Jun 28, 2024
2 parents 9d721fd + 4362d7d commit 5a3d801
Show file tree
Hide file tree
Showing 46 changed files with 638 additions and 371 deletions.
15 changes: 5 additions & 10 deletions .github/ISSUE_TEMPLATE/🐛-bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: "\U0001F41B Bug Report"
about: Create a report to help us improve
title: "\U0001F41B :"
labels: triage

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -23,17 +23,12 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.

_If you want speed up process of this issue, please send 🚀 as a reaction._
_If you want speed up process of this issue, please send 🚀 as a reaction._
9 changes: 1 addition & 8 deletions .github/ISSUE_TEMPLATE/🚀-feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: "\U0001F680 Feature Request"
about: Suggest an idea for this project
title: "\U0001F680 : "
labels: triage

---

**Is your feature request related to a problem? Please describe.**
Expand All @@ -12,10 +11,4 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.

_If you want speed up process of this issue, please send 🚀 as a reaction._
_If you want speed up process of this issue, please send 🚀 as a reaction._
6 changes: 0 additions & 6 deletions lib/appwrite.dart

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
28 changes: 0 additions & 28 deletions lib/components/headappbar.dart

This file was deleted.

185 changes: 185 additions & 0 deletions lib/components/profile/about_me_card.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
import 'package:flutter/material.dart';

// Components Import
import 'package:langx_flutter/assets/svg/info_svg.dart';
import 'package:langx_flutter/assets/svg/country_svg.dart';
import 'package:langx_flutter/assets/svg/gender_svg.dart';
import 'package:langx_flutter/assets/svg/calendar_svg.dart';
import 'package:langx_flutter/assets/svg/clock_svg.dart';
import 'package:langx_flutter/assets/svg/at_sign_svg.dart';
import 'package:langx_flutter/assets/svg/shield_svg.dart';

class ProfileAboutMeCard extends StatelessWidget {
final String country;
final String gender;
final String age;
final String registeredNum;
final String userID;
final bool verifiedemail;
final String? aboutMe;

const ProfileAboutMeCard({
super.key,
required this.country,
required this.gender,
required this.age,
required this.registeredNum,
required this.userID,
required this.verifiedemail,
this.aboutMe,
});

@override
Widget build(BuildContext context) {
String aboutMeText = (aboutMe?.isEmpty ?? true)
? "No 'About Me' text provided yet. 💬"
: aboutMe!;
String verifiedText =
(verifiedemail) ? "Verified Email" : "Unverified Email";
Color verifiedColor =
(verifiedemail) ? const Color(0xFF2DD55B) : Colors.red;

return LayoutBuilder(
builder: (context, constraints) {
double cardHeight =
constraints.maxHeight > 550 ? 550 : constraints.maxHeight;
return SizedBox(
height: cardHeight,
width: MediaQuery.of(context).size.width,
child: Card(
elevation: 5.0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16.0),
),
color: Colors.white,
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Expanded(
child: Text(
'About Me',
style: TextStyle(fontSize: 25),
),
),
],
),
const SizedBox(height: 3),
const Align(
alignment: Alignment.centerLeft,
child: Text(
'Personal Information',
style: TextStyle(
fontSize: 15,
color: Color(0xFF737373),
),
),
),
Expanded(
child: ListView(
physics:
const NeverScrollableScrollPhysics(), // disable scrolling
children: [
ListTile(
leading: const InfoSvg(
color: Color(0xFFFBC02D),
fill: 'none',
widht: 20,
height: 20,
),
title: Text(
aboutMeText,
style: const TextStyle(
fontSize: 15,
color: Color(0xFF737373),
),
),
),
ListTile(
leading: const CountrySvg(
color: Color(0xFFFBC02D),
fill: 'none',
widht: 20,
height: 20,
),
title: Text(
country,
style: const TextStyle(fontSize: 15),
),
),
ListTile(
leading: const GenderSvg(
color: Color(0xFFFBC02D),
fill: 'none',
widht: 20,
height: 20,
),
title: Text(
gender,
style: const TextStyle(fontSize: 15),
),
),
ListTile(
leading: const CalendarSvg(
color: Color(0xFFFBC02D),
fill: 'none',
widht: 20,
height: 20,
),
title: Text(
"$age years old",
style: const TextStyle(fontSize: 15),
),
),
ListTile(
leading: const ClockSvg(
color: Color(0xFFFBC02D),
fill: 'none',
widht: 20,
height: 20,
),
title: Text(
"Registered $registeredNum months ago",
style: const TextStyle(fontSize: 15),
),
),
ListTile(
leading: const AtSignSvg(
color: Color(0xFFFBC02D),
fill: 'none',
widht: 20,
height: 20,
),
title: Text(
userID,
style: const TextStyle(fontSize: 15),
),
),
ListTile(
leading: ShieldSvg(
color: verifiedColor,
fill: 'none',
widht: 20,
height: 20,
),
title: Text(
verifiedText,
style: const TextStyle(fontSize: 15),
),
),
],
),
),
],
),
),
),
);
},
);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:langx_flutter/components/info_svg.dart';

// Components Imports
import 'package:langx_flutter/assets/svg/info_svg.dart';

class ProfileDayStreaksCard extends StatelessWidget {
final String imgUrl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:langx_flutter/components/word_svg.dart';

// Components Imports
import 'package:langx_flutter/assets/svg/word_svg.dart';

class MotherTonguesCard extends StatelessWidget {
final List<String> languages;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:langx_flutter/components/people_svg.dart';
import 'package:langx_flutter/components/eye_svg.dart';

// Components Imports
import 'package:langx_flutter/assets/svg/people_svg.dart';
import 'package:langx_flutter/assets/svg/eye_svg.dart';

class OthersCard extends StatelessWidget {
const OthersCard({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:langx_flutter/components/battery_svg.dart';

// Components Imports
import 'package:langx_flutter/assets/svg/battery_svg.dart';

class StudyLanguagesCard extends StatelessWidget {
final List<String> languages;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:langx_flutter/components/trophy_svg.dart';
import 'package:langx_flutter/components/info_svg.dart';

// Components Imports
import 'package:langx_flutter/assets/svg/trophy_svg.dart';
import 'package:langx_flutter/assets/svg/info_svg.dart';

class ProfileTokenCard extends StatelessWidget {
final String imgUrl;
Expand Down
Loading

0 comments on commit 5a3d801

Please sign in to comment.