Merge pull request #27 from SiroDaves/desktop

Desktop configs
SiroDaves · Jun 29, 2024 · f4eb235 · f4eb235
2 parents c407cec + 3943c9f
commit f4eb235
Show file tree

Hide file tree

Showing 33 changed files with 137 additions and 346 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
-# Contributing to the Songlib App
+# Contributing to the SongLib App
 
-Thank you for contributing to our Songlib app! Please follow the guidelines below to ensure a smooth contribution process.
+Thank you for contributing to our SongLib app! Please follow the guidelines below to ensure a smooth contribution process.
 
 ## Branching
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Welcome to Songlib
+# Welcome to SongLib
 
 <a href='https://play.google.com/store/apps/details?id=com.songlib'>
  <img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' width='200'/>
@@ -16,7 +16,7 @@
 
 ## Overview
 
-Songlib is a robust mobile solution tailored for our users who need to sing hymns, designed to streamline their operations and enhance productivity. This Flutter-based application facilitates their access to your church songbook/hymns seamlessly that you don't have to worry about even being online once you have set up the app on your device.
+SongLib is a robust mobile solution tailored for our users who need to sing hymns, designed to streamline their operations and enhance productivity. This Flutter-based application facilitates their access to your church songbook/hymns seamlessly that you don't have to worry about even being online once you have set up the app on your device.
 <table>
 <tr>
 <td><img src="screenshots/Droid/image1.png" width="200px" /></td>
@@ -30,16 +30,16 @@ Songlib is a robust mobile solution tailored for our users who need to sing hymn
 
 ## Getting Started
 
-Follow this guide to set up and run Songlib:
+Follow this guide to set up and run SongLib:
 
-### Setting Up Songlib:
+### Setting Up SongLib:
 
 1. **Install Flutter and Dependencies:** Ensure Flutter is installed on your system. Download the Flutter SDK from the official website and set up your preferred IDE (e.g., Android Studio or Visual Studio Code) with the Flutter plugin.
 
-2. **Clone the Repository:** Clone Songlib repository from GitHub using Git:
+2. **Clone the Repository:** Clone SongLib repository from GitHub using Git:
 
  ```bash
- git clone [email protected]:SiroDaves/SonglibApp.git
+ git clone [email protected]:SiroDaves/SongLibApp.git
  ```
 
 3. **Install Packages:** Navigate to the project directory and run:
@@ -48,35 +48,41 @@ Follow this guide to set up and run Songlib:
  flutter pub get
  ```
 
-### Running Songlib:
+### Running SongLib:
 
 1. **Device Setup:** Connect an emulator or physical device to your development environment. Check connected devices:
 
  ```bash
  flutter devices
  ```
 
-2. **Run the App:** Execute the following command from the project directory:
+2. **Update Dependencies:**
 
  ```bash
- flutter run
+ flutter pub get
  ```
 
- - **Update Dependencies:**
+3. **Update Code Generated Files:**
 
-  ```bash
-  dart run build_runner build --delete-conflicting-outputs
-  ```
+ ```bash
+ dart run build_runner build --delete-conflicting-outputs
+ ```
 
- - **Update Localization Strings:**
+4. **Update Localization Strings:**
 
- ```bash
- flutter gen-l10n
- ```
+ ```bash
+ flutter gen-l10n
+ ```
+5. **Running SongLib:**
+ ```bash
+ flutter run
+ ```
+
+### Building SongLib
 
-3. **Build the App:**
+1. **Android:**
 
- - **AppTester (Firebase Distribution):**
+ - **UAT: AppTester (Firebase Distribution):**
 
  ```bash
  flutter build apk --flavor uat -t lib/main_uat.dart --no-tree-shake-icons
@@ -85,7 +91,14 @@ Follow this guide to set up and run Songlib:
  - **Production (For Play Store):**
 
  ```bash
- flutter build appbundle --flavor prod -t lib/main_prod.dart --no-tree-shake-icons
+ flutter build appbundle --flavor prod -t lib/main.dart --no-tree-shake-icons
  ```
+2. **Windows:**
+
+ ```
+ flutter build windows --target=lib/main_prod.dart
+ ```
+
+---
 
-Congratulations! You've successfully set up and run or built Songlib. Explore the codebase, make modifications, and contribute to creating a seamless experience for the users. Happy coding!
+Congratulations! You've successfully set up and run or built SongLib. Explore the codebase, make modifications, and contribute to creating a seamless experience for the users. Happy coding!
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
  compileSdkVersion 34
  multiDexEnabled true
  versionCode 19
