Skip to content

Commit

Permalink
Merge pull request #19 from kavi-kv/local-branch
Browse files Browse the repository at this point in the history
Both user and company profile finished with navigations on
  • Loading branch information
ENG-CJ authored Aug 28, 2023
2 parents 5e5515f + 71dc54a commit a706b23
Show file tree
Hide file tree
Showing 12 changed files with 752 additions and 197 deletions.
Binary file added assets/img_holder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 35 additions & 1 deletion lib/consts/texts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,38 @@ const tLanguages = "Languages";
const tOtherSkills= "Other Skills";
const tBio= "bio";

const tSaveBtn= "Save";
const tSaveBtn= "Save";

//? -> User Registration
String signUpTxt = "Sign Up";
const tPassTxt = "Password";
const tRegBtn = "Save";
const welcomeTxt = "Almost there, please enter your credentials \nto continue.";

const signUpFullNameTft = "Enter your fullname";
const signUpEmailTft = "Enter your e-mail";
const signUpPasswordTft = "Enter your e-mail";
const tSelectCity = "Enter City";
const signUpTermsTxt = "Agree to our";
const signUpConditionTxt = "I agree to the";
const tTermsAndConditions = "Terms of service";
const signUpLoginTxt = "Login";
const signUpHaveAnAccountTxt = "Already have an account?";
const signUpWithGoogle = "Sign in with Google";
const signUpWithApple = "Sign up with Apple";
const signUpWithFacebook = "Sign up with Facebook";

//? -> Company Registration
String comRegTitle = "Welcome";
String comSubTitle = "Enter Company or individual credentials to proceed";

String comName = "Enter Company Name";
String comEmail = "example@companyName.com";
String comAddress = "Enter Address of the company";
String comPhone = "Enter phone number of company";
String comCity = "Enter City e.g Mogadishu";
String comCountry = "Enter Country e.g Somalia";


String comAddresses = "Location:";
String comIndustry = "Industry Type:";
4 changes: 3 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import 'package:job_finder/views/pages/applied_page.dart';
import 'package:job_finder/views/pages/home_page.dart';
import 'package:job_finder/views/pages/login_page.dart';
import 'package:job_finder/views/pages/on_boarding.dart';
import 'package:job_finder/views/pages/registrations/conpany.dart';
import 'package:job_finder/views/pages/registrations/user_reg.dart';
import 'package:job_finder/views/pages/user_type_page.dart';

import 'consts/colors.dart';
Expand All @@ -25,7 +27,7 @@ class JobFinder extends StatelessWidget {
scaffoldBackgroundColor: const Color(0xfff4f4f4)
),
debugShowCheckedModeBanner: false,
home: OnBoarding(),
home: const OnBoarding(),
);
}
}
Expand Down
61 changes: 61 additions & 0 deletions lib/util/helpers/custom_text_field.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:job_finder/mixins/input_border_decoration.dart';
import '../../consts/colors.dart';
import '../../mixins/messages.dart';
class CustomTextField extends StatelessWidget
with TextFieldBorderDecorator, Messages {
const CustomTextField({
Key? key,
required this.txtInputType,
required this.hintText,
required this.prefixIcon,
this.obscureTxt,
this.isHidenTxt,
this.showOrHidePassword,
});

final TextInputType txtInputType;
final String hintText;
final Icon prefixIcon;
final bool? obscureTxt;
final bool? isHidenTxt;
final VoidCallback? showOrHidePassword;

@override
Widget build(BuildContext context) {
bool isPasswordType = txtInputType == TextInputType.visiblePassword;

return Container(
margin: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: BorderRadius.circular(4),
),
child: TextFormField(
keyboardType: txtInputType,
textAlign: TextAlign.start,
obscureText: obscureTxt ?? false,
decoration: InputDecoration(
contentPadding: EdgeInsets.fromLTRB(10, 14, 10, 10),
border: InputBorder.none,
focusedBorder: InputBorder.none,
hintText: hintText,

suffixIcon: isPasswordType
? (isHidenTxt ?? false
? IconButton(
icon: FaIcon(FontAwesomeIcons.eye),
onPressed: showOrHidePassword,
)
: IconButton(
icon: FaIcon(FontAwesomeIcons.eyeSlash),
onPressed: showOrHidePassword,
))
: null,
prefixIcon: prefixIcon,
),
),
);
}
}
13 changes: 0 additions & 13 deletions lib/util/profile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,6 @@ class ProfileImage extends StatelessWidget {
final double? paddingAll;


const ProfileImage(
{super.key,
required this.imagePath,
this.color,
this.paddingAll,
});

@override
Widget build(BuildContext context) {
return CircleAvatar(
radius: 60,
backgroundColor: color ?? Colors.white,

final bool asBackgroundImage;
final double radius;
const ProfileImage({
Expand Down
2 changes: 1 addition & 1 deletion lib/views/components/login_mode_profile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class LoginModeProfile extends StatelessWidget {
children: [
Padding(
padding: const EdgeInsets.only(top: 10),
child: ProfileImage(imagePath: "assets/google.png",imgHeight: 20,imgWidth: 20),
child: ProfileImage(imagePath: "assets/google.png"),
),

SizedBox(height: 4,),
Expand Down
Loading

0 comments on commit a706b23

Please sign in to comment.