Skip to content

Commit 9dc9a9b

Browse files
SiroDavesSiroDaves
committed
major fixes in sessions and speakers screens
1 parent b16da40 commit 9dc9a9b

22 files changed

+501
-202
lines changed

‎android/app/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ android {
3131
targetSdkVersion 34
3232
compileSdkVersion 34
3333
multiDexEnabled true
34-
versionCode 1
35-
versionName "1.0.0.1"
34+
versionCode 4
35+
versionName "1.0.0.4"
3636
}
3737

3838
signingConfigs {
@@ -45,8 +45,13 @@ android {
4545
}
4646

4747
buildTypes {
48+
debug {
49+
signingConfig signingConfigs.debug
50+
}
4851
release {
49-
signingConfig = signingConfigs.debug
52+
minifyEnabled true
53+
signingConfig signingConfigs.release
54+
proguardFiles getDefaultProguardFile('proguard-android.txt')
5055
}
5156
}
5257
}

‎android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
22
<application
3-
android:label="droidconug"
3+
android:label="DroidconUg"
44
android:name="${applicationName}"
55
android:icon="@mipmap/ic_launcher">
66
<activity
@@ -42,4 +42,5 @@
4242
<data android:mimeType="text/plain"/>
4343
</intent>
4444
</queries>
45+
<uses-permission android:name="android.permission.INTERNET"/>
4546
</manifest>

‎android/app/src/main/ic_launcher-playstore.png

-6.6 KB
Loading

‎android/app/src/main/res/drawable/ic_launcher_background.xml

Lines changed: 74 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,78 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<vector
3-
android:height="108dp"
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
43
android:width="108dp"
5-
android:viewportHeight="108"
4+
android:height="108dp"
65
android:viewportWidth="108"
7-
xmlns:android="http://schemas.android.com/apk/res/android">
8-
<path android:fillColor="#3DDC84"
9-
android:pathData="M0,0h108v108h-108z"/>
10-
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
11-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
12-
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
13-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
14-
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
15-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
16-
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
17-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
18-
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
19-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
20-
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
21-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
22-
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
23-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
24-
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
25-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
26-
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
27-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
28-
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
29-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
30-
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
31-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
32-
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
33-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
34-
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
35-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
36-
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
37-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
38-
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
39-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
40-
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
41-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
42-
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
43-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
44-
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
45-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
46-
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
47-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
48-
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
49-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
50-
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
51-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
52-
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
53-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
54-
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
55-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
56-
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
57-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
58-
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
59-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
60-
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
61-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
62-
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
63-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
64-
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
65-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
66-
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
67-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
68-
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
69-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
70-
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
71-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
72-
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
73-
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
6+
android:viewportHeight="108">
7+
<group android:scaleX="0"
8+
android:scaleY="0"
9+
android:translateX="54"
10+
android:translateY="54">
11+
<path android:fillColor="#3DDC84"
12+
android:pathData="M0,0h108v108h-108z"/>
13+
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
14+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
15+
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
16+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
17+
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
18+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
19+
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
20+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
21+
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
22+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
23+
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
24+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
25+
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
26+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
27+
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
28+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
29+
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
30+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
31+
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
32+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
33+
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
34+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
35+
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
36+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
37+
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
38+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
39+
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
40+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
41+
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
42+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
43+
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
44+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
45+
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
46+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
47+
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
48+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
49+
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
50+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
51+
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
52+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
53+
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
54+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
55+
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
56+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
57+
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
58+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
59+
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
60+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
61+
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
62+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
63+
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
64+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
65+
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
66+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
67+
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
68+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
69+
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
70+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
71+
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
72+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
73+
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
74+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
75+
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
76+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
77+
</group>
7478
</vector>

‎android/app/src/main/res/mipmap-hdpi/ic_launcher.webp

-254 Bytes
Binary file not shown.

‎android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp

-498 Bytes
Binary file not shown.

‎android/app/src/main/res/mipmap-mdpi/ic_launcher.webp

-390 Bytes
Binary file not shown.

‎android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp

-450 Bytes
Binary file not shown.

‎android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp

-362 Bytes
Binary file not shown.

‎android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp

-516 Bytes
Binary file not shown.

