From 03bd342c27c7eef21aade5bfc067e5996179628a Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Mon, 7 Feb 2022 18:20:55 +0600 Subject: [PATCH] version bump for next release v1.2.0 CHANGELOG updated for v1.2.0 default hotkeys for player control if doesn't exists on startup --- AppImageBuilder.yml | 2 +- CHANGELOG.md | 18 +++++++ Makefile | 5 +- README.md | 6 +-- aur-struct/.SRCINFO | 4 +- aur-struct/PKGBUILD | 2 +- choco-struct/spotube.nuspec | 4 +- deb-struct/DEBIAN/control | 2 +- lib/components/Settings.dart | 2 +- lib/provider/UserPreferences.dart | 36 +++++++++----- linux/com.github.KRTirtho.Spotube.appdata.xml | 48 +++++++++++++++++++ pubspec.yaml | 2 +- scripts/windows-setup-creator.iss | 2 +- windows/runner/Runner.rc | 2 +- 14 files changed, 108 insertions(+), 27 deletions(-) create mode 100644 linux/com.github.KRTirtho.Spotube.appdata.xml diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml index 321b63a4..9162ed26 100644 --- a/AppImageBuilder.yml +++ b/AppImageBuilder.yml @@ -11,7 +11,7 @@ AppDir: id: oss.krtirtho.spotube name: Spotube icon: spotube-logo - version: 1.1.0 + version: 1.2.0 exec: spotube exec_args: $@ apt: diff --git a/CHANGELOG.md b/CHANGELOG.md index 55c691ab..27d49948 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +# v1.2.0 + +### New +- Global custom reconfigurable *hotkey* support for playback controls (play-pause/next/previous) +- Credit section in the Settings page with important links +### Improved +- Macos support +- Genius (Lyrics Provider) access_token can be saved in the Login page too +- Better theme for dropdown-buttons + +### Bug fixes +- broken authentication IPC on Mac OS (https://github.com/KRTirtho/spotube/pull/18) +- Mac OS's global appmenu's default APP_NAME replaced with Spotube +- location of back button on macOS (https://github.com/KRTirtho/spotube/pull/21) +- windows titlebar buttons appears on Mac OS +- genius access_token not loading on initial app start + + # v1.1.0 ### New diff --git a/Makefile b/Makefile index 3c3cfb62..4e101560 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,12 @@ BUNDLE_DIR=build/linux/x64/release/bundle MIRRORLIST=${PWD}/build/mirrorlist deb: mkdir -p ${USR_SHARE}/spotube\ - && mkdir -p $(USR_SHARE)/applications $(USR_SHARE)/icons/spotube $(USR_SHARE)/spotube\ + && mkdir -p $(USR_SHARE)/applications $(USR_SHARE)/icons/spotube $(USR_SHARE)/spotube $(USR_SHARE)/appdata\ && cp -r $(BUNDLE_DIR)/* $(USR_SHARE)/spotube\ && cp linux/spotube.desktop $(USR_SHARE)/applications/\ + && cp linux/com.github.KRTirtho.Spotube.appdata.xml $(USR_SHARE)/appdata/spotube.appdata.xml\ && cp assets/spotube-logo.png $(USR_SHARE)/icons/spotube\ + && sed -i 's|com.github.KRTirtho.Spotube|spotube|' $(USR_SHARE)/appdata/spotube.appdata.xml\ && dpkg-deb -b deb-struct/ build/Spotube-linux-x86_64.deb tar: @@ -16,6 +18,7 @@ tar: && cp -r $(BUNDLE_DIR)/* $(TEMP_DIR)\ && cp linux/spotube.desktop $(TEMP_DIR)\ && cp assets/spotube-logo.png $(TEMP_DIR)\ + && cp linux/com.github.KRTirtho.Spotube.appdata.xml $(TEMP_DIR)\ && tar -cJf build/Spotube-linux-x86_64.tar.xz -C $(TEMP_DIR) .\ && rm -rf $(TEMP_DIR) diff --git a/README.md b/README.md index f2a18d63..34ca53ae 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ All the binaries are located in the [releases](https://github.com/krtirtho/spotu ## Windows -Download the [setup file](https://github.com/KRTirtho/spotube/releases/download/v1.1.0/Spotube-windows-x86_64-setup.exe) & follow along the installer +Download the [setup file](https://github.com/KRTirtho/spotube/releases/download/v1.2.0/Spotube-windows-x86_64-setup.exe) & follow along the installer ### Chocolatey @@ -71,7 +71,7 @@ $ flatpak install flathub com.github.KRTirtho.Spotube Download on Flathub ### Ubuntu/Debian/Linux Mint/Pop_!OS: - Download the [Spotube-linux-x86_64.deb](https://github.com/KRTirtho/spotube/releases/download/v1.1.0/Spotube-linux-x86_64.deb) then double click it or run + Download the [Spotube-linux-x86_64.deb](https://github.com/KRTirtho/spotube/releases/download/v1.2.0/Spotube-linux-x86_64.deb) then double click it or run ```bash $ sudo apt install Spotube-linux-x86_64.deb # or @@ -91,7 +91,7 @@ $ flatpak install flathub com.github.KRTirtho.Spotube ### AppImage: - Download the [Spotube-linux-x86_64.AppImage](https://github.com/KRTirtho/spotube/releases/download/v1.1.0/Spotube-linux-x86_64.AppImage) file & double click to run it. AppImages require [appimage-launcher](https://github.com/TheAssassin/AppImageLauncher) to be installed + Download the [Spotube-linux-x86_64.AppImage](https://github.com/KRTirtho/spotube/releases/download/v1.2.0/Spotube-linux-x86_64.AppImage) file & double click to run it. AppImages require [appimage-launcher](https://github.com/TheAssassin/AppImageLauncher) to be installed **I'll/try to upload the package binaries to linux debian/arch/ubuntu/snap/flatpack/redhat/chocolatey stores or software centers or repositories** diff --git a/aur-struct/.SRCINFO b/aur-struct/.SRCINFO index 97398143..7f5956bc 100644 --- a/aur-struct/.SRCINFO +++ b/aur-struct/.SRCINFO @@ -1,12 +1,12 @@ pkgbase = spotube-bin pkgdesc = A lightweight free Spotify desktop-client which handles playback manually, streams music using Youtube & no Spotify premium account is needed - pkgver = 1.1.0 + pkgver = 1.2.0 pkgrel = 1 url = https://github.com/KRTirtho/spotube/ arch = x86_64 license = BSD-4-Clause depends = libkeybinder3 - source = https://github.com/KRTirtho/spotube/releases/download/v1.1.0/Spotube-linux-x86_64.tar.xz + source = https://github.com/KRTirtho/spotube/releases/download/v1.2.0/Spotube-linux-x86_64.tar.xz md5sums = 0db87627ddf753bc7f09ebbb282184ee pkgname = spotube-bin diff --git a/aur-struct/PKGBUILD b/aur-struct/PKGBUILD index ee7c4a75..4e7ceb3e 100644 --- a/aur-struct/PKGBUILD +++ b/aur-struct/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kingkor Roy Tirtho pkgname=spotube-bin -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 epoch= pkgdesc="A lightweight free Spotify desktop-client which handles playback manually, streams music using Youtube & no Spotify premium account is needed" diff --git a/choco-struct/spotube.nuspec b/choco-struct/spotube.nuspec index 4573fb6b..a3c4219d 100644 --- a/choco-struct/spotube.nuspec +++ b/choco-struct/spotube.nuspec @@ -4,7 +4,7 @@ spotube - 1.1.0 + 1.2.0 https://github.com/KRTirtho/spotube/tree/master/choco-struct Kingkor Roy Tirtho @@ -39,7 +39,7 @@ - Lyrics - Downloadable track (WIP) - https://github.com/KRTirtho/spotube/releases/tag/v1.1.0 + https://github.com/KRTirtho/spotube/releases/tag/v1.2.0 diff --git a/deb-struct/DEBIAN/control b/deb-struct/DEBIAN/control index fbb93a80..1b14adf1 100644 --- a/deb-struct/DEBIAN/control +++ b/deb-struct/DEBIAN/control @@ -1,5 +1,5 @@ Package: Spotube -Version: 1.1.0 +Version: 1.2.0 Section: sound Priority: optional Architecture: all diff --git a/lib/components/Settings.dart b/lib/components/Settings.dart index 2aa8c17a..705e2059 100644 --- a/lib/components/Settings.dart +++ b/lib/components/Settings.dart @@ -173,7 +173,7 @@ class _SettingsState extends State { ); }), const SizedBox(height: 40), - const Text("Spotube v1.1.0"), + const Text("Spotube v1.2.0"), const SizedBox(height: 10), Row( mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/provider/UserPreferences.dart b/lib/provider/UserPreferences.dart index 71153035..2fc6543c 100644 --- a/lib/provider/UserPreferences.dart +++ b/lib/provider/UserPreferences.dart @@ -39,20 +39,32 @@ class UserPreferences extends ChangeNotifier { geniusAccessToken ??= accessToken; - nextTrackHotKey ??= await _getHotKeyFromLocalStorage( - localStorage, - LocalStorageKeys.nextTrackHotKey, - ); + nextTrackHotKey ??= (await _getHotKeyFromLocalStorage( + localStorage, + LocalStorageKeys.nextTrackHotKey, + )) ?? + HotKey( + KeyCode.slash, + modifiers: [KeyModifier.control, KeyModifier.alt], + ); - prevTrackHotKey ??= await _getHotKeyFromLocalStorage( - localStorage, - LocalStorageKeys.prevTrackHotKey, - ); + prevTrackHotKey ??= (await _getHotKeyFromLocalStorage( + localStorage, + LocalStorageKeys.prevTrackHotKey, + )) ?? + HotKey( + KeyCode.comma, + modifiers: [KeyModifier.control, KeyModifier.alt], + ); - playPauseHotKey ??= await _getHotKeyFromLocalStorage( - localStorage, - LocalStorageKeys.playPauseHotKey, - ); + playPauseHotKey ??= (await _getHotKeyFromLocalStorage( + localStorage, + LocalStorageKeys.playPauseHotKey, + )) ?? + HotKey( + KeyCode.period, + modifiers: [KeyModifier.control, KeyModifier.alt], + ); notifyListeners(); } catch (e, stack) { print("[UserPreferences.onInit]: $e"); diff --git a/linux/com.github.KRTirtho.Spotube.appdata.xml b/linux/com.github.KRTirtho.Spotube.appdata.xml new file mode 100644 index 00000000..65f2deee --- /dev/null +++ b/linux/com.github.KRTirtho.Spotube.appdata.xml @@ -0,0 +1,48 @@ + + + com.github.KRTirtho.Spotube + Spotube + + A lightweight free Spotify desktop-client which handles playback manually, streams music using Youtube & no Spotify premium account is needed + + CC0-1.0 + BSD-4-Clause + + pointing + keyboard + touch + + Kingkor Roy Tirtho + https://github.com/krtirtho/spotube + +

