Skip to content

Commit 34268fe

Browse files
authored
Merge pull request #31 from Nithsua/main
Removed borderside border and some ui changes
2 parents c97b939 + 64c0980 commit 34268fe

File tree

10 files changed

+561
-229
lines changed

10 files changed

+561
-229
lines changed

lib/home_view.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'package:develove/views/home_view/explore/new_explore_page.dart';
12
import 'package:flutter/material.dart';
23
import 'package:supabase/supabase.dart';
34

@@ -55,7 +56,8 @@ class _HomeViewState extends AuthRequiredState<HomeView> {
5556
HomePage(
5657
userId: _userId,
5758
),
58-
ExplorePage(),
59+
// ExplorePage(),
60+
NewExplorePage(),
5961
GuildListPage(),
6062
ProfilePage()
6163
],

lib/main.dart

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ class App extends StatelessWidget {
3232
Widget build(BuildContext context) {
3333
return MaterialApp(
3434
theme: ThemeData(
35-
backgroundColor: Color(0xFF282828),
35+
backgroundColor: Color(0xFF2D2D2D),
3636
cardTheme: CardTheme(
3737
color: Color(0xFF474747),
38+
elevation: 5.0,
3839
),
3940
floatingActionButtonTheme: FloatingActionButtonThemeData(
4041
backgroundColor: Color(0xFF6ECD95),
@@ -47,15 +48,26 @@ class App extends StatelessWidget {
4748
statusBarBrightness: Brightness.dark,
4849
),
4950
elevation: 0.0,
50-
backgroundColor: Color(0xFF282828),
51+
backgroundColor: Color(0xFF2D2D2D),
5152
),
52-
primarySwatch: Colors.green,
53+
primarySwatch: MaterialColor(0xFF59AF77, {
54+
50: Color(0xFF59AF77).withOpacity(0.1),
55+
100: Color(0xFF59AF77).withOpacity(0.2),
56+
200: Color(0xFF59AF77).withOpacity(0.3),
57+
300: Color(0xFF59AF77).withOpacity(0.4),
58+
400: Color(0xFF59AF77).withOpacity(0.5),
59+
500: Color(0xFF59AF77).withOpacity(0.6),
60+
600: Color(0xFF59AF77).withOpacity(0.7),
61+
700: Color(0xFF59AF77).withOpacity(0.8),
62+
800: Color(0xFF59AF77).withOpacity(0.9),
63+
900: Color(0xFF59AF77).withOpacity(1),
64+
}),
5365
primaryTextTheme: Theme.of(context)
5466
.primaryTextTheme
5567
.apply(displayColor: Color(0xFFDCDCDC), bodyColor: Colors.white),
5668
fontFamily: "Montserrat",
5769
brightness: Brightness.dark,
58-
scaffoldBackgroundColor: Color(0xFF282828),
70+
scaffoldBackgroundColor: Color(0xFF2D2D2D),
5971
bottomNavigationBarTheme: BottomNavigationBarThemeData(
6072
elevation: 10.0,
6173
showSelectedLabels: false,

lib/services/typesense/search_users.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Future<Map<String, dynamic>> searchConnections(String search) async {
2424
return res;
2525
}
2626

27-
void main() async {
28-
final res = await searchConnections('hari');
29-
print(res);
30-
}
27+
// void main() async {
28+
// final res = await searchConnections('hari');
29+
// print(res);
30+
// }

lib/views/home_view/explore/connection_view.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ class ConnectionView extends StatelessWidget {
2929
height: 200,
3030
child: Card(
3131
shape: RoundedRectangleBorder(
32-
borderRadius: BorderRadius.circular(15.0),
33-
side: BorderSide(
34-
width: 1.0, color: Color(0xFF6ECD95))),
32+
borderRadius: BorderRadius.circular(15.0),
33+
// side: BorderSide(
34+
// width: 1.0, color: Color(0xFF6ECD95)),
35+
),
3536
child: Padding(
3637
padding: const EdgeInsets.all(16.0),
3738
child: Column(

lib/views/home_view/explore/explore_page.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,10 @@ class CustomSearch extends SearchDelegate {
196196
tileColor: Color(0xFF474747),
197197
contentPadding: EdgeInsets.all(8.0),
198198
shape: RoundedRectangleBorder(
199-
borderRadius: BorderRadius.circular(15.0),
200-
side: BorderSide(
201-
width: 1.0, color: Color(0xFF6ECD95))),
199+
borderRadius: BorderRadius.circular(15.0),
200+
// side: BorderSide(
201+
// width: 1.0, color: Color(0xFF6ECD95)),
202+
),
202203
leading: FutureBuilder(
203204
future: http.get(Uri.parse(
204205
"https://avatars.dicebear.com/api/miniavs/${data.userName}.svg")),

0 commit comments

Comments
 (0)