beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/redesign' into minor-redesign-fixes

Browse source
This commit is contained in:
vishnukvmd 2022-06-09 14:55:40 +05:30
parent ebdf7442e1 513427b42c
commit bfa3c9bd92
12 changed files with 88 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/app.dart
View file

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:adaptive_theme/adaptive_theme.dart';
import 'package:background_fetch/background_fetch.dart';
import 'package:flutter/foundation.dart';
@ -221,7 +223,7 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
@override
Widget build(BuildContext context) {
if (kDebugMode) {
if (kDebugMode && Platform.isAndroid) {
return AdaptiveTheme(
light: lightThemeData,
dark: darkThemeData,

3
lib/ui/custom_app_bar.dart
View file

@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
@ -19,4 +18,4 @@ class CustomAppBar extends PreferredSize {
child: child,
);
}
}
}

23
lib/ui/email_entry_page.dart
View file

@ -87,19 +87,16 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
Navigator.of(context).pop();
},
),
title: Hero(
tag: "sign_up",
child: Material(
type: MaterialType.transparency,
child: StepProgressIndicator(
totalSteps: 4,
currentStep: 1,
selectedColor: Theme.of(context).buttonColor,
roundedEdges: Radius.circular(10),
unselectedColor:
Theme.of(context).colorScheme.stepProgressUnselectedColor,
)),
),
title: Material(
type: MaterialType.transparency,
child: StepProgressIndicator(
totalSteps: 4,
currentStep: 1,
selectedColor: Theme.of(context).buttonColor,
roundedEdges: Radius.circular(10),
unselectedColor:
Theme.of(context).colorScheme.stepProgressUnselectedColor,
)),
);
return Scaffold(
appBar: appBar,

11
lib/ui/fading_app_bar.dart
View file

@ -68,15 +68,16 @@ class FadingAppBarState extends State<FadingAppBar> {
stops: const [0, 0.2, 1],
),
),
child: Padding(
padding: const EdgeInsets.only(top: 10),
child: _buildAppBar(),
),
child: _buildAppBar(),
// child: _buildAppBar()Padding(_buildAppBar()
// padding: const EdgeInsets.only(top: 0),
// child: SafeArea(child: _buildAppBar()),
// ),
),
opacity: _shouldHide ? 0 : 1,
duration: Duration(milliseconds: 150),
),
height: 64,
height: Platform.isAndroid ? 64 : 80,
);
}

11
lib/ui/file_info_dialog.dart
View file

