Skip to content
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.

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

Version 1.3: Enhancements and Fixes πŸš€ #13

Merged
merged 6 commits into from
Apr 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ app.*.map.json
/android/app/debug
/android/app/profile
/android/app/release
/android/app/key.properties
# /android/app/key.properties
210 changes: 0 additions & 210 deletions Juck code/get html.dart

This file was deleted.

28 changes: 5 additions & 23 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,6 @@ def flutterVersionName = localProperties.getProperty('flutter.versionName')
if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
// def keystoreProperties = new Properties()
// def keystorePropertiesFile = rootProject.file('key.properties')
// if (keystorePropertiesFile.exists()) {
// keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
// }


def keystoreProperties = new Properties()
// def keystorePropertiesFile = file('/home/prometheus/code/Personal-Projects/Portfolio/android/app/key.properties')
def keystorePropertiesFile = file('./android/app/key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

android {
namespace "com.example.rafay_portfolio"
compileSdkVersion flutter.compileSdkVersion
Expand Down Expand Up @@ -65,20 +51,16 @@ android {
versionName flutterVersionName
}

signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes {
release {
signingConfig signingConfigs.release
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now,
// so `flutter run --release` works.
signingConfig signingConfigs.debug
}
}


}

flutter {
Expand Down
2 changes: 2 additions & 0 deletions lib/backend/article_functionality/article_functionality.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: avoid_web_libraries_in_flutter, avoid_print

import 'dart:html' as html;
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_storage/firebase_storage.dart';
Expand Down
2 changes: 2 additions & 0 deletions lib/backend/auth/auth_gate.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: library_private_types_in_public_api

import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';
import 'package:rafay_portfolio/frontend/admin/pages/dashboardPage.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/constants/routes/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "package:flutter/material.dart";

import 'package:rafay_portfolio/frontend/admin/pages/auth/loginPage.dart';
import 'package:rafay_portfolio/frontend/user/pages/aboutme/about_me.dart';
import 'package:rafay_portfolio/frontend/user/pages/blogs/displayblogs.dart';
import 'package:rafay_portfolio/frontend/user/pages/blogs/displayblogs/displayblogs.dart';
import 'package:rafay_portfolio/frontend/user/pages/error/page404.dart';
import 'package:rafay_portfolio/frontend/user/pages/project_gallery/project_gallery.dart';
import 'package:rafay_portfolio/frontend/user/pages/experiences/resume.dart';
Expand Down
28 changes: 28 additions & 0 deletions lib/constants/widgets/errorAndLanding/error.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import 'package:flutter/material.dart';
import 'package:lottie/lottie.dart';
import 'package:rafay_portfolio/constants/widgets/text/textstyle.dart';

Widget buildErrorWidget(BuildContext context) {
return SingleChildScrollView(
child: Center(
child: Padding(
padding: const EdgeInsets.only(
left: 8.0, right: 8.0, top: 20.0, bottom: 20.0),
child: Column(
children: <Widget>[
const SizedBox(height: 10),
Lottie.asset('assets/animation/datanotfound.json'),
const SizedBox(height: 10),
StyledText(
text: "Sorry!! No search results found. ",
fontSize: 20,
color: Theme.of(context).colorScheme.primary,
textAlign: TextAlign.center,
bold: true,
)
],
),
),
),
);
}
15 changes: 15 additions & 0 deletions lib/constants/widgets/errorAndLanding/loading.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import 'package:flutter/material.dart';
import 'package:lottie/lottie.dart';

class LoadingData extends StatelessWidget {
const LoadingData({super.key});

@override
Widget build(BuildContext context) {
return SingleChildScrollView(
child: Center(
child: Lottie.asset('assets/animation/loader.json'),
),
);
}
}
48 changes: 26 additions & 22 deletions lib/constants/widgets/textfeild/buildTextField.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,32 @@ class _CustomTextFieldState extends State<CustomTextField> {
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.only(left: 15.0),
child: TextFormField(
controller: widget.controller,
maxLines: widget.maxLines,
obscureText: widget.passwordText ? !_passwordVisible : false,
decoration: InputDecoration(
labelText: widget.labelText,
hintText: widget.hintText,
prefixIcon: Icon(widget.prefixIcon),
suffixIcon: widget.passwordText
? IconButton(
icon: Icon(
_passwordVisible ? Icons.visibility : Icons.visibility_off,
),
onPressed: () {
setState(() {
_passwordVisible = !_passwordVisible;
});
},
)
: null,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.0),
child: Material(
child: TextFormField(
controller: widget.controller,
maxLines: widget.maxLines,
obscureText: widget.passwordText ? !_passwordVisible : false,
decoration: InputDecoration(
labelText: widget.labelText,
hintText: widget.hintText,
prefixIcon: Icon(widget.prefixIcon),
suffixIcon: widget.passwordText
? IconButton(
icon: Icon(
_passwordVisible
? Icons.visibility
: Icons.visibility_off,
),
onPressed: () {
setState(() {
_passwordVisible = !_passwordVisible;
});
},
)
: null,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.0),
),
),
),
),
Expand Down
Loading
Loading