Spotube is a Flutter based lightweight Spotify client. It utilizes the power of Spotify & Youtube's public API & creates a hazardless, performant & resource friendly User Experience

+

Following are the features that currently spotube offers:

+
    +
  • Open Source
    • +
  • No telementry, diagnostics or user data collection
    • +
  • Lightweight & resource friendly
    • +
  • Native performance (Thanks to Flutter+Skia)
    • +
  • Playback control is on user's machine instead of server based
    • +
  • Small size & less data hungry
    • +
  • No spotify or youtube ads since it uses all public & free APIs (But it's recommended to support the creators by watching/liking/subscribing to the artists youtube channel or add as favourite track in spotify. Mostly buying spotify premium is the best way to support their valuable creations)
    • +
  • Lyrics
    • +
  • Downloadable track
    • +
+ + + + https://rawcdn.githack.com/KRTirtho/spotube/e1e5340e241038ce8574bf02370be0cf78cc85a2/assets/spotube-screenshot.png + + + com.github.KRTirtho.Spotube.desktop + + + + + + + + + + krtirtho@gmail.com + \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 27a59888..23e11b4f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.1.0 +version: 1.2.0 environment: sdk: ">=2.15.1 <3.0.0" diff --git a/scripts/windows-setup-creator.iss b/scripts/windows-setup-creator.iss index 9062a91d..a3557963 100644 --- a/scripts/windows-setup-creator.iss +++ b/scripts/windows-setup-creator.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Spotube" -#define MyAppVersion "1.1.0" +#define MyAppVersion "1.2.0" #define MyAppPublisher "KRTirtho, OSS" #define MyAppURL "https://github.com/KRTirtho/spotube" #define MyAppExeName "spotube.exe" diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 8b131109..7af2e5ab 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -69,7 +69,7 @@ IDI_APP_ICON ICON "resources\\icon.ico" #ifdef FLUTTER_BUILD_NAME #define VERSION_AS_STRING #FLUTTER_BUILD_NAME #else -#define VERSION_AS_STRING "1.1.0" +#define VERSION_AS_STRING "1.2.0" #endif VS_VERSION_INFO VERSIONINFO