Merge branch 'flutter' of github.com:revanced/revanced-manager into f…

…lutter
ReVanced · Sep 17, 2022 · e74fce8 · e74fce8
2 parents 9c3626c + 73e4ae1
commit e74fce8
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 33 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         applicationId "app.revanced.manager.flutter"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/lib/theme.dart b/lib/theme.dart
@@ -4,6 +4,7 @@ import 'package:google_fonts/google_fonts.dart';
 var lightCustomColorScheme = ColorScheme.fromSeed(
   seedColor: Colors.blue,
   brightness: Brightness.light,
+  primary: const Color(0xff1B73E8),
 );
 
 var lightCustomTheme = ThemeData(
@@ -23,8 +24,8 @@ var lightCustomTheme = ThemeData(
 var darkCustomColorScheme = ColorScheme.fromSeed(
   seedColor: Colors.blue,
   brightness: Brightness.dark,
-  primary: const Color(0xff7792BA),
-  surface: const Color(0xff0A0D11),
+  primary: const Color(0xffA5CAFF),
+  surface: const Color(0xff1B1A1D),
 );
 
 var darkCustomTheme = ThemeData(
@@ -38,8 +39,8 @@ var darkCustomTheme = ThemeData(
       ),
     ),
   ),
-  canvasColor: const Color(0xff0A0D11),
-  scaffoldBackgroundColor: const Color(0xff0A0D11),
-  toggleableActiveColor: const Color(0xff7792BA),
+  canvasColor: const Color(0xff1B1A1D),
+  scaffoldBackgroundColor: const Color(0xff1B1A1D),
+  toggleableActiveColor: const Color(0xffA5CAFF),
   textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
 );
diff --git a/lib/ui/views/navigation/navigation_view.dart b/lib/ui/views/navigation/navigation_view.dart
@@ -42,6 +42,7 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.dashboardTab',
               ),
+              tooltip: '',
             ),
             NavigationDestination(
               icon: model.isIndexSelected(1)
@@ -51,6 +52,7 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.patcherTab',
               ),
+              tooltip: '',
             ),
             NavigationDestination(
               icon: model.isIndexSelected(2)
@@ -60,6 +62,7 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.settingsTab',
               ),
+              tooltip: '',
             ),
           ],
         ),

diff --git a/lib/ui/widgets/homeView/latest_commit_card.dart b/lib/ui/widgets/homeView/latest_commit_card.dart
@@ -71,7 +71,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
             future: locator<HomeViewModel>().hasManagerUpdates(),
             initialData: false,
             builder: (context, snapshot) => Opacity(
-              opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.5,
+              opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
               child: CustomMaterialButton(
                 isExpanded: false,
                 label: I18nText('latestCommitCard.updateButton'),

diff --git a/lib/ui/widgets/shared/application_item.dart b/lib/ui/widgets/shared/application_item.dart
@@ -64,34 +64,40 @@ class _ApplicationItemState extends State<ApplicationItem>
         child: Row(
           children: <Widget>[
             SizedBox(
-              width: 60,
-              child: Image.memory(widget.icon, height: 39, width: 39),
+              width: 40,
+              child: Image.memory(widget.icon, height: 40, width: 40),
             ),
             const SizedBox(width: 4),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                Text(
-                  widget.name,
-                  style: const TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.w500,
-                  ),
+            Padding(
+              padding: const EdgeInsets.only(left: 15.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: <Widget>[
+                    Text(
+                      widget.name,
+                      style: const TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                      ),
+                    ),
+                    Text(format(widget.patchDate)),
+                  ],
                 ),
-                Text(format(widget.patchDate)),
-              ],
             ),
             const Spacer(),
-            RotationTransition(
-              turns: Tween(begin: 0.0, end: 0.50).animate(_animationController),
-              child: IconButton(
-                onPressed: () {
-                  expController.toggle();
-                  _animationController.isCompleted
-                      ? _animationController.reverse()
-                      : _animationController.forward();
-                },
-                icon: const Icon(Icons.arrow_drop_down),
+            Padding(
+              padding: const EdgeInsets.only(right: 5.0),
+              child: RotationTransition(
+                turns: Tween(begin: 0.0, end: 0.50).animate(_animationController),
+                child: IconButton(
+                  onPressed: () {
+                    expController.toggle();
+                    _animationController.isCompleted
+                        ? _animationController.reverse()
+                        : _animationController.forward();
+                  },
+                  icon: const Icon(Icons.arrow_drop_down),
+                ),
               ),
             ),
             Column(
@@ -111,7 +117,7 @@ class _ApplicationItemState extends State<ApplicationItem>
       ),
       collapsed: const Text(''),
       expanded: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
+        padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[

diff --git a/lib/ui/widgets/shared/custom_card.dart b/lib/ui/widgets/shared/custom_card.dart
@@ -16,7 +16,7 @@ class CustomCard extends StatelessWidget {
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(16),
         color: isFilled
-            ? Theme.of(context).colorScheme.secondaryContainer
+            ? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.25)
             : Colors.transparent,
         border: isFilled
             ? null

diff --git a/lib/ui/widgets/shared/custom_chip.dart b/lib/ui/widgets/shared/custom_chip.dart
@@ -22,7 +22,7 @@ class DashboardChip extends StatelessWidget {
             color: isSelected
                 ? Theme.of(context).colorScheme.primary
                 : Theme.of(context).colorScheme.secondary,
-            fontWeight: FontWeight.bold,
+            fontWeight: FontWeight.w500,
           ),
       backgroundColor: Colors.transparent,
       selectedColor: Theme.of(context).colorScheme.secondaryContainer,