- versionName "0.0.7.61"
+ versionName "1.0.7.65"
  }
 
  signingConfigs {
@@ -83,25 +83,25 @@ android {
  flavorDimensions "flavors"
  productFlavors {
  dev {
- manifestPlaceholders = [appLabel: "Songlib Dev"]
+ manifestPlaceholders = [appLabel: "SongLib Dev"]
  dimension "flavors"
  applicationIdSuffix ".dev"
  versionNameSuffix "-dev"
  }
  uat {
- manifestPlaceholders = [appLabel: "Songlib Uat"]
+ manifestPlaceholders = [appLabel: "SongLib Uat"]
  dimension "flavors"
  versionNameSuffix "-uat"
  applicationId "com.songlib.uat"
- versionCode 26
- versionName "0.0.7.62"
+ versionCode 27
+ versionName "1.0.7.65"
  }
  prod {
- manifestPlaceholders = [appLabel: "Songlib"]
+ manifestPlaceholders = [appLabel: "SongLib"]
  dimension "flavors"
  applicationId "com.songlib"
- versionCode 26
- versionName "0.0.7.62"
+ versionCode 27
+ versionName "1.0.7.65"
  }
  }
 }

diff --git a/android/build.gradle b/android/build.gradle
@@ -7,8 +7,6 @@ buildscript {
  dependencies {
  classpath 'com.android.tools.build:gradle:8.1.2'
  classpath 'com.google.gms:google-services:4.3.15'
- classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
- classpath 'com.google.firebase:perf-plugin:1.4.2'
  }
 }
 

diff --git a/assets/images/app_icon.png b/assets/images/app_icon.png
diff --git a/assets/images/otp.png b/assets/images/otp.png
diff --git a/installers/windows/songlib.iss b/installers/windows/songlib.iss
@@ -1,24 +1,38 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
 #define MyAppName "SongLib"
-#define MyAppVersion "0.0.7"
-#define MyAppPublisher "Futuristic Ke"
+#define MyAppVersion "1.0.7.65"
+#define MyAppPublisher "Futuristic Inc."
+#define MyAppURL "https://songlib.vercel.app"
 #define MyAppExeName "SongLib.exe"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{0CA8C6CE-E006-44DE-9D42-3994940B9173}
+AppId={{884424F7-F8DD-4CF6-8BC3-5E8126A7893D}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 ;AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
 DefaultDirName={autopf}\{#MyAppName}
-DisableDirPage=yes
+; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
+; on anything but x64 and Windows 11 on Arm.
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64compatible
 DisableProgramGroupPage=yes
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
 ;PrivilegesRequired=lowest
-OutputDir=D:\Dev\Flutter\Projects\SongLib\installers\windows
-OutputBaseFilename=SongLib
-SetupIconFile=D:\Dev\Flutter\Projects\SongLib\windows\runner\resources\app_icon.ico
+OutputDir=C:\Devs\Flutter\Projects\SongLib\installers\windows
+OutputBaseFilename={#MyAppName}-{#MyAppVersion}
+SetupIconFile=C:\Devs\Flutter\Projects\SongLib\windows\runner\resources\app_icon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
@@ -30,7 +44,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "D:\Dev\Flutter\Projects\SongLib\build\windows\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Devs\Flutter\Projects\SongLib\build\windows\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -5,15 +5,15 @@
  <key>CFBundleDevelopmentRegion</key>
  <string>$(DEVELOPMENT_LANGUAGE)</string>
  <key>CFBundleDisplayName</key>
- <string>Songlib</string>
+ <string>SongLib</string>
  <key>CFBundleExecutable</key>
  <string>$(EXECUTABLE_NAME)</string>
  <key>CFBundleIdentifier</key>
  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
  <key>CFBundleInfoDictionaryVersion</key>
  <string>6.0</string>
  <key>CFBundleName</key>
- <string>Songlib</string>
+ <string>SongLib</string>
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>

diff --git a/l10n/app_en.arb b/l10n/app_en.arb
@@ -1,7 +1,7 @@
 {
  "@@locale": "en",
 
- "appName": "Songlib",
+ "appName": "SongLib",
  "listTitle": "Song Lists",
  "searchTitle": "Search",
  "likesTitle": "Liked Songs",
@@ -51,7 +51,7 @@
  "donate": "Donate",
  "proceed": "Proceed",
  "justAMinute": "Just a minute!",
- "supportSonglib": "Support SongLib",
+ "supportSongLib": "Support SongLib",
  "notificationDialog": "Let's remind you",
  "donationRequest": "Donation Request",
  "donationRequestBody": "SongLib has a lot in the pipelines and will need your support to accomplish that.",

diff --git a/lib/app_sub_window.dart b/lib/app_sub_window.dart
@@ -19,7 +19,7 @@ class AppSubWindow extends StatelessWidget {
  return MaterialApp(
  home: Scaffold(
  appBar: AppBar(
- title: const Text('Songlib'),
+ title: const Text('SongLib'),
  ),
  body: Column(
  children: [

diff --git a/lib/common/utils/constants/app_constants.dart b/lib/common/utils/constants/app_constants.dart
@@ -9,7 +9,7 @@ import '../logger.dart';
 
 class AppConstants {
  AppConstants._();
- static String dbName = 'Songlib.db';
+ static String dbName = 'SongLib.db';
  static const String editsTable = 'edits';
  static const String draftsTable = 'drafts';
  static const String booksTable = 'books';

diff --git a/lib/common/utils/file_util.dart b/lib/common/utils/file_util.dart
@@ -48,20 +48,20 @@ Future<String> downloadDir() async {
  }
 }
 
-/// Songlib directory
+/// SongLib directory
 Future<String> sirodavesDirx() async {
  Directory directory = Directory('/');
  if (Platform.isMacOS) {
  directory = Directory(
- '/Users/${Platform.environment['USER']}/Documents/Songlib');
+ '/Users/${Platform.environment['USER']}/Documents/SongLib');
  } else if (Platform.isWindows) {
  directory = Directory(
- '${Platform.environment['USERPROFILE']}\\Documents\\Songlib');
+ '${Platform.environment['USERPROFILE']}\\Documents\\SongLib');
  } else if (Platform.isLinux) {
  directory = Directory(
- '/home/${Platform.environment['USER']}/Documents/Songlib');
+ '/home/${Platform.environment['USER']}/Documents/SongLib');
  } else if (Platform.isAndroid) {
- directory = Directory('/storage/emulated/0/Documents/Songlib');
+ directory = Directory('/storage/emulated/0/Documents/SongLib');
  }
  if (await directory.exists()) {
  //if folder already exists return path

diff --git a/lib/di/injectable.config.dart b/lib/di/injectable.config.dart