Skip to content

Commit efda77b

Browse files
committed
Adapt App design after Apple rejection
1 parent 2962ebc commit efda77b

File tree

4 files changed

+8
-85
lines changed

4 files changed

+8
-85
lines changed

lib/dashboard/home/tab_bar/credentials/list/widgets/home_credential_category_item.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class HomeCredentialCategoryItem extends StatelessWidget {
6868
physics: const NeverScrollableScrollPhysics(),
6969
shrinkWrap: true,
7070
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
71-
crossAxisCount: 2,
71+
crossAxisCount: 1,
7272
crossAxisSpacing: 14,
7373
mainAxisSpacing: 14,
7474
childAspectRatio: Sizes.credentialAspectRatio,

lib/dashboard/home/tab_bar/tab_controller/widgets/tab_bar.dart

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class MyTab extends StatelessWidget {
2525
alignment: Alignment.center,
2626
padding: const EdgeInsets.symmetric(
2727
horizontal: Sizes.spaceXSmall,
28-
vertical: Sizes.spaceSmall,
28+
vertical: Sizes.spaceXSmall,
2929
),
3030
decoration: BoxDecoration(
31-
borderRadius: BorderRadius.circular(Sizes.normalRadius),
31+
borderRadius: BorderRadius.circular(Sizes.normalButton),
3232
color: isSelected
3333
? Theme.of(context).colorScheme.primaryContainer
3434
: Theme.of(context).colorScheme.surfaceContainer,
@@ -37,20 +37,10 @@ class MyTab extends StatelessWidget {
3737
mainAxisAlignment: MainAxisAlignment.center,
3838
crossAxisAlignment: CrossAxisAlignment.center,
3939
children: <Widget>[
40-
if (isSelected)
41-
Image.asset(
42-
icon,
43-
height: Sizes.icon,
44-
colorBlendMode: BlendMode.color,
45-
color: Theme.of(context).colorScheme.primaryContainer,
46-
)
47-
else
48-
Image.asset(icon, height: Sizes.icon),
49-
const SizedBox(width: Sizes.spaceXSmall),
5040
Text(
5141
text,
5242
maxLines: 1,
53-
style: Theme.of(context).textTheme.titleLarge!.copyWith(
43+
style: Theme.of(context).textTheme.titleMedium!.copyWith(
5444
color: isSelected
5545
? Theme.of(context).colorScheme.onPrimaryContainer
5646
: Theme.of(context).colorScheme.inverseSurface,

lib/dashboard/src/view/dashboard_page.dart

Lines changed: 3 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,6 @@ class _DashboardViewState extends State<DashboardView> {
241241
],
242242
),
243243
),
244-
Text(
245-
_getTitle(dashboardState.selectedIndex, l10n),
246-
maxLines: 2,
247-
textAlign: TextAlign.center,
248-
style: Theme.of(context).textTheme.headlineSmall!
249-
.copyWith(fontWeight: FontWeight.bold),
250-
),
251244
Expanded(
252245
child: PageView(
253246
controller: pageController,
@@ -272,69 +265,9 @@ class _DashboardViewState extends State<DashboardView> {
272265
],
273266
),
274267
),
275-
BottomBarDecoration(
276-
child: Row(
277-
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
278-
children: [
279-
BottomBarItem(
280-
icon: IconStrings.home,
281-
text: l10n.home,
282-
onTap: () => bottomTapped(0),
283-
isSelected: dashboardState.selectedIndex == 0,
284-
),
285-
BottomBarItem(
286-
icon: IconStrings.discover,
287-
text: l10n.discover,
288-
onTap: () => bottomTapped(1),
289-
isSelected: dashboardState.selectedIndex == 1,
290-
),
291-
const SizedBox(width: 60),
292-
if (Parameters.walletHandlesCrypto)
293-
BottomBarItem(
294-
icon: IconStrings.cashInHand,
295-
text: l10n.buy,
296-
onTap: () => bottomTapped(2),
297-
isSelected:
298-
dashboardState.selectedIndex == 2,
299-
)
300-
else
301-
BottomBarItem(
302-
icon: IconStrings.searchNormal,
303-
text: l10n.search,
304-
onTap: () => bottomTapped(2),
305-
isSelected:
306-
dashboardState.selectedIndex == 2,
307-
),
308-
if (displayChatSupport && isEnterprise) ...[
309-
StreamBuilder(
310-
initialData: context
311-
.read<AltmeChatSupportCubit>()
312-
.unreadMessageCount,
313-
stream: context
314-
.read<AltmeChatSupportCubit>()
315-
.unreadMessageCountStream,
316-
builder: (_, snapShot) {
317-
return BottomBarItem(
318-
icon: IconStrings.messaging,
319-
text: l10n.chat,
320-
badgeCount: snapShot.data ?? 0,
321-
onTap: () => bottomTapped(3),
322-
isSelected:
323-
dashboardState.selectedIndex == 3,
324-
);
325-
},
326-
),
327-
] else ...[
328-
BottomBarItem(
329-
icon: IconStrings.settings,
330-
text: l10n.settings,
331-
onTap: () =>
332-
scaffoldKey.currentState!.openDrawer(),
333-
isSelected: false,
334-
),
335-
],
336-
],
337-
),
268+
const Row(
269+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
270+
children: [],
338271
),
339272
const SizedBox(height: 1),
340273
],

lib/l10n/arb/app_en.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
"poweredBy": "Powered By",
286286
"splashLoading": "Loading...",
287287
"version": "Version",
288-
"cards": "Cards",
288+
"cards": "Credentials",
289289
"nfts": "NFTs",
290290
"coins": "Coins",
291291
"getCards": "Get Credentials",

0 commit comments

Comments
 (0)