release(app): v3.0.0+30000 (#667)

* feat: remove dev wall for learn * release(app): v3.0.0+30000 * feat: change color for warning * feat: update code radio text * feat: scrollbar for instructions panel * feat: update no progress notice text * feat: replace "articles" with "tutorials" * chore: remove preview button in pass panel * fix: add fcc logo in drawer Co-authored-by: SemBauke <[email protected]>
freeCodeCamp · Nov 2, 2022 · 80c0c20 · 80c0c20
1 parent b1776f7
commit 80c0c20
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 65 deletions.
diff --git a/mobile-app/lib/enums/alert_type.dart b/mobile-app/lib/enums/alert_type.dart
@@ -22,8 +22,8 @@ AlertColor returnColor(Alert alert) {
   switch (alert) {
     case Alert.warning:
       return AlertColor(
-        backgroundColor: const Color.fromRGBO(0xff, 0xf3, 0xcd, 1),
-        textColor: Colors.yellow.shade900,
+        backgroundColor: const Color.fromRGBO(0xd9, 0xed, 0xf7, 1),
+        textColor: Colors.blue.shade900,
       );
     case Alert.danger:
       return AlertColor(

diff --git a/mobile-app/lib/ui/views/code_radio/code_radio_view.dart b/mobile-app/lib/ui/views/code_radio/code_radio_view.dart
@@ -98,11 +98,11 @@ class CodeRadioView extends StatelessWidget {
               fit: BoxFit.cover,
             )),
         Text(
-          '${radio.totalListeners} \n Listening',
+          '${radio.totalListeners} people are listening right now',
           textAlign: TextAlign.center,
           style: const TextStyle(
               color: Color.fromRGBO(1, 1, 1, 0.5),
-              fontSize: 48,
+              fontSize: 36,
               fontWeight: FontWeight.w800),
         )
       ],

diff --git a/mobile-app/lib/ui/views/home/home_view.dart b/mobile-app/lib/ui/views/home/home_view.dart
@@ -12,9 +12,9 @@ class HomeView extends StatelessWidget {
   const HomeView({Key? key}) : super(key: key);
 
   static const titles = <Widget>[
-    Text('BOOKMARKED ARTICLES'),
-    Text('NEWSFEED'),
-    Text('SEARCH ARTICLES')
+    Text('BOOKMARKED TUTORIALS'),
+    Text('TUTORIAL FEED'),
+    Text('SEARCH TUTORIALS')
   ];
 
   static const views = <Widget>[
@@ -49,7 +49,7 @@ class HomeView extends StatelessWidget {
                 icon: Icon(
                   Icons.article_sharp,
                 ),
-                label: 'Articles'),
+                label: 'Tutorials'),
             BottomNavigationBarItem(
                 icon: Icon(
                   Icons.search_sharp,

diff --git a/mobile-app/lib/ui/views/learn/learn/learn_view.dart b/mobile-app/lib/ui/views/learn/learn/learn_view.dart
@@ -38,8 +38,8 @@ class LearnView extends StatelessWidget {
                               children: [
                                 const CustomAlert(
                                     text:
-                                        'WARNING: Currently it is not possible to save your progress, this means challenges you complete will not count towards progress on the freeCodeCamp website.',
-                                    alertType: Alert.danger),
+                                        "Note: We're still working on the ability to save your progress. To claim certifications, you'll need to submit your projects through freeCodeCamp's website.",
+                                    alertType: Alert.warning),
                                 quouteWidget(),
                                 // if (!model.isLoggedIn)
                                 //   loginButton(model, context)

diff --git a/mobile-app/lib/ui/views/learn/widgets/description/description_widget_view.dart b/mobile-app/lib/ui/views/learn/widgets/description/description_widget_view.dart
@@ -81,13 +81,17 @@ class DescriptionView extends StatelessWidget {
                     ],
                   ),
                   Expanded(
-                    child: SingleChildScrollView(
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: HtmlHandler.htmlHandler(
-                                description, context, null, 'Inter') +
-                            HtmlHandler.htmlHandler(
-                                instructions, context, null, 'Inter'),
+                    child: Scrollbar(
+                      thumbVisibility: true,
+                      trackVisibility: true,
+                      child: SingleChildScrollView(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: HtmlHandler.htmlHandler(
+                                  description, context, null, 'Inter') +
+                              HtmlHandler.htmlHandler(
+                                  instructions, context, null, 'Inter'),
+                        ),
                       ),
                     ),
                   )

diff --git a/mobile-app/lib/ui/views/learn/widgets/pass/pass_widget_view.dart b/mobile-app/lib/ui/views/learn/widgets/pass/pass_widget_view.dart
@@ -137,31 +137,23 @@ class PassWidgetView extends StatelessWidget {
             //       ),
             const CustomAlert(
               text:
-                  'WARNING: Currently it is not possible to save your progress, this means challenges you complete will not count towards progress on the freeCodeCamp website.',
-              alertType: Alert.danger,
+                  "Note: We're still working on the ability to save your progress. To claim certifications, you'll need to submit your projects through freeCodeCamp's website.",
+              alertType: Alert.warning,
             ),
-            Expanded(
-                child: Align(
-              alignment: Alignment.bottomCenter,
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [
-                  // IconButton(
-                  //   onPressed: () {},
-                  //   icon: const Icon(Icons.share_sharp),
-                  //   padding: const EdgeInsets.all(16),
-                  // ),
-                  IconButton(
-                    onPressed: () {
-                      challengeModel.setShowPreview = true;
-                      challengeModel.setShowPanel = false;
-                    },
-                    icon: const Icon(Icons.remove_red_eye_outlined),
-                    padding: const EdgeInsets.all(16),
-                  )
-                ],
-              ),
-            ))
+            // Expanded(
+            //     child: Align(
+            //   alignment: Alignment.bottomCenter,
+            //   child: Row(
+            //     mainAxisAlignment: MainAxisAlignment.end,
+            //     children: [
+            //       // IconButton(
+            //       //   onPressed: () {},
+            //       //   icon: const Icon(Icons.share_sharp),
+            //       //   padding: const EdgeInsets.all(16),
+            //       // ),
+            //     ],
+            //   ),
+            // ))
           ],
         ),
       ),

diff --git a/mobile-app/lib/ui/views/news/news-bookmark/news_bookmark_feed_view.dart b/mobile-app/lib/ui/views/news/news-bookmark/news_bookmark_feed_view.dart
@@ -25,7 +25,7 @@ class NewsBookmarkFeedView extends StatelessWidget {
                   ? populateListViewModel(model)
                   : const Center(
                       child: Text(
-                      'Bookmark articles to view them here',
+                      'Bookmark tutorials to view them here',
                       textAlign: TextAlign.center,
                     )),
             )));

