diff --git a/README.md b/README.md index b6a31982..104bd5db 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,8 @@ -# revanced_manager_flutter +# ReVanced Manager -A new Flutter project. +An unofficial ReVanced Manager based on Flutter. -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. +## Credits +- Vanced team for the original idea +- ReVanced team for the rework and patching framework +- [Donokami](https://github.com/Donokami) for the app icon diff --git a/android/app/build.gradle b/android/app/build.gradle index 7f0fff27..2d45f070 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,7 +43,7 @@ android { } defaultConfig { - applicationId "app.revanced.revanced_manager_flutter" + applicationId "app.revanced.manager" minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 0480c468..b75b409f 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="app.revanced.manager"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 59ca22ac..c50efe30 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="app.revanced.manager"> diff --git a/android/app/src/main/kotlin/app/revanced/revanced_manager_flutter/MainActivity.kt b/android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt similarity index 98% rename from android/app/src/main/kotlin/app/revanced/revanced_manager_flutter/MainActivity.kt rename to android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt index a9ea2e68..1ea8e03d 100644 --- a/android/app/src/main/kotlin/app/revanced/revanced_manager_flutter/MainActivity.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt @@ -1,4 +1,4 @@ -package app.revanced.revanced_manager_flutter +package app.revanced.manager import androidx.annotation.NonNull import app.revanced.patcher.data.Data diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index 0480c468..b75b409f 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="app.revanced.manager"> diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index be0520e5..50dd51a3 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - revanced_manager_flutter + revanced_manager CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/app/app.dart b/lib/app/app.dart index d256ef6c..f0012276 100644 --- a/lib/app/app.dart +++ b/lib/app/app.dart @@ -1,6 +1,6 @@ -import 'package:revanced_manager_flutter/ui/views/app_selector/app_selector_view.dart'; -import 'package:revanced_manager_flutter/ui/views/home/home_view.dart'; -import 'package:revanced_manager_flutter/ui/views/patcher/patcher_view.dart'; +import 'package:revanced_manager/ui/views/app_selector/app_selector_view.dart'; +import 'package:revanced_manager/ui/views/home/home_view.dart'; +import 'package:revanced_manager/ui/views/patcher/patcher_view.dart'; import 'package:stacked/stacked_annotations.dart'; import 'package:stacked_services/stacked_services.dart'; diff --git a/lib/main.dart b/lib/main.dart index 76bf3ecb..a72157e6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:revanced_manager_flutter/app/app.locator.dart'; -import 'package:revanced_manager_flutter/app/app.router.dart'; -import 'package:revanced_manager_flutter/main_viewmodel.dart'; -import 'package:revanced_manager_flutter/theme.dart'; -import 'package:revanced_manager_flutter/ui/views/home/home_view.dart'; -import 'package:revanced_manager_flutter/ui/views/patcher/patcher_view.dart'; +import 'package:revanced_manager/app/app.locator.dart'; +import 'package:revanced_manager/app/app.router.dart'; +import 'package:revanced_manager/main_viewmodel.dart'; +import 'package:revanced_manager/theme.dart'; +import 'package:revanced_manager/ui/views/home/home_view.dart'; +import 'package:revanced_manager/ui/views/patcher/patcher_view.dart'; import 'package:stacked/stacked.dart'; import 'package:stacked_services/stacked_services.dart'; @@ -38,7 +38,7 @@ class Navigation extends StatelessWidget { Widget build(BuildContext context) { return ViewModelBuilder.reactive( viewModelBuilder: () => MainViewModel(), - builder: (context,MainViewModel model, child) => Scaffold( + builder: (context, MainViewModel model, child) => Scaffold( body: getViewForIndex(model.currentIndex), bottomNavigationBar: NavigationBar( onDestinationSelected: model.setIndex, @@ -57,6 +57,7 @@ class Navigation extends StatelessWidget { ), ); } + Widget getViewForIndex(int index) { switch (index) { case 0: diff --git a/lib/services/manager_api.dart b/lib/services/manager_api.dart index 168c67bc..b28747a4 100644 --- a/lib/services/manager_api.dart +++ b/lib/services/manager_api.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:injectable/injectable.dart'; import 'package:path_provider/path_provider.dart' as p; -import 'package:revanced_manager_flutter/constants.dart'; +import 'package:revanced_manager/constants.dart'; import 'github_api.dart'; // use path_provider to get the path of the storage directory diff --git a/lib/services/patcher_api.dart b/lib/services/patcher_api.dart index 91630da4..b83a2192 100644 --- a/lib/services/patcher_api.dart +++ b/lib/services/patcher_api.dart @@ -3,9 +3,9 @@ import 'package:flutter/services.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:installed_apps/app_info.dart'; import 'package:installed_apps/installed_apps.dart'; -import 'package:revanced_manager_flutter/models/patch.dart'; -import 'package:revanced_manager_flutter/services/github_api.dart'; -import 'package:revanced_manager_flutter/utils/string.dart'; +import 'package:revanced_manager/models/patch.dart'; +import 'package:revanced_manager/services/github_api.dart'; +import 'package:revanced_manager/utils/string.dart'; class PatcherService { File? _patchBundleFile; diff --git a/lib/theme.dart b/lib/theme.dart index c71c3999..32dfea6b 100644 --- a/lib/theme.dart +++ b/lib/theme.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/constants.dart'; +import 'package:revanced_manager/constants.dart'; var lightTheme = ThemeData.light().copyWith( navigationBarTheme: NavigationBarThemeData( diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart index 93d78c61..17f2b8ef 100644 --- a/lib/ui/views/app_selector/app_selector_view.dart +++ b/lib/ui/views/app_selector/app_selector_view.dart @@ -1,7 +1,7 @@ import 'package:device_apps/device_apps.dart'; import 'package:flutter/material.dart'; -import 'package:revanced_manager_flutter/ui/widgets/installed_app_item.dart'; -import 'package:revanced_manager_flutter/ui/widgets/search_bar.dart'; +import 'package:revanced_manager/ui/widgets/installed_app_item.dart'; +import 'package:revanced_manager/ui/widgets/search_bar.dart'; import 'package:stacked/stacked.dart'; import 'app_selector_viewmodel.dart'; diff --git a/lib/ui/views/home/home_view.dart b/lib/ui/views/home/home_view.dart index ea214761..c3c34951 100644 --- a/lib/ui/views/home/home_view.dart +++ b/lib/ui/views/home/home_view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/ui/widgets/available_updates_card.dart'; -import 'package:revanced_manager_flutter/ui/widgets/installed_apps_card.dart'; -import 'package:revanced_manager_flutter/ui/widgets/latest_commit_card.dart'; +import 'package:revanced_manager/ui/widgets/available_updates_card.dart'; +import 'package:revanced_manager/ui/widgets/installed_apps_card.dart'; +import 'package:revanced_manager/ui/widgets/latest_commit_card.dart'; import 'package:stacked/stacked.dart'; import 'home_viewmodel.dart'; diff --git a/lib/ui/views/home/home_viewmodel.dart b/lib/ui/views/home/home_viewmodel.dart index a73debe7..79882510 100644 --- a/lib/ui/views/home/home_viewmodel.dart +++ b/lib/ui/views/home/home_viewmodel.dart @@ -1,5 +1,5 @@ -import 'package:revanced_manager_flutter/app/app.locator.dart'; -import 'package:revanced_manager_flutter/services/manager_api.dart'; +import 'package:revanced_manager/app/app.locator.dart'; +import 'package:revanced_manager/services/manager_api.dart'; import 'package:stacked/stacked.dart'; class HomeViewModel extends BaseViewModel { diff --git a/lib/ui/views/patcher/patcher_view.dart b/lib/ui/views/patcher/patcher_view.dart index 43f7c6a5..37b06b0d 100644 --- a/lib/ui/views/patcher/patcher_view.dart +++ b/lib/ui/views/patcher/patcher_view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/ui/views/app_selector/app_selector_view.dart'; -import 'package:revanced_manager_flutter/ui/widgets/app_selector_card.dart'; -import 'package:revanced_manager_flutter/ui/widgets/patch_selector_card.dart'; +import 'package:revanced_manager/ui/views/app_selector/app_selector_view.dart'; +import 'package:revanced_manager/ui/widgets/app_selector_card.dart'; +import 'package:revanced_manager/ui/widgets/patch_selector_card.dart'; import 'package:stacked/stacked.dart'; import 'patcher_viewmodel.dart'; diff --git a/lib/ui/views/patcher/patcher_viewmodel.dart b/lib/ui/views/patcher/patcher_viewmodel.dart index cfa3ba8a..fcada627 100644 --- a/lib/ui/views/patcher/patcher_viewmodel.dart +++ b/lib/ui/views/patcher/patcher_viewmodel.dart @@ -1,5 +1,5 @@ -import 'package:revanced_manager_flutter/app/app.locator.dart'; -import 'package:revanced_manager_flutter/app/app.router.dart'; +import 'package:revanced_manager/app/app.locator.dart'; +import 'package:revanced_manager/app/app.router.dart'; import 'package:stacked/stacked.dart'; import 'package:stacked_services/stacked_services.dart'; diff --git a/lib/ui/widgets/app_selector_card.dart b/lib/ui/widgets/app_selector_card.dart index 1b63bf12..f2cead32 100644 --- a/lib/ui/widgets/app_selector_card.dart +++ b/lib/ui/widgets/app_selector_card.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/constants.dart'; +import 'package:revanced_manager/constants.dart'; class AppSelectorCard extends StatelessWidget { final Function()? onPressed; diff --git a/lib/ui/widgets/application_item.dart b/lib/ui/widgets/application_item.dart index 2dad92dc..a4b3155c 100644 --- a/lib/ui/widgets/application_item.dart +++ b/lib/ui/widgets/application_item.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/constants.dart'; -import 'package:revanced_manager_flutter/ui/widgets/patch_text_button.dart'; +import 'package:revanced_manager/constants.dart'; +import 'package:revanced_manager/ui/widgets/patch_text_button.dart'; class ApplicationItem extends StatelessWidget { final String asset; diff --git a/lib/ui/widgets/available_updates_card.dart b/lib/ui/widgets/available_updates_card.dart index 35e79680..524d9b76 100644 --- a/lib/ui/widgets/available_updates_card.dart +++ b/lib/ui/widgets/available_updates_card.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/ui/widgets/application_item.dart'; -import 'package:revanced_manager_flutter/ui/widgets/patch_text_button.dart'; +import 'package:revanced_manager/ui/widgets/application_item.dart'; +import 'package:revanced_manager/ui/widgets/patch_text_button.dart'; class AvailableUpdatesCard extends StatelessWidget { const AvailableUpdatesCard({Key? key}) : super(key: key); diff --git a/lib/ui/widgets/installed_app_item.dart b/lib/ui/widgets/installed_app_item.dart index f82a9e9f..74e16b5e 100644 --- a/lib/ui/widgets/installed_app_item.dart +++ b/lib/ui/widgets/installed_app_item.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/constants.dart'; +import 'package:revanced_manager/constants.dart'; class InstalledAppItem extends StatefulWidget { final String name; diff --git a/lib/ui/widgets/installed_apps_card.dart b/lib/ui/widgets/installed_apps_card.dart index dd9bfb52..be528c11 100644 --- a/lib/ui/widgets/installed_apps_card.dart +++ b/lib/ui/widgets/installed_apps_card.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/ui/widgets/application_item.dart'; +import 'package:revanced_manager/ui/widgets/application_item.dart'; class InstalledAppsCard extends StatelessWidget { const InstalledAppsCard({Key? key}) : super(key: key); diff --git a/lib/ui/widgets/latest_commit_card.dart b/lib/ui/widgets/latest_commit_card.dart index 5c7dfbfb..7a0aeb72 100644 --- a/lib/ui/widgets/latest_commit_card.dart +++ b/lib/ui/widgets/latest_commit_card.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/services/github_api.dart'; -import 'package:revanced_manager_flutter/constants.dart'; -import 'package:revanced_manager_flutter/ui/widgets/patch_text_button.dart'; +import 'package:revanced_manager/services/github_api.dart'; +import 'package:revanced_manager/constants.dart'; +import 'package:revanced_manager/ui/widgets/patch_text_button.dart'; class LatestCommitCard extends StatefulWidget { const LatestCommitCard({Key? key}) : super(key: key); diff --git a/lib/ui/widgets/patch_selector_card.dart b/lib/ui/widgets/patch_selector_card.dart index 1c2c100f..5ee936f6 100644 --- a/lib/ui/widgets/patch_selector_card.dart +++ b/lib/ui/widgets/patch_selector_card.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:revanced_manager_flutter/constants.dart'; +import 'package:revanced_manager/constants.dart'; class PatchSelectorCard extends StatelessWidget { final Function()? onPressed; diff --git a/lib/ui/widgets/patch_text_button.dart b/lib/ui/widgets/patch_text_button.dart index 979c1084..cb9231f2 100644 --- a/lib/ui/widgets/patch_text_button.dart +++ b/lib/ui/widgets/patch_text_button.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:revanced_manager_flutter/constants.dart'; +import 'package:revanced_manager/constants.dart'; class PatchTextButton extends StatelessWidget { final String text; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 7dfd32d9..56b92be5 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "revanced_manager_flutter") +set(BINARY_NAME "revanced_manager") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "app.revanced.revanced_manager_flutter") +set(APPLICATION_ID "app.revanced.revanced") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/linux/my_application.cc b/linux/my_application.cc index 5ef89b13..1be5c913 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "revanced_manager_flutter"); + gtk_header_bar_set_title(header_bar, "revanced_manager"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "revanced_manager_flutter"); + gtk_window_set_title(window, "revanced_manager"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 0d56f519..f419d265 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,7 +6,9 @@ import FlutterMacOS import Foundation import path_provider_macos +import sqflite func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 7cb3bf72..dadb34a4 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -54,7 +54,7 @@ /* Begin PBXFileReference section */ 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* revanced_manager_flutter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "revanced_manager_flutter.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* revanced_manager.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "revanced_manager.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -105,7 +105,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* revanced_manager_flutter.app */, + 33CC10ED2044A3C60003C045 /* revanced_manager.app */, ); name = Products; sourceTree = ""; @@ -172,7 +172,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* revanced_manager_flutter.app */; + productReference = 33CC10ED2044A3C60003C045 /* revanced_manager.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index d8809487..0b22c7f7 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -54,7 +54,7 @@ @@ -71,7 +71,7 @@ diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 4bedd617..42efc6f8 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -5,7 +5,7 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = revanced_manager_flutter +PRODUCT_NAME = revanced_manager // The application's bundle identifier PRODUCT_BUNDLE_IDENTIFIER = app.revanced.revancedManagerFlutter diff --git a/pubspec.yaml b/pubspec.yaml index c96052d5..e56c305c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ -name: revanced_manager_flutter -description: The unofficial ReVanced Manager based on Flutter. +name: revanced_manager +description: An unofficial ReVanced Manager based on Flutter. homepage: https://github.com/Aunali321/revanced-manager publish_to: 'none' diff --git a/test/widget_test.dart b/test/widget_test.dart index d546aa44..8645d62b 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:revanced_manager_flutter/main.dart'; +import 'package:revanced_manager/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/web/index.html b/web/index.html index a6d6c293..d3437bcc 100644 --- a/web/index.html +++ b/web/index.html @@ -23,13 +23,13 @@ - + - revanced_manager_flutter + revanced_manager