‎android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp

-510 Bytes
Binary file not shown.

‎android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp

-1.1 KB
Binary file not shown.

‎android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp

-528 Bytes
Binary file not shown.

‎android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

-1.18 KB
Binary file not shown.

‎lib/common/widgets/features/session_item.dart

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
import 'package:flutter/material.dart';
2+
3+
import '../../../core/theme/theme_colors.dart';
4+
import '../../../core/theme/theme_styles.dart';
5+
import '../../../features/sessions/common/utils.dart';
6+
import '../../data/models/models.dart';
7+
import '../../utils/date_util.dart';
8+
import 'tag_item.dart';
9+
10+
class SessionItem extends StatelessWidget {
11+
final Session session;
12+
final List<Room> rooms;
13+
14+
const SessionItem({
15+
super.key,
16+
required this.session,
17+
required this.rooms,
18+
});
19+
20+
@override
21+
Widget build(BuildContext context) {
22+
Size size = MediaQuery.of(context).size;
23+
var startTime = Container(
24+
width: 75,
25+
padding: const EdgeInsets.all(Sizes.sm),
26+
child: Text(
27+
formatTime(session.startsAt!),
28+
style: const TextStyle(fontSize: 18),
29+
textAlign: TextAlign.center,
30+
),
31+
);
32+
33+
var rightContent = Container(
34+
width: size.width - 100,
35+
padding: const EdgeInsets.only(
36+
top: Sizes.sm,
37+
right: Sizes.sm,
38+
bottom: Sizes.sm,
39+
),
40+
child: Column(
41+
children: [
42+
Text(
43+
session.title ?? "No Title",
44+
maxLines: 2,
45+
style: const TextStyle(
46+
fontSize: 16,
47+
fontWeight: FontWeight.bold,
48+
),
49+
),
50+
Text(
51+
session.description ?? "No Description",
52+
maxLines: 3,
53+
style: const TextStyle(fontSize: 12),
54+
),
55+
SizedBox(
56+
height: 25,
57+
width: MediaQuery.of(context).size.width - 30,
58+
child: ListView(
59+
scrollDirection: Axis.horizontal,
60+
children: <Widget>[
61+
TagItem(
62+
tagText:
63+
'${formatTime(session.startsAt!)} - ${formatTime(session.endsAt!)}',
64+
),
65+
TagItem(
66+
tagText: '${getRoomName(rooms, session.room!)}',
67+
),
68+
],
69+
),
70+
),
71+
],
72+
),
73+
);
74+
75+
return Card(
76+
elevation: 2,
77+
color: ThemeColors.bgColorBW(context),
78+
margin: const EdgeInsets.only(top: 5),
79+
child: Column(
80+
crossAxisAlignment: CrossAxisAlignment.start,
81+
children: <Widget>[
82+
Row(
83+
children: [
84+
startTime,
85+
rightContent,
86+
],
87+
)
88+
],
89+
),
90+
);
91+
}
92+
}

‎lib/features/sessions/common/utils.dart

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import '../../../common/data/models/models.dart';
2+
3+
String? getRoomName(List<Room> rooms, int roomId) {
4+
try {
5+
Room room = rooms.firstWhere((room) => room.id == roomId);
6+
return room.name;
7+
} catch (e) {
8+
return '-';
9+
}
10+
}
11+
12+
List<Session> sortSessions(List<Session> dateSessions) {
13+
List<Session> sessions = [];
14+
15+
for (var session in dateSessions) {
16+
sessions.add(
17+
Session(
18+
id: session.id,
19+
title: session.title,
20+
description: session.description,
21+
speakerIds: session.speakerIds,
22+
speakerNames: session.speakerNames,
23+
startsAt: session.startsAt,
24+
endsAt: session.endsAt,
25+
bookmarked: session.bookmarked,
26+
categories: session.startsAt!.split('T').last,
27+
room: session.room,
28+
createdAt: session.createdAt,
29+
updatedAt: session.updatedAt,
30+
),
31+
);
32+
}
33+
sessions.sort((a, b) => a.categories!.compareTo(b.categories!));
34+
return sessions;
35+
}

0 commit comments

Comments
 (0)