@ -2,6 +2,7 @@ import 'package:exif/exif.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/ente_theme_data.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/services/collections_service.dart';
@ -256,13 +257,19 @@ class _FileInfoWidgetState extends State<FileInfoWidget> {
children: [
Icon(
Icons.feed_outlined,
color: Colors.white.withOpacity(0.5),
color: Theme.of(context)
.colorScheme
.defaultTextColor
.withOpacity(0.5),
),
Padding(padding: EdgeInsets.all(4)),
Text(
"No exif",
style: TextStyle(
color: Colors.white.withOpacity(0.5),
color: Theme.of(context)
.colorScheme
.defaultTextColor
.withOpacity(0.5),
),
),
],

2
lib/ui/home_widget.dart
View file

@ -527,7 +527,7 @@ class HomeBottomNavigationBar extends StatefulWidget {
class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
StreamSubscription<TabChangedEvent> _tabChangedEventSubscription;
final _logger = Logger((_HomeBottomNavigationBarState).toString());
int currentTabIndex;
int currentTabIndex = 0;
@override
void initState() {

9
lib/ui/landing_page_widget.dart
View file

@ -125,12 +125,9 @@ class _LandingPageWidgetState extends State<LandingPageWidget> {
width: double.infinity,
padding: EdgeInsets.symmetric(horizontal: 20),
child: GradientButton(
child: Hero(
tag: "sign_up",
child: Text(
"New to ente",
style: gradientButtonTextTheme(),
),
child: Text(
"New to ente",
style: gradientButtonTextTheme(),
),
linearGradientColors: const [
Color(0xFF2CD267),

22
lib/ui/ott_verification_page.dart
View file

@ -47,19 +47,15 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
},
),
title: widget.isCreateAccountScreen
? Hero(
tag: "sign_up",
child: Material(
type: MaterialType.transparency,
child: StepProgressIndicator(
totalSteps: 4,
currentStep: 2,
selectedColor: Theme.of(context).buttonColor,
roundedEdges: Radius.circular(10),
unselectedColor: Theme.of(context)
.colorScheme
.stepProgressUnselectedColor,
),
? Material(
type: MaterialType.transparency,
child: StepProgressIndicator(
totalSteps: 4,
currentStep: 2,
selectedColor: Theme.of(context).buttonColor,
roundedEdges: Radius.circular(10),
unselectedColor:
Theme.of(context).colorScheme.stepProgressUnselectedColor,
),
)
: null,

8
lib/ui/sessions_page.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/ente_theme_data.dart';
import 'package:photos/models/sessions.dart';
import 'package:photos/services/user_service.dart';
import 'package:photos/ui/loading_widget.dart';
@ -154,10 +155,7 @@ class _SessionsPageState extends State<SessionsPage> {
Padding(padding: EdgeInsets.all(8)),
Text(
session.ua,
style: TextStyle(
color: Colors.white.withOpacity(0.7),
fontSize: 14,
),
style: Theme.of(context).textTheme.caption,
),
],
),
@ -189,7 +187,7 @@ class _SessionsPageState extends State<SessionsPage> {
style: TextStyle(
color: isLoggingOutFromThisDevice
? Theme.of(context).buttonColor
: Colors.white,
: Theme.of(context).colorScheme.defaultTextColor,
),
),
onPressed: () {

6
lib/ui/settings_page.dart
View file

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:photos/core/configuration.dart';
@ -40,7 +42,9 @@ class SettingsPage extends StatelessWidget {
.subtitle1
.copyWith(overflow: TextOverflow.ellipsis),
),
kDebugMode ? ThemeSwitchWidget() : const SizedBox.shrink(),
(kDebugMode && Platform.isAndroid)
? ThemeSwitchWidget()
: const SizedBox.shrink(),
])));
final sectionDivider = Divider(
height: 20,

49
lib/ui/share_collection_widget.dart
View file

@ -14,6 +14,7 @@ import 'package:photos/services/collections_service.dart';
import 'package:photos/services/feature_flag_service.dart';
import 'package:photos/services/user_service.dart';
import 'package:photos/ui/common/dialogs.dart';
import 'package:photos/ui/common/gradientButton.dart';
import 'package:photos/ui/loading_widget.dart';
import 'package:photos/ui/manage_links_widget.dart';
import 'package:photos/ui/payment/subscription.dart';
@ -56,20 +57,44 @@ class _SharingDialogState extends State<SharingDialog> {
padding: EdgeInsets.all(8),
));
if (!_showEntryField) {
children.add(SizedBox(
width: 220,
child: OutlinedButton(
child: Icon(
Icons.add,
color: Theme.of(context).buttonColor,
children.add(
SizedBox(
width: 220,
child: GradientButton(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: const [
Icon(
Icons.add,
color: Colors.white,
),
],
),
linearGradientColors: const [
Color(0xFF2CD267),
Color(0xFF1DB954),
],
onTap: () async {
setState(() {
_showEntryField = true;
});
},
),
onPressed: () {
setState(() {
_showEntryField = true;
});
},
// child: OutlinedButton(
// child: Icon(
// Icons.add,
// color: Colors.pink,
// ),
// onPressed: () {
// setState(() {
// _showEntryField = true;
// });
// },
// ),
// ),
),
));
);
} else {
children.add(
SizedBox(

2
pubspec.yaml
View file

@ -12,7 +12,7 @@ description: ente photos application
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 0.5.34+314
version: 0.5.35+315
environment:
sdk: ">=2.10.0 <3.0.0"