diff --git a/mobile-app/lib/ui/views/news/news-bookmark/news_bookmark_view.dart b/mobile-app/lib/ui/views/news/news-bookmark/news_bookmark_view.dart
@@ -22,7 +22,7 @@ class NewsBookmarkPostView extends StatelessWidget {
               child: CustomScrollView(
                 slivers: [
                   const SliverAppBar(
-                    title: Text('BOOKMARKED ARTICLE'),
+                    title: Text('BOOKMARKED TUTORIAL'),
                   ),
                   SliverAppBar(
                     pinned: true,

diff --git a/mobile-app/lib/ui/views/news/news-feed/news_feed_view.dart b/mobile-app/lib/ui/views/news/news-feed/news_feed_view.dart
@@ -33,7 +33,7 @@ class NewsFeedView extends StatelessWidget {
           appBar: fromTag || fromAuthor
               ? AppBar(
                   title: Text(
-                      'Articles ${fromAuthor ? 'from' : 'about'} $subject'),
+                      'Tutorials ${fromAuthor ? 'from' : 'about'} $subject'),
                 )
               : null,
           backgroundColor: const Color(0xFF0a0a23),
@@ -65,14 +65,14 @@ class NewsFeedView extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
         const Text(
-          'There was an error loading articles ',
+          'There was an error loading tutorials',
           textAlign: TextAlign.center,
         ),
         Padding(
           padding: const EdgeInsets.all(8.0),
           child: InkWell(
             child: const Text(
-              'read articles online',
+              'read tutorials online',
               textAlign: TextAlign.center,
               style: TextStyle(color: Color.fromRGBO(0x99, 0xc9, 0xff, 1)),
             ),

diff --git a/mobile-app/lib/ui/views/news/news-search/news_search_view.dart b/mobile-app/lib/ui/views/news/news-search/news_search_view.dart
@@ -16,7 +16,7 @@ class NewsSearchView extends StatelessWidget {
                 title: TextField(
               controller: model.searchbarController,
               decoration: const InputDecoration(
-                  hintText: 'SEARCH ARTICLE...',
+                  hintText: 'SEARCH TUTORIALS...',
                   fillColor: Color.fromRGBO(0x2A, 0x2A, 0x40, 1),
                   filled: true),
               onChanged: (value) {

diff --git a/mobile-app/lib/ui/widgets/article_list_widget.dart b/mobile-app/lib/ui/widgets/article_list_widget.dart
@@ -88,7 +88,7 @@ class ArticleListState extends State<ArticleList> {
                 ),
                 snapshot.data!.length > 5
                     ? ListTile(
-                        title: const Text('Show more articles'),
+                        title: const Text('Show more tutorials'),
                         tileColor: const Color(0xFF0a0a23),
                         trailing: const Icon(Icons.arrow_forward_ios_outlined),
                         onTap: () {

diff --git a/mobile-app/lib/ui/widgets/drawer_widget/drawer_button.dart b/mobile-app/lib/ui/widgets/drawer_widget/drawer_button.dart
@@ -10,7 +10,7 @@ class DrawerButton extends StatefulWidget {
   }) : super(key: key);
 
   final String component;
-  final IconData icon;
+  final dynamic icon;
   final Function route;
   final Color? textColor;
   @override
@@ -24,7 +24,17 @@ class _DrawerButtonState extends State<DrawerButton> {
       padding: const EdgeInsets.all(10.0),
       child: ListTile(
         dense: true,
-        leading: Icon(widget.icon, color: widget.textColor),
+        leading: widget.icon != ''
+            ? Icon(
+                widget.icon,
+                color: widget.textColor,
+              )
+            : Image.asset(
+                'assets/images/logo.png',
+                width: 30,
+                height: 30,
+                color: Colors.white,
+              ),
         title: Text(
           widget.component,
           style: TextStyle(

diff --git a/mobile-app/lib/ui/widgets/drawer_widget/drawer_widget_view.dart b/mobile-app/lib/ui/widgets/drawer_widget/drawer_widget_view.dart
@@ -58,29 +58,28 @@ class DrawerWidgetView extends StatelessWidget {
                     ),
                     buildDivider(),
                     DrawerButton(
-                      component: 'NEWS',
+                      component: 'TUTORIALS',
                       icon: Icons.forum_outlined,
                       route: () {
                         model.routeComponent('NEWS', context);
                       },
                     ),
                     DrawerButton(
-                        component: 'LEARN',
-                        icon: Icons.local_fire_department_sharp,
-                        route: () {
-                          model.devmode
-                              ? model.routeComponent('LEARN', context)
-                              : model.snackbar();
-                        }),
+                      component: 'LEARN',
+                      icon: '',
+                      route: () {
+                        model.routeComponent('LEARN', context);
+                      },
+                    ),
                     DrawerButton(
-                      component: 'PODCAST',
+                      component: 'PODCASTS',
                       icon: Icons.podcasts_outlined,
                       route: () {
                         model.routeComponent('PODCAST', context);
                       },
                     ),
                     DrawerButton(
-                      component: 'RADIO',
+                      component: 'CODE RADIO',
                       icon: Icons.radio,
                       route: () {
                         model.routeComponent('CODERADIO', context);

diff --git a/mobile-app/pubspec.lock b/mobile-app/pubspec.lock
@@ -1102,7 +1102,7 @@ packages:
       name: share_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.5.3"
+    version: "5.0.0"
   share_plus_linux:
     dependency: transitive
     description:
@@ -1137,7 +1137,7 @@ packages:
       name: share_plus_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "4.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1541,7 +1541,7 @@ packages:
       name: wakelock_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1"
+    version: "0.2.0"
   watcher:
     dependency: transitive
     description:
@@ -1604,7 +1604,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "2.7.0"
   xdg_directories:
     dependency: transitive
     description:

diff --git a/mobile-app/pubspec.yaml b/mobile-app/pubspec.yaml
@@ -1,7 +1,7 @@
 name: freecodecamp
 description: freecodecamp.org app.
 publish_to: none
-version: 2.2.1+20201
+version: 3.0.0+30000
 environment:
   sdk: ">=2.12.0 <3.0.0"
 dependencies: