Browse Source

Fix styling for settings option

Neeraj Gupta 3 years ago
parent
commit
2573e82ee7

+ 3 - 2
lib/app.dart

@@ -67,7 +67,8 @@ final lightThemeData = ThemeData(
       headline6: TextStyle(
       headline6: TextStyle(
           color: Colors.black, fontSize: 18, fontWeight: FontWeight.w600),
           color: Colors.black, fontSize: 18, fontWeight: FontWeight.w600),
       subtitle1: TextStyle(
       subtitle1: TextStyle(
-          color: Colors.black, fontSize: 15, fontWeight: FontWeight.w500),
+        fontFamily: 'Inter-Medium',
+          color: Colors.black, fontSize: 16, fontWeight: FontWeight.w500),
       caption: TextStyle(color: Colors.black.withOpacity(0.7), fontSize: 14),
       caption: TextStyle(color: Colors.black.withOpacity(0.7), fontSize: 14),
       overline: TextStyle(color: Colors.black.withOpacity(0.8), fontSize: 12)),
       overline: TextStyle(color: Colors.black.withOpacity(0.8), fontSize: 12)),
 
 
@@ -109,7 +110,7 @@ final darkThemeData = ThemeData(
       headline6: TextStyle(
       headline6: TextStyle(
           color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
           color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
       subtitle1: TextStyle(
       subtitle1: TextStyle(
-          color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
+          color: Colors.white, fontFamily: 'Inter-Medium', fontSize: 16, fontWeight: FontWeight.w500),
       caption: TextStyle(
       caption: TextStyle(
         color: Colors.white.withOpacity(0.6),
         color: Colors.white.withOpacity(0.6),
         fontSize: 14,
         fontSize: 14,

+ 2 - 2
lib/ui/settings/backup_section_widget.dart

@@ -59,7 +59,7 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
           child: Row(
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
             children: [
-              Text("Backup over mobile data"),
+              Text("Backup over mobile data", style: Theme.of(context).textTheme.subtitle1,),
               Switch.adaptive(
               Switch.adaptive(
                 value: Configuration.instance.shouldBackupOverMobileData(),
                 value: Configuration.instance.shouldBackupOverMobileData(),
                 onChanged: (value) async {
                 onChanged: (value) async {
@@ -76,7 +76,7 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
           child: Row(
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
             children: [
-              Text("Backup videos"),
+              Text("Backup videos", style: Theme.of(context).textTheme.subtitle1,),
               Switch.adaptive(
               Switch.adaptive(
                 value: Configuration.instance.shouldBackupVideos(),
                 value: Configuration.instance.shouldBackupVideos(),
                 onChanged: (value) async {
                 onChanged: (value) async {

+ 3 - 3
lib/ui/settings/security_section_widget.dart

@@ -70,7 +70,7 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
             child: Row(
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
               children: [
-                Text("Two-factor"),
+                Text("Two-factor", style: Theme.of(context).textTheme.subtitle1,),
                 FutureBuilder(
                 FutureBuilder(
                   future: UserService.instance.fetchTwoFactorStatus(),
                   future: UserService.instance.fetchTwoFactorStatus(),
                   builder: (_, snapshot) {
                   builder: (_, snapshot) {
@@ -117,7 +117,7 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
         child: Row(
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
           children: [
-            Text("Lockscreen"),
+            Text("Lockscreen", style: Theme.of(context).textTheme.subtitle1,),
             Switch.adaptive(
             Switch.adaptive(
               value: _config.shouldShowLockScreen(),
               value: _config.shouldShowLockScreen(),
               onChanged: (value) async {
               onChanged: (value) async {
@@ -147,7 +147,7 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
             child: Row(
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
               children: [
-                Text("Hide from recents"),
+                Text("Hide from recents", style: Theme.of(context).textTheme.subtitle1),
                 Switch.adaptive(
                 Switch.adaptive(
                   value: _config.shouldHideFromRecents(),
                   value: _config.shouldHideFromRecents(),
                   onChanged: (value) async {
                   onChanged: (value) async {