updated for google play store / app store

.github/workflows/linux-web.yaml

@@ -37,7 +37,7 @@ jobs:
       run: flutter build linux
 
     - name: Build for Android
-      run: flutter build appbundle
+      run: flutter build appbundle --debug
 
     - name: Build for web
       run: flutter build web --no-web-resources-cdn --csp --web-renderer canvaskit
@@ -62,3 +62,13 @@ jobs:
         name: flutter-web-build-latest
         path: build/web
         if-no-files-found: error
+
+    - name: Publish to Cloudflare Pages
+      uses: cloudflare/pages-action@v1
+      with:
+        apiToken: ${{ secrets.CLOUDFLARE_PAGES_DEPLOY }}
+        accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+        projectName: ything-radio
+        directory: build/web
+        # push directly to "production" on cloudflare pages
+        branch: main

README.md

@@ -11,12 +11,12 @@ or to facilitate user input for internet radio sites.
 
 This app has been designed to run across all platforms!
 
-- Android
-- iOS
+- Android ([Google Play Store](https://play.google.com/store/apps/details?id=net.ything.radio.android))
+- iOS (Requires [TestFlight](https://itunes.apple.com/us/app/testflight/id899247664?mt=8), contact info@ything.app for invitation)
 - MacOS
 - Windows
 - Linux
-- Web
+- Web ([Live Demo](https://radio-demo.ything.app/))
 
 Provide a single unified experience across *all* platforms for your users!
 
@@ -25,7 +25,5 @@ Want to have us modify this app for you? Reach out to info@ything.app
 Coming Soon:
 
 - Apple App Store Live Demo!
-- Google Play Store Live Demo!
 - Windows portable exe
-- Web based live demo
 - Screenshots / Demo Videos

android/app/build.gradle

@@ -5,6 +5,12 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "net.ything.radio.android"
     //compileSdk = flutter.compileSdkVersion
@@ -25,17 +31,27 @@ android {
         applicationId = "net.ything.radio.android"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
-        targetSdk = flutter.targetSdkVersion
-        versionCode = flutter.versionCode
-        versionName = flutter.versionName
+        minSdk = 24
+        targetSdk = 34
+        versionCode = 2
+        versionName = "1.0.2"
     }
 
+
+    signingConfigs {
+        release {
+            keyAlias = keystoreProperties['keyAlias']
+            keyPassword = keystoreProperties['keyPassword']
+            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword = keystoreProperties['storePassword']
+        }
+    } 
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.debug
+            signingConfig = signingConfigs.release
         }
     }
 }

android/key.properties.dist

@@ -0,0 +1,4 @@
+storePassword=
+keyPassword=
+keyAlias=
+storeFile=

android/readme-signing.md

@@ -0,0 +1,4 @@
+
+https://docs.flutter.dev/deployment/android#signing-the-app
+
+keytool -genkey -v -keystore ~/upload-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias upload

assets/appicon/radio.svg

@@ -0,0 +1 @@
+<svg  xmlns="http://www.w3.org/2000/svg"  width="24"  height="24"  viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-radio"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M14 3l-9.371 3.749a1 1 0 0 0 -.629 .928v11.323a1 1 0 0 0 1 1h14a1 1 0 0 0 1 -1v-11a1 1 0 0 0 -1 -1h-14.5" /><path d="M4 12h16" /><path d="M7 12v-2" /><path d="M17 16v.01" /><path d="M13 16v.01" /></svg>

flutter_launcher_icons.yaml

@@ -1,6 +1,7 @@
 flutter_launcher_icons:
   android: true 
   ios: true
+  remove_alpha_ios: true
   image_path: "assets/appicon/icon.png"
   min_sdk_android: 21 
   adaptive_icon_background: "#FFA86A"

ios/Podfile

@@ -40,5 +40,12 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+
+    target.build_configurations.each do |config|
+          config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+            '$(inherited)',
+            'AUDIO_SESSION_MICROPHONE=0'
+          ]
+        end
   end
 end

ios/Podfile.lock

@@ -49,6 +49,6 @@ SPEC CHECKSUMS:
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
-PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
+PODFILE CHECKSUM: fe2316eacdf4337bc10b81b9cf460c6f69aee374
 
 COCOAPODS: 1.15.2

lib/About.dart

@@ -1,40 +1,29 @@
 import 'package:flutter/material.dart';
 import 'package:ything_radio/SafeZone.dart';
 
+import 'Globals.dart';
+
 class About extends StatelessWidget {
   const About({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return SafeZone(
-      child: DefaultTextStyle(
-        style: Theme.of(context).textTheme.bodyLarge!,
-        child: const SingleChildScrollView(
-          child: Text(
-            'Ything Radio is an app that is intended to provide a demonstration of the '
-            'open source ything_radio app. This app is used to provide the ability for the '
-            '"look and feel" of the app to be tested on real devices for those wishing to '
-            'either use the code as a template for themselves; or, alternatively, have Ything LLC '
-            'create a custom app for them!'
-            '\n\n'
-            'This app intentionally does not provide a method to change the streaming source '
-            'as it is intended for use by internet radio stations to provide a dedicated app '
-            'for their radio station. This is not intended to be an app for generic usage for '
-            'multiple radio stations, a discovery platform, or to facilitate user input for '
-            'internet radio sites.'
-            '\n\n'
-            'This app has been designed to run across all platforms!'
-            '\n\n'
-            'Android, iOS, MacOS, Windows, Linux, and Web!'
-            '\n\n'
-            'Have a single unified experience across all platforms for your users!'
-            '\n\n'
-            'Want to have us modify this app for you? Reach out at info@ything.net '
-            'We can add additional features for you! Schedule views, up next listings, '
-            'and even custom user interactivity! '
-            '\n\n'
-            'We look forward to hearing from you soon! We would love to build your app!',
-            textAlign: TextAlign.justify,
+    return Container(
+      decoration: const BoxDecoration(
+        image: DecorationImage(
+          image: AssetImage('assets/images/app-background2.jpg'),
+          fit: BoxFit.cover,
+          opacity: 0.2,
+        ),
+      ),
+      child: SafeZone(
+        child: DefaultTextStyle(
+          style: Theme.of(context).textTheme.bodyLarge!,
+          child: SingleChildScrollView(
+            child: Text(
+              getAboutText(),
+              textAlign: TextAlign.justify,
+            ),
           ),
         ),
       ),

lib/Globals.dart

@@ -1,11 +1,55 @@
+import 'dart:io' show Platform;
+
 import 'package:audio_service/audio_service.dart';
 import 'package:audio_session/audio_session.dart';
+import 'package:audioplayers/audioplayers.dart';
+import 'package:http/http.dart' as http;
 
 import 'ListenHandler.dart';
 
 late final ListenHandler _listenHandler;
 late final AudioSession _session;
 
+const String _fallback =
+    "https://generic.ything.app/music/separation-185196.mp3";
+final _urlSource = Uri.parse("https://generic.ything.app/music/player.url");
+late final String _radioUrl;
+
+Future<void> loadCurrentUrl() async {
+  final resp = await http.get(_urlSource);
+  if (resp.statusCode == 200) {
+    _radioUrl = resp.body.trim();
+    print('Loaded remote url');
+  } else {
+    _radioUrl = _fallback;
+    print('Request for current streaming url failed, using fallback url');
+  }
+}
+
+const String _fallbackAbout =
+    "Ything Radio is an internet radio streaming application.";
+final _urlAbout =
+    Uri.parse("https://generic.ything.app/ything_radio/about.txt");
+
+final _urlAboutIOS =
+    Uri.parse("https://generic.ything.app/ything_radio/about_ios.txt");
+
+late final String _remoteAbout;
+
+Future<void> loadAboutUrl() async {
+  final resp = await http.get(Platform.isIOS ? _urlAboutIOS : _urlAbout);
+
+  if (resp.statusCode == 200) {
+    _remoteAbout = resp.body;
+    print('Loaded remote about');
+  } else {
+    _remoteAbout = _fallbackAbout;
+    print('Request for remote about failed, using fallback about');
+  }
+}
+
+String getAboutText() => _remoteAbout;
+
 Future<void> setupListenHandler() async {
   _listenHandler = await AudioService.init(
     builder: () => ListenHandler(),
@@ -17,10 +61,44 @@ Future<void> setupListenHandler() async {
   _session = await AudioSession.instance;
 
   await _session.configure(const AudioSessionConfiguration.music());
+
+  //TODO: Do I need to handle these events? audioplayers may be doing it already
+  //_session.interruptionEventStream.listen((event) {
+  //  if (event.begin) {
+  //    switch (event.type) {
+  //      case AudioInterruptionType.duck:
+  //        _listenHandler.duck();
+  //        break;
+  //      case AudioInterruptionType.pause:
+  //      case AudioInterruptionType.unknown:
+  //        _listenHandler.pause();
+  //        break;
+  //    }
+  //  } else {
+  //    switch (event.type) {
+  //      case AudioInterruptionType.duck:
+  //        _listenHandler.unDuck();
+  //        break;
+  //      case AudioInterruptionType.pause:
+  //        _listenHandler.play();
+  //        break;
+  //      case AudioInterruptionType.unknown:
+  //        break;
+  //    }
+  //  }
+  //});
+
+  //_session.becomingNoisyEventStream.listen((_) {
+  //  _listenHandler.pause();
+  //});
 }
 
 ListenHandler getListenHandlder() => _listenHandler;
 
+UrlSource getUrlSource() {
+  return UrlSource(_radioUrl, mimeType: "audio/mpeg");
+}
+
 Future<bool> startAudioSession() async {
   return await _session.setActive(true);
 }

lib/Links.dart

@@ -38,12 +38,21 @@ class Links extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return DefaultTextStyle(
-      style: Theme.of(context).textTheme.headlineSmall!,
-      child: SafeZone(
-        child: Center(
-          child: Column(
-            children: links.map((link) => link).toList(),
+    return Container(
+      decoration: const BoxDecoration(
+        image: DecorationImage(
+          image: AssetImage('assets/images/app-background3.jpg'),
+          fit: BoxFit.cover,
+          opacity: 0.4,
+        ),
+      ),
+      child: DefaultTextStyle(
+        style: Theme.of(context).textTheme.headlineSmall!,
+        child: SafeZone(
+          child: Center(
+            child: Column(
+              children: links.map((link) => link).toList(),
+            ),
           ),
         ),
       ),

lib/Listen.dart

@@ -9,8 +9,17 @@ class Listen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const Center(
-      child: PlayControls(),
+    return Container(
+      decoration: const BoxDecoration(
+        image: DecorationImage(
+          image: AssetImage('assets/images/app-background.jpg'),
+          fit: BoxFit.cover,
+          opacity: 0.4,
+        ),
+      ),
+      child: const Center(
+        child: PlayControls(),
+      ),
     );
   }
 }
@@ -27,7 +36,7 @@ class _PlayControlsState extends State<PlayControls>
   @override
   bool get wantKeepAlive => true;
 
-  bool isPlaying = false;
+  bool _isLoading = false;
 
   final ListenHandler _listenHandler = getListenHandlder();
 
@@ -37,14 +46,12 @@ class _PlayControlsState extends State<PlayControls>
 
     print("Listen init");
 
-    _listenHandler.playbackState.listen((PlaybackState event) {
-      if (isPlaying == event.playing) {
-        print("State unchanged, skipping setState()");
-        return;
-      }
+    _listenHandler.playbackState.listen((PlaybackState state) {
+      print("Playback state changed");
       setState(() {
-        isPlaying = event.playing;
-        print("Updated playing state to $isPlaying");
+        //if state changed, we're no longer loading!
+        //doesn't matter if we're playing or not!
+        _isLoading = false;
       });
     });
   }
@@ -56,48 +63,45 @@ class _PlayControlsState extends State<PlayControls>
     _listenHandler.stop();
   }
 
+  Future<void> playPause() async {
+    print("playPause called");
+    _listenHandler.isPlaying()
+        ? await _listenHandler.stop()
+        : await _listenHandler.play();
+  }
+
   @override
   Widget build(BuildContext context) {
     super.build(context);
 
     print("Running build - Listen");
 
-    if (isPlaying) {
-      _listenHandler.play();
-      _listenHandler.playbackState.add(PlaybackState(
-        controls: [
-          MediaControl.stop,
-          MediaControl.pause,
-        ],
-        systemActions: {
-          MediaAction.stop,
-          MediaAction.pause,
-        },
-        playing: true,
-      ));
-    } else {
-      _listenHandler.stop();
-      _listenHandler.playbackState.add(PlaybackState(
-        controls: [],
-        systemActions: {},
-        playing: false,
-      ));
-    }
     return ClipOval(
       child: Material(
         color: Theme.of(context).colorScheme.primaryContainer,
         child: InkWell(
           splashColor: Theme.of(context).colorScheme.onPrimaryContainer,
-          onTap: () {
+          onTap: () async {
+            if (_isLoading) {
+              //skip doing anything else if we're still loading...
+              return;
+            }
+            await playPause();
             setState(() {
-              isPlaying = !isPlaying;
+              if (!_listenHandler.isPlaying()) {
+                _isLoading = true;
+              }
             });
           },
           child: SizedBox(
             width: 100,
             height: 100,
             child: Icon(
-              isPlaying ? Icons.stop : Icons.play_arrow,
+              _isLoading
+                  ? Icons.hourglass_empty
+                  : _listenHandler.isPlaying()
+                      ? Icons.stop
+                      : Icons.play_arrow,
               color: Colors.white,
               size: 50,
             ),

lib/ListenHandler.dart

@@ -5,21 +5,68 @@ import 'package:ything_radio/Globals.dart';
 class ListenHandler extends BaseAudioHandler {
   final _player = AudioPlayer();
 
-  final UrlSource _radioSource = UrlSource(
-      "https://generic.ything.app/music/separation-185196.mp3",
-      mimeType: "audio/mpeg");
+  final UrlSource _radioSource = getUrlSource();
 
   setup_player() {
     _player.setReleaseMode(ReleaseMode.release);
+    _player.onPlayerStateChanged.listen((event) {
+      print("Received audioplayers event: $event");
+
+      switch (event) {
+        case PlayerState.playing:
+          super.playbackState.add(PlaybackState(
+                controls: [
+                  MediaControl.stop,
+                  MediaControl.pause,
+                ],
+                systemActions: {
+                  MediaAction.stop,
+                  MediaAction.pause,
+                },
+                playing: true,
+              ));
+          break;
+        case PlayerState.paused:
+        case PlayerState.stopped:
+        case PlayerState.completed:
+        case PlayerState.disposed:
+          super.playbackState.add(PlaybackState(
+                controls: [],
+                systemActions: {},
+                playing: false,
+              ));
+          break;
+      }
+    });
   }
 
   ListenHandler() {
     setup_player();
   }
 
+  bool isPlaying() => super.playbackState.value.playing;
+
+  double _duckVol = 0;
+
+  void duck() {
+    //TODO: Confirm I need to do this manually, it looks like audioplayers already does this
+    print("Duck requested");
+    //_duckVol = _player.volume;
+
+    //_player.setVolume(_duckVol - 0.4 > 0 ? _duckVol - 0.4 : 0.0);
+  }
+
+  void unDuck() {
+    //TODO: Confirm I need to do this manually, it looks like audioplayers already does this
+    print("Unduck requested");
+    //_player.setVolume(_duckVol);
+  }
+
   @override
   Future<void> play() async {
     if (await startAudioSession()) {
+      //setSource followed by resume does not work on Android or web
+      //play works everywhere though
       _player.play(_radioSource, mode: PlayerMode.mediaPlayer);
     }
   }
@@ -32,4 +79,11 @@ class ListenHandler extends BaseAudioHandler {
 
   @override
   Future<void> stop() => pause();
+
+  //make appo stop playing when swiped away in task manager on Android
+  @override
+  Future<void> onTaskRemoved() async {
+    await stop();
+    return super.onTaskRemoved();
+  }
 }

lib/YthingRadio.dart

@@ -10,6 +10,7 @@ class YthingRadio extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Ything Radio',
+      debugShowCheckedModeBanner: false,
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(
           seedColor: Colors.orange,

lib/main.dart

@@ -4,6 +4,8 @@ import 'Globals.dart';
 import 'YthingRadio.dart';
 
 Future<void> main() async {
+  await loadCurrentUrl();
+  await loadAboutUrl();
   await setupListenHandler();
   runApp(const YthingRadio());
 }

pubspec.lock

@@ -273,7 +273,7 @@ packages:
     source: hosted
     version: "7.7.0"
   http:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http
       sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
+version: 1.0.2
 
 environment:
   sdk: ^3.5.1
@@ -40,6 +40,7 @@ dependencies:
   flutter_tabler_icons: ^1.38.0
   audio_service: ^0.18.15
   audio_session: ^0.1.21
+  http: ^1.2.2
 
 dev_dependencies:
   flutter_test:
@@ -66,9 +67,12 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
+  assets:
+    #   - images/a_dot_burr.jpeg
+    #   - images/a_dot_ham.jpeg
+    - assets/images/app-background.jpg
+    - assets/images/app-background2.jpg
+    - assets/images/app-background3.jpg
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images