Skip to content

Commit

Permalink
Merge pull request #243 from TechnicalTeam-BVCOENM/minor
Browse files Browse the repository at this point in the history 
change: Update target SDK versions && minor changes
  • Loading branch information
@Niranjan-Dorage
Niranjan-Dorage authored Aug 28, 2024
2 parents cba8eee + 2508502 commit 4a3ee8d
Show file tree
Hide file tree
Showing 15 changed files with 195 additions and 157 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ android {

defaultConfig {
applicationId "com.bvcoenm.abhiyaan"
minSdkVersion 21
targetSdkVersion flutter.targetSdkVersion
minSdkVersion 24
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
Expand Down
19 changes: 9 additions & 10 deletions android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
<uses-permission android:name="android.permission.READ_CALENDAR" />
<queries>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="abhiyaan.dynalinks.app" />
</intent-filter>
<intent>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
Expand Down Expand Up @@ -48,6 +38,15 @@
android:resource="@style/NormalTheme"
/>

<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="abhiyaan.dynalinks.app" />
</intent-filter>

<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/views/auth/register/register_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ class RegisterView extends StatelessWidget {
),
10.verticalSpace,
Text(
'Abhiyaan v1.0.5',
'Abhiyaan v${AppConstants.appVersion}',
textAlign: TextAlign.center,
style: FontThemeClass().caption(
context,
Expand Down
8 changes: 4 additions & 4 deletions lib/ui/views/auth/register/register_view_model.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,18 @@ class RegisterViewModel extends BaseViewModel {
AuthenticationService().showLoadingOverlay(context);
final message = Message()
..from = const Address(
"technicalteam.bvcoenm@gmail.com", "Abhiyaan Technical Team")
"technicalteam.bvcoenm@gmail.com", "The Dev Crew Technical Team")
..recipients.add(
emailIdTextController.text) // Set the recipient to niranjan@gmail.com
..subject = 'Abhiyaan Email OTP Verification'
..subject = 'TDC Email OTP Verification'
..html = ''' <html>
<body>
<h1>Abhiyaan App Email Verification</h1>
<h1>TDC App Email Verification</h1>
<p>Dear user,</p>
<p>Your verification code is: <b>$otp</b></p>
<p>Please enter this code in the app to complete the registration process.</p>
<p>Thank you!</p>
<p>Abhiyaan Technical Team</p>
<p>The Dev Crew Technical Team</p>
</body>
</html>''';

Expand Down
5 changes: 4 additions & 1 deletion lib/ui/views/community/community_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ class CommunityView extends StatelessWidget {
Center(
child: Text(
"Community",
style: fontThemeClass.title(context),
style: fontThemeClass.title(
context,
fontWeight: FontWeight.bold,
),
),
),
QuoteCard(
Expand Down
13 changes: 8 additions & 5 deletions lib/ui/views/event/event_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ class EventView extends StatelessWidget {
Center(
child: Text(
"Events",
style: FontThemeClass().title(context),
style: FontThemeClass().title(
context,
fontWeight: FontWeight.bold,
),
),
),
model.todayEvent?.length == 1
Expand Down Expand Up @@ -143,7 +146,7 @@ class EventView extends StatelessWidget {
),
);
},
).animate(delay: 100.ms).fadeIn(),
).animate(delay: 110.ms).fadeIn(),
],
),
model.sponsors.isEmpty
Expand All @@ -164,7 +167,7 @@ class EventView extends StatelessWidget {
},
)
],
).animate(delay: 200.ms).fadeIn(),
).animate(delay: 130.ms).fadeIn(),
model.upcomingEvents.isNotEmpty
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down Expand Up @@ -240,14 +243,14 @@ class EventView extends StatelessWidget {
),
);
},
).animate(delay: 300.ms).fadeIn(),
).animate(delay: 140.ms).fadeIn(),
],
)
: 0.verticalSpace,
4.verticalSpace,
model.gallery.isNotEmpty
? const SectionText(title: "Gallery")
.animate(delay: 1000.ms)
.animate(delay: 800.ms)
.fadeIn()
: 0.verticalSpace,
model.gallery.isNotEmpty
Expand Down
3 changes: 3 additions & 0 deletions lib/ui/views/home/home_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@ class HomeView extends StatelessWidget {
viewModelBuilder: () => HomeViewModel(context),
disposeViewModel: false,
onViewModelReady: (viewModel) {
// ignore: use_build_context_synchronously
viewModel.init(context).then((value) => viewModel.afterInit(context));
},
builder: (context, model, child) {
return UpgradeAlert(
showLater: false,
showIgnore: false,
upgrader: Upgrader(
durationUntilAlertAgain: const Duration(days: 2),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/views/home/home_view_component.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ class UserGreetingsWidget extends ViewModelWidget<HomeViewModel> {
style: fontTheme.title(
context,
color: context.colorScheme.primaryText,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.bold,
),
).animate().fadeIn(),
),
Expand Down
136 changes: 73 additions & 63 deletions lib/ui/views/profile/preferences/preferences_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,70 +32,80 @@ class PreferencesView extends StatelessWidget {
child: Column(
children: [
35.verticalSpace,
InkWell(
onTap: () {
model.updateImageSheet(context);
},
splashColor: Colors.transparent,
child: Stack(
children: [
Hero(
tag: "profileImage",
child: ClipOval(
child: CachedNetworkImage(
width: 100.r,
height: 100.r,
fit: BoxFit.cover,
imageUrl: AssetUrls.profileImageUrl == '' ||
AssetUrls.profileImageUrl ==
'Not Available'
? AssetUrls.dummyImageUrl
: AssetUrls.profileImageUrl,
placeholder: (context, url) =>
const CircularLoadingIndicator(),
errorWidget: (context, url, error) {
return const Icon(Icons.error);
},
),
),
),
Positioned(
bottom: 0,
right: 0,
child: Container(
padding: const EdgeInsets.all(5),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: context
.colorScheme.bottomNavIconActive),
child: Transform.flip(
child: Icon(
Icons.edit,
size: 25.r,
color: context.colorScheme.scaffold,
Column(
children: [
InkWell(
onTap: () {
model.updateImageSheet(context);
},
splashColor: Colors.transparent,
child: Stack(
children: [
Hero(
tag: "profileImage",
child: ClipOval(
child: CachedNetworkImage(
width: 100.r,
height: 100.r,
fit: BoxFit.cover,
imageUrl: AssetUrls.profileImageUrl == '' ||
AssetUrls.profileImageUrl ==
'Not Available'
? AssetUrls.dummyImageUrl
: AssetUrls.profileImageUrl,
placeholder: (context, url) =>
const CircularLoadingIndicator(),
errorWidget: (context, url, error) {
return Container(
color: context.colorScheme.card,
child: const Icon(
Icons.error,
color: Colors.red,
));
},
),
),
)).animate(delay: 400.ms).scale(),
],
),
),
8.verticalSpace,
Text(
model.localStorageService.read('userName'),
style: model.fontTheme.title2(
context,
color: context.colorScheme.primaryText,
fontWeight: FontWeight.w600,
),
),
2.verticalSpace,
Text(
model.localStorageService.read('userProfile'),
style: model.fontTheme.body(
context,
color: context.colorScheme.secondarySectionColor,
fontWeight: FontWeight.w500,
),
),
Positioned(
bottom: 0,
right: 0,
child: Container(
padding: const EdgeInsets.all(5),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(100),
color: context
.colorScheme.bottomNavIconActive),
child: Transform.flip(
child: Icon(
Icons.edit,
size: 25.r,
color: context.colorScheme.scaffold,
),
),
)).animate(delay: 400.ms).scale(),
],
),
),
8.verticalSpace,
Text(
model.localStorageService.read('userName'),
style: model.fontTheme.title2(
context,
color: context.colorScheme.primaryText,
fontWeight: FontWeight.w600,
),
),
2.verticalSpace,
Text(
model.localStorageService.read('userProfile'),
style: model.fontTheme.body(
context,
color: context.colorScheme.secondarySectionColor,
fontWeight: FontWeight.w500,
),
),
],
),
30.verticalSpace,
model.localStorageService.read('userProfile') ==
Expand All @@ -117,7 +127,7 @@ class PreferencesView extends StatelessWidget {
const LogoutButton(),
22.verticalSpace,
Text(
'Abhiyaan v.1.0.5',
'Abhiyaan v${AppConstants.appVersion}',
style: model.fontTheme.paragraph(
context,
color: context.colorScheme.secondarySectionColor,
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/views/profile/preferences/preferences_view_model.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ class PreferencesViewModel extends BaseViewModel {
isProfileError = false;
return Container(
width: double.infinity,
padding: EdgeInsets.only(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom,
top: 10.r,
left: 10.r,
Expand All @@ -314,7 +314,7 @@ class PreferencesViewModel extends BaseViewModel {
borderRadius: BorderRadius.circular(32).r,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
Center(
Expand All @@ -339,11 +339,11 @@ class PreferencesViewModel extends BaseViewModel {
profileImageUrlController.text);
AssetUrls.profileImageUrl =
profileImageUrlController.text;
_navigationService.back();
profileViewModel.notifyListeners();
notifyListeners();
updateProfileImage(profileImageUrlController.text);
profileImageUrlController.text = '';
_navigationService.back();
},
child: Stack(
alignment: Alignment.center,
Expand Down
Loading

0 comments on commit 4a3ee8d

Please sign in to comment.