Compare commits

..

No commits in common. "ff18f137866b8f382304bc055cc3917da42752c9" and "b2961ca7d813e23d08beed89ce94d54de214fae9" have entirely different histories.

5 changed files with 22 additions and 38 deletions

View File

@ -42,6 +42,7 @@ class _AuthenticationState extends State<Authentication> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: false,
body: Consumer<AuthenticationState>( body: Consumer<AuthenticationState>(
builder: (context, state, child) => WillPopScope( builder: (context, state, child) => WillPopScope(
onWillPop: () async { onWillPop: () async {

View File

@ -49,8 +49,7 @@ class AuthenticationLayout extends StatelessWidget {
SliverPadding( SliverPadding(
padding: const EdgeInsets.symmetric(horizontal: 20), padding: const EdgeInsets.symmetric(horizontal: 20),
sliver: SliverFillRemaining( sliver: SliverFillRemaining(
hasScrollBody: true, hasScrollBody: false,
fillOverscroll: true,
child: Column( child: Column(
children: [ children: [
for (var i = 0; i < children.length; i++) children[i], for (var i = 0; i < children.length; i++) children[i],

View File

@ -24,7 +24,6 @@ class CustomizeCategoryState extends CoreProvier {
Future<void> getFavourites() async { Future<void> getFavourites() async {
appState = AppState.busy; appState = AppState.busy;
update();
final service = RequestService( final service = RequestService(
RequestHelper.favourites(), RequestHelper.favourites(),
@ -32,19 +31,13 @@ class CustomizeCategoryState extends CoreProvier {
await service.httpGet(); await service.httpGet();
if (service.isSuccess) { if (service.isSuccess) {
faves.clear(); faves.clear();
final favouritesData = service.data('types'); final favourites = service.data('types');
if (favouritesData is List) { for (var i = 0; i < favourites.length; i++) {
for (var i = 0; i < favouritesData.length; i++) { faves.add(FavoritesResponse.fromJson(favourites[i]));
faves.add(FavoritesResponse.fromJson(favouritesData[i]));
} }
}
// اضافه کردن مستقیم بخش فرصت و تهدید
faves.add(FavoritesResponse(id: 999, name: 'فرصت و تهدید', selected: false));
selectedFavIds.clear(); selectedFavIds.clear();
for (var element in faves) { for (var element in faves) {
if (element.selected == true) { if (element.selected!) {
selectedFavIds.add(element.id!); selectedFavIds.add(element.id!);
} }
} }

View File

@ -78,9 +78,7 @@ class _FavoritesStepState extends State<FavoritesStep> {
asset: Assets.emptyChat, asset: Assets.emptyChat,
title: 'اولین نظر را بنویسید...', title: 'اولین نظر را بنویسید...',
), ),
builder: (context, state, index) => Column( builder: (context, state, index) => Center(
children: [
Center(
child: Container( child: Container(
height: 48, height: 48,
decoration: BoxDecoration( decoration: BoxDecoration(
@ -88,13 +86,13 @@ class _FavoritesStepState extends State<FavoritesStep> {
border: Border.all( border: Border.all(
width: 1, width: 1,
color: state.faves[index].selected! color: state.faves[index].selected!
? Theme.of(context).colorScheme.focusedBorder ? Theme.of(context)
: Theme.of(context).colorScheme.cardBorder .colorScheme
), .focusedBorder
: Theme.of(context).colorScheme.cardBorder),
color: state.faves[index].selected! color: state.faves[index].selected!
? Theme.of(context).colorScheme.focused ? Theme.of(context).colorScheme.focused
: Theme.of(context).colorScheme.cardBorder : Theme.of(context).colorScheme.cardBorder),
),
child: CustomizeCategoryCheckbox( child: CustomizeCategoryCheckbox(
title: state.faves[index].name!, title: state.faves[index].name!,
value: state.faves[index].selected, value: state.faves[index].selected,
@ -102,14 +100,7 @@ class _FavoritesStepState extends State<FavoritesStep> {
onChanged: (val) { onChanged: (val) {
state.changeSelected( state.changeSelected(
index, state.faves, state.selectedFavIds); index, state.faves, state.selectedFavIds);
} })),
)
),
),
// Add extra bottom padding for the last item
if (index == state.faves.length - 1)
const SizedBox(height: 80),
],
), ),
), ),
), ),

View File

@ -109,7 +109,7 @@ class _DidvanTextFieldState extends State<DidvanTextField> {
? TextDirection.ltr ? TextDirection.ltr
: TextDirection.rtl, : TextDirection.rtl,
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB(kIsWeb?8:4,kIsWeb?4:4,kIsWeb?8:0,kIsWeb?0:8), padding: const EdgeInsets.fromLTRB(kIsWeb?8:8,kIsWeb?4:8,kIsWeb?8:0,kIsWeb?0:8),
child: Center( child: Center(
child: TextFormField( child: TextFormField(
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[