diff --git a/android/app/build.gradle b/android/app/build.gradle index 2cd2ebd..be9b8a9 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -58,8 +58,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 20 targetSdkVersion 33 - versionCode 6 - versionName "1.8.0" + versionCode 7 + versionName "1.9.0" multiDexEnabled true } signingConfigs { diff --git a/lib/pages/home pages/channellistpage.dart b/lib/pages/home pages/channellistpage.dart index d97a06e..4245a7f 100644 --- a/lib/pages/home pages/channellistpage.dart +++ b/lib/pages/home pages/channellistpage.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -//import 'package:google_mobile_ads/google_mobile_ads.dart'; +// import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:digilogtv/services/storage.dart'; import 'package:digilogtv/services/formatting.dart'; @@ -94,12 +94,12 @@ class _ChannelListPageState extends State { super.initState(); storage = widget.storage; formattingProvider = widget.formattingProvider; - //loadAd(); + // loadAd(); } @override void dispose() async { - //await _bannerAd?.dispose(); + // await _bannerAd?.dispose(); super.dispose(); } diff --git a/lib/pages/home pages/contactpage.dart b/lib/pages/home pages/contactpage.dart index a3d7d1c..fd60dec 100644 --- a/lib/pages/home pages/contactpage.dart +++ b/lib/pages/home pages/contactpage.dart @@ -30,7 +30,7 @@ class ContactPage extends StatelessWidget { const Padding( padding: EdgeInsets.fromLTRB(18.0, 36.0, 18.0, 18.0), child: Text( - 'You have downloaded the ad-free version of this app. Other ads are provided by their respective TV news channels.', + 'You have downloaded the ad-free version of Digilog TV. Other ads are provided by their respective TV news channels.', style: TextStyle(fontSize: 18.0), textAlign: TextAlign.center, ), @@ -38,7 +38,7 @@ class ContactPage extends StatelessWidget { // const Padding( // padding: EdgeInsets.fromLTRB(18.0, 36.0, 18.0, 18.0), // child: Text( - // 'You have downloaded the ad-supported version of this app from Google Play. An ad-free version is available on GitHub. Other ads are provided by their respective TV news channels.', + // 'You have downloaded the ad-supported version of Digilog TV from Google Play. An ad-free version is available on GitHub. Other ads are provided by their respective TV news channels.', // style: TextStyle(fontSize: 18.0), // textAlign: TextAlign.center, // ), diff --git a/lib/pages/home pages/favoritespage.dart b/lib/pages/home pages/favoritespage.dart index b7e5b84..9b0dc18 100644 --- a/lib/pages/home pages/favoritespage.dart +++ b/lib/pages/home pages/favoritespage.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -//import 'package:google_mobile_ads/google_mobile_ads.dart'; +// import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:digilogtv/services/storage.dart'; import 'package:digilogtv/services/formatting.dart'; @@ -69,8 +69,8 @@ class _FavoritesPageState extends State { } @override - void dispose() { - //await _bannerAd?.dispose(); + void dispose() async { + // await _bannerAd?.dispose(); super.dispose(); } @@ -80,7 +80,7 @@ class _FavoritesPageState extends State { storage = widget.storage; formattingProvider = widget.formattingProvider; storage.initializeFavorites(); - //loadAd(); + // loadAd(); } @override diff --git a/lib/services/channels.dart b/lib/services/channels.dart index e0d7c64..def8834 100644 --- a/lib/services/channels.dart +++ b/lib/services/channels.dart @@ -44,6 +44,8 @@ class Channels { Channel(channelName: "Africanews", link: "https://www.youtube.com/embed/NQjabLGdP5g?autoplay=1", source: Source.youtube, contactpage: 'https://www.africanews.com/page/contact/'), Channel(channelName: "Al Jazeera English", link: "https://live-hls-web-aje.getaj.net/AJE/index.m3u8", source: Source.iptv, contactpage: 'https://network.aljazeera.net/en/contact'), Channel(channelName: "Arirang", link: "http://amdlive.ctnd.com.edgesuite.net/arirang_1ch/smil:arirang_1ch.smil/playlist.m3u8", source: Source.iptv, contactpage: 'https://www.arirang.com/'), + Channel(channelName: "Arise News", link: "https://liveedge-arisenews.visioncdn.com/live-hls/arisenews/arisenews/arisenews_web/master.m3u8", source: Source.iptv, contactpage: "https://www.arise.tv/contact-us/"), + Channel(channelName: "BBC News", link: "http://92.114.85.81:8000/play/a00a/index.m3u8", source: Source.iptv, contactpage: "https://www.bbc.co.uk/contact/questions/getting-in-touch/contact-bbc"), Channel(channelName: "Bloomberg", link: "https://bloomberg.com/media-manifest/streams/us.m3u8", source: Source.iptv, contactpage: 'https://www.bloomberg.com/professional/support/'), Channel(channelName: "CBS News", link: "https://cbsnews.akamaized.net/hls/live/2020607/cbsnlineup_8/master.m3u8", source: Source.iptv, contactpage: 'https://www.cbs.com/showfeedback/'), Channel(channelName: "Channel News Asia", link: "https://www.youtube.com/embed/XWq5kBlakcQ?autoplay=1", source: Source.youtube, contactpage: 'https://www.channelnewsasia.com/contact-us'), @@ -51,6 +53,7 @@ class Channels { Channel(channelName: "DW English", link: "https://dwamdstream102.akamaized.net/hls/live/2015525/dwstream102/index.m3u8", source: Source.iptv, contactpage: 'https://corporate.dw.com/en/contact/s-30606'), Channel(channelName: "Euronews", link: "https://www.youtube.com/embed/pykpO5kQJ98?autoplay=1", source: Source.youtube, contactpage: 'https://www.euronews.com/contact'), Channel(channelName: "France 24 English", link: "https://www.youtube.com/embed/tkDUSYHoKxE?autoplay=1", source: Source.youtube, contactpage: 'https://www.francemediasmonde.com/en/contact'), + Channel(channelName: "GB News", link: "https://live-gbnews.simplestreamcdn.com/live5/gbnews/bitrate1.isml/manifest.m3u8", source: Source.iptv, contactpage: "https://www.gbnews.com/about-us/contact-us"), Channel(channelName: "Global News", link: "https://i.mjh.nz/PlutoTV/62cbef9ebb857100072fc187-alt.m3u8", source: Source.iptv, contactpage: 'https://globalnews.ca/pages/contact-us/'), Channel(channelName: "Newsmax TV", link: "https://nmxlive.akamaized.net/hls/live/529965/Live_1/index.m3u8", source: Source.iptv, contactpage: 'https://www.newsmax.com/contact/'), Channel(channelName: "NHK World Japan", link: "https://nhkwlive-ojp.akamaized.net/hls/live/2003459/nhkwlive-ojp-en/index_4M.m3u8", source: Source.iptv, contactpage: 'https://www3.nhk.or.jp/nhkworld/en/contact/'), diff --git a/metadata/en-US/changelogs/7.txt b/metadata/en-US/changelogs/7.txt new file mode 100644 index 0000000..170c922 --- /dev/null +++ b/metadata/en-US/changelogs/7.txt @@ -0,0 +1,2 @@ +* Added new channels from Free-TV/IPTV +* Fixed issue with Contact Me page showing an incorrect message \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 3ce7f57..c1cfdba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: digilogtv description: A free and open-source TV news app, inspired by Linux Mint's Hypnotix. publish_to: 'none' -version: 1.8.0 +version: 1.9.0 environment: sdk: '>=3.1.0 <4.0.0' diff --git a/two versions guide b/two versions guide new file mode 100644 index 0000000..c15fb5b --- /dev/null +++ b/two versions guide @@ -0,0 +1,9 @@ +List of Files to Change for the Two Versions: +* AndroidManifest.xml +* pubsec.yaml +* main.dart +* channellistpage.dart +* favoritespage.dart +* contactpage.dart + +Scrub Ad Units IDs