Merge branch 'acterglobal:main' into issue800_calendar-events

acterglobal · Oct 10, 2023 · 3fdfcc7 · 3fdfcc7
2 parents 01ff4a8 + 4380955
commit 3fdfcc7
Show file tree

Hide file tree

Showing 11 changed files with 224 additions and 105 deletions.
diff --git a/.changes/1035-overflow-fixes.md b/.changes/1035-overflow-fixes.md
@@ -0,0 +1,3 @@
+- Sidesheets .i.e. Spaces,Events,Chats and Pins: fix overflow of sidesheet title over system bars for mobile versions.
+- Space Overview: fix overflow of space shell actions over system bars for mobile versions.
+- Click/Tap on spaces member list in spaces overview will navigate to space member page.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,8 +15,8 @@ on:
         description: 'The tag to compare the changelog to'
         type: string
 
-  # schedule:
-  #  - cron: 0 3 * * *
+  schedule:
+   - cron: 0 3 * * 4
 
 jobs:
   run_checker:
@@ -32,7 +32,7 @@ jobs:
         id: check-new-commits
         shell: bash
         run: |
-          if [ `git diff --name-only ${{ inputs.prev_tag || 'latest-release' }} -- app native .changes | wc -l` -ne 0 ]; then
+          if [ `git diff --name-only ${{ inputs.prev_tag || 'release-latest' }} -- app native .changes | wc -l` -ne 0 ]; then
             echo "has-new-commits=true"  >> $GITHUB_OUTPUT ;
           else
             echo "has-new-commits=false" >> $GITHUB_OUTPUT ;
@@ -44,7 +44,7 @@ jobs:
     outputs:
       tag: ${{ inputs.new_tag || steps.version.outputs.version }}
       build_num: ${{ steps.build_num.outputs.build_num }}
-      prev_tag: ${{ inputs.prev_tag || 'latest-release' }}
+      prev_tag: ${{ inputs.prev_tag || 'release-latest' }}
     steps:
       - id: version
         run: echo "version=`date +1.%y.%-m%d`" >> $GITHUB_OUTPUT
@@ -138,6 +138,15 @@ jobs:
         with:
           toolchain: stable
 
+      - uses: jlumbroso/free-disk-space@main
+        name: Free Disk Space (Ubuntu)
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          # this might remove tools that are actually needed,
+          # when set to "true" but frees about 6 GB
+          tool-cache: true
+          android: false
+
       - name: Cache Cargo
         id: cache-cargo
         uses: actions/cache@v2
@@ -386,27 +395,38 @@ jobs:
         with:
           name: Changelog
 
-      # - name: "Generate docs"
-      #   run: |
-      #     echo "+++" > docs/content/releases/${{ needs.tags.outputs.tag }}.md
-      #     echo "title = \" Nightly ${{ needs.tags.outputs.tag }}\"" >> docs/content/releases/${{ needs.tags.outputs.tag }}.md
-      #     echo "template = \"nightlies/release.html\"" >> docs/content/releases/${{ needs.tags.outputs.tag }}.md
-      #     echo "date = ${{ needs.tags.outputs.tag }}" >> docs/content/releases/${{ needs.tags.outputs.tag }}.md
-      #     echo "+++" >>docs/content/releases/${{ needs.tags.outputs.tag }}.md
-      #     echo "" >>docs/content/releases/${{ needs.tags.outputs.tag }}.md
-      #     cat CHANGELOG.md >> docs/content/releases/${{ needs.tags.outputs.tag }}.md
-
-      # - name: Tag for release
-      #   run: |
-      #     git config --global user.name 'Sari'
-      #     git config --global user.email 'acter-sari@users.noreply.github.com'
-      #     git add "docs/content/releases/${{ needs.tags.outputs.tag }}.md"
-      #     echo "Add release ${{ needs.tags.outputs.tag }}"
-      #     git commit -m 
-      #     git tag v${{ needs.tags.outputs.tag }}
-      #     git tag -f release-latest
-      #     git push -f origin main v${{ needs.tags.outputs.tag }} release-latest
+      - name: "Generate docs"
+        run: |
+          echo "+++" > docs/content/releases/${{ needs.tags.outputs.tag }}.md
+          echo "title = \" Nightly ${{ needs.tags.outputs.tag }}\"" >> docs/content/releases/${{ needs.tags.outputs.tag }}.md
+          echo "template = \"nightlies/release.html\"" >> docs/content/releases/${{ needs.tags.outputs.tag }}.md
+          echo "date = ${{ needs.tags.outputs.tag }}" >> docs/content/releases/${{ needs.tags.outputs.tag }}.md
+          echo "+++" >>docs/content/releases/${{ needs.tags.outputs.tag }}.md
+          echo "" >>docs/content/releases/${{ needs.tags.outputs.tag }}.md
+          cat CHANGELOG.md >> docs/content/releases/${{ needs.tags.outputs.tag }}.md
+
+      - name: Tag for release
+        run: |
+          git config --global user.name 'Sari'
+          git config --global user.email 'acter-sari@users.noreply.github.com'
+          git add "docs/content/releases/${{ needs.tags.outputs.tag }}.md"
+          echo "Add release ${{ needs.tags.outputs.tag }}"
+          git commit -m "Releasing v${{ needs.tags.outputs.tag }}"
+          git tag v${{ needs.tags.outputs.tag }}
+          git tag -f release-latest
+          git push -f origin main v${{ needs.tags.outputs.tag }} release-latest
 
+      - name: Release
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        with:
+          # publish this nightly release now
+          draft: true
+          generate_release_notes: false
+          name: Acter ${{ needs.tags.outputs.tag }}
+          tag_name: v${{ needs.tags.outputs.tag }}
+          body_path: CHANGELOG.md
+          prerelease: true
       # publish this full release now
       - uses: eregon/publish-release@v1
         env:

diff --git a/Readme.md b/Readme.md
@@ -4,14 +4,21 @@
 
 Your social organizing app build on [matrix](https://matrix.org): think WhatsApp, but with proper task lists, structured discussion, etc.
 
+## Try now
+
+<a href='https://play.google.com/store/apps/details?id=global.acter.a3&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' width="250" src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png'/></a> <a href="https://apps.apple.com/us/app/acter/id6445989155?itsct=apps_box_badge&amp;itscg=30200" style="display: inline-block; overflow: hidden; border-radius: 13px; width: 250px; height: 83px;"><img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-us?size=250x83&amp;releaseDate=1694390400" alt="Download on the App Store" style="border-radius: 13px; width: 250px; height: 83px;"></a>
+<a href="ms-windows-store://pdp/?ProductId=9NZLTDVTN203">
+<img height="83" src="https://get.microsoft.com/images/en-us%20dark.svg" alt="Download Acter" />
+</a>
+
+## More info
+
 [![Homepage ](https://img.shields.io/badge/HOMEPAGE-gray?style=for-the-badge)](https://acter.global)
 [![Docs ](https://img.shields.io/badge/DOCS-blue?style=for-the-badge)](https://docs.acter.global)
 [![Matrix ](https://img.shields.io/badge/News-yellow?style=for-the-badge)](https://matrix.to/#/#news:acter.global)
 
-
 [![Nightly Build](https://img.shields.io/badge/Nightly_Build-available-gree?style=for-the-badge)](https://github.com/acterglobal/a3/tags)
 
-
 ## Contact:
 
 [![Matrix: #News](https://img.shields.io/badge/News-deeppink?style=for-the-badge)](https://matrix.to/#/#news:acter.global)
@@ -26,7 +33,6 @@ Your social organizing app build on [matrix](https://matrix.org): think WhatsApp
 ![App Build](https://img.shields.io/github/actions/workflow/status/acterglobal/a3/deploy.yml?branch=main&label=App&style=for-the-badge)
 ![Docs](https://img.shields.io/github/actions/workflow/status/acterglobal/a3/docs.yml?branch=main&label=Docs&style=for-the-badge)
 
-
 ## License
 
 [![Acter Public Source License](https://img.shields.io/badge/License-Acter%20Public%20Source%20License-blue?style=for-the-badge)](./LICENSE.txt)

diff --git a/app/lib/common/widgets/side_sheet.dart b/app/lib/common/widgets/side_sheet.dart
@@ -53,9 +53,12 @@ class SideSheet extends StatelessWidget {
           minHeight: size.height,
           maxHeight: size.height,
         ),
+        // keep scrolling under effect if content overflows.
         margin: EdgeInsets.only(
           bottom: MediaQuery.of(context).viewInsets.bottom,
         ),
+        // keep space shell top bar to prevent us being covered by front-camera etc.
+        padding: const EdgeInsets.only(top: 12),
         child: CustomScrollView(
           shrinkWrap: true,
           slivers: [

diff --git a/app/lib/features/space/pages/shell_page.dart b/app/lib/features/space/pages/shell_page.dart
@@ -110,7 +110,7 @@ class _ShellToolbar extends ConsumerWidget {
     );
 
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 12),
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
       child: Row(
         children: [
           InkWell(
@@ -123,14 +123,17 @@ class _ShellToolbar extends ConsumerWidget {
             ),
           ),
           const Spacer(),
-          PopupMenuButton(
-            icon: Icon(
-              Icons.more_vert,
-              color: Theme.of(context).colorScheme.neutral5,
+          Padding(
+            padding: const EdgeInsets.only(top: 18),
+            child: PopupMenuButton(
+              icon: Icon(
+                Icons.more_vert,
+                color: Theme.of(context).colorScheme.neutral5,
+              ),
+              iconSize: 28,
+              color: Theme.of(context).colorScheme.surface,
+              itemBuilder: (BuildContext context) => submenu,
             ),
-            iconSize: 28,
-            color: Theme.of(context).colorScheme.surface,
-            itemBuilder: (BuildContext context) => submenu,
           ),
         ],
       ),
@@ -246,22 +249,28 @@ class _ShellHeader extends ConsumerWidget {
         }
         return Padding(
           padding: const EdgeInsets.only(left: 10),
-          child: Wrap(
-            direction: Axis.horizontal,
-            spacing: -12,
-            children: [
-              ...members.map(
-                (a) => MemberAvatar(member: a),
-              ),
-              if (membersCount > 5)
-                CircleAvatar(
-                  child: Text(
-                    '+${membersCount - 5}',
-                    textAlign: TextAlign.center,
-                    textScaleFactor: 0.8,
-                  ),
+          child: GestureDetector(
+            onTap: () => context.goNamed(
+              Routes.spaceMembers.name,
+              pathParameters: {'spaceId': spaceId},
+            ),
+            child: Wrap(
+              direction: Axis.horizontal,
+              spacing: -12,
+              children: [
+                ...members.map(
+                  (a) => MemberAvatar(member: a),
                 ),
-            ],
+                if (membersCount > 5)
+                  CircleAvatar(
+                    child: Text(
+                      '+${membersCount - 5}',
+                      textAlign: TextAlign.center,
+                      textScaleFactor: 0.8,
+                    ),
+                  ),
+              ],
+            ),
           ),
         );
       },

diff --git a/docs/content/docs/dev/style-guide.md b/docs/content/docs/dev/style-guide.md
@@ -20,67 +20,28 @@ top = false
 
 #### Colors
 
-- Primary Brand Color: <span style="color: #EC2758; font-weight: bold"> #EC2758 </span>
-- Secondary Brand Color: <span style="color: #23AFC2; font-weight: bold"> #23AFC2 </span>
-- Tertiary Brand Color: <span style="color: #5C2A80; font-weight: bold"> #5C2A80 </span>
-- Background Color: <span style="color: #979797; font-weight: bold"> #979797 </span>
-- Dark Shade: <span style="color: #333540; font-weight: bold"> #333540 </span>
-- Secondary Dark Shade: <span style="color: #2F313E; font-weight: bold"> #2F313E </span>
-- Divider: <span style="color: #4A4A4A; font-weight: bold"> #4A4A4A </span>
-- Text Color: <span style="color: #FFFFFF; font-weight: bold"> #FFFFFF </span>
-- Text Shade: <span style="color: #FEFEFE; font-weight: bold"> #FEFEFE </span>
-- Text Shade 2: <span style="color: #F8F8F8; font-weight: bold"> #F8F8F8 </span>
-- Text Shade 3: <span style="color: #C2C1C0; font-weight: bold"> #C2C1C0 </span>
+Colors can be found in [`app/lib/common/themes/app_theme.dart`](https://github.com/acterglobal/a3/blob/main/app/lib/common/themes/app_theme.dart). Whenever possible the `AppTheme.brandColorScheme` should be used in the code base rather than any specific color. New color sets like gradients or changes to existing colors shall be added to that class (for easier customization later).
+
+- Primary Brand Color: <span style="color: #9CCAFF; font-weight: bold"> #9CCAFF </span>
+- Secondary Brand Color: <span style="color: #9ACBFF; font-weight: bold"> #9ACBFF </span>
+- Tertiary Brand Color: <span style="color: #FFB77B; font-weight: bold"> #FFB77B </span>
+- Background Color: <span style="color: #001B3D; font-weight: bold"> #001B3D </span>
+- Neutral: <span style="color: #121212; font-weight: bold"> #121212 </span>
+- Success: <span style="color: #67A24A; font-weight: bold"> #67A24A </span>
 
 #### Typeface
 
-- App-Wide Font: Roboto
-- Headlines: Roboto Semi-Bold
-- Regular Text: Robot Light
-- Font-Sizes:
-  - H1: 18/20
-  - H2: 16/Auto
-  - H3 subject: 15/20
-  - Body Text: 10/15
-  - H4 substitles: 10/15
-  - H5 Big Word: 20/25
-  - H6 legal: 10/auto
+- App-Wide Font: Inter
+- Emoji: System provided fond; on Linux: notoEmoji
 
 #### Icons
 
-We use clean, clear but slightly playful even childish Icons, to get away from a too steril style and keep things fun and social. Whenever possible we pick of [the vast library of existing icons](https://oblador.github.io/react-native-vector-icons/) that's already embedded in the app (via `flutter_icons_null_safety`, usage as in [flutter icons](https://pub.dev/packages/flutter_icons)).
+We use clean, clear but slightly playful even childish Icons, to get away from a too steril style and keep things fun and social. Whenever possible we use the closest matching [Atlas Icon](https://atlasicons.vectopus.com/) that's already embedded in the app (via `package:atlas_icons/atlas_icons.dart`).
 
 ```dart
 // Import package
-import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
+import 'package:atlas_icons/atlas_icons.dart';
 import 'package:flutter/material.dart';
 
-// After 1.1.0, the FlutterIcons class is provided to access all Icons
-// Icon name in the original basis added icon set abbreviation name as suffix
-// Hereinafter referred to as the following
-//Ant Design Icons -> ant,
-//Entypo Icons -> ent,
-//Evil Icons -> evi,
-//Feather Icons -> fea,
-//Font Awesome Icons -> faw,
-//Foundation Icons -> fou,
-//Ionicons Icons -> ion,
-//Material Community Icons -> mco,
-//Material Icons -> mdi,
-//Octicons Icons -> oct,
-//Simple Line Icons -> sli,
-//Zocial Icons -> zoc,
-//Weather Icons -> wea
-Icon(FlutterIcons.stepforward_ant)
-Icon(FlutterIcons.html5_faw)
+Icon(Atlas.audio_album, size: 24.0, )
 ```
-
-### [Brandguide as PDF](/styles/Acter-MVP-Design-Style.pdf)
-
-## Implementation Guide
-
-TBD
-
-## Themeing / Customisastion
-
-TBD
diff --git a/docs/content/nightly/2023-10-04.md b/docs/content/nightly/2023-10-04.md
@@ -0,0 +1,15 @@
++++
+title = " Nightly 2023-10-04"
+template = "nightlies/release.html"
+date = 2023-10-04
++++
+
+- [fix] Remove double naming on crud side sheets (Spaces, Events, Pins).
+- [fix] Text overflow fixes on pins card.
+- [fix] Text overflow fixes on event card.
+- [fix] Text overflow fixes on found spaces card when searched (Join space section).
+- [fix] Replace `Redact` term with more known wording .i.e. `Delete/Remove`.
+- Login/Registration UI and theme updates.
+
+- Fix: do not render space-chat under space but switch to chat-section
+
diff --git a/docs/content/nightly/2023-10-06.md b/docs/content/nightly/2023-10-06.md
@@ -0,0 +1,52 @@
++++
+title = " Nightly 2023-10-06"
+template = "nightlies/release.html"
+date = 2023-10-06
++++
+
+- [fix] Remove double naming on crud side sheets (Spaces, Events, Pins).
+- [fix] Text overflow fixes on pins card.
+- [fix] Text overflow fixes on event card.
+- [fix] Text overflow fixes on found spaces card when searched (Join space section).
+- [fix] Replace `Redact` term with more known wording .i.e. `Delete/Remove`.
+- Login/Registration UI and theme updates.
+
+- move spaces invite functionality to `About` section of overview as a button. The current limit of invitations is 100 people and button will not be visible exceeding that.
+
+- Fix: Parent space in Chat is shown.
+- Fix: Invite flow for chat reactivated
+- Fix: Joining related chats from a space
+- Fix: Setting the power level of members in a space
+- UX: Show content of Registration Token
+- Removed: Acter welcome screen when the user has no spaces
+- Fix: When redacting content, move back to the type index for that space
+
+- Updated look on room profile section. On desktop and larger screens, supports split view opening.
+- corrected acter background gradient pattern.
+- updated theme on component cards and overall system design to be intuitive.
+- fix for avatars not getting fallback properly.
+- fix overflow of content in pins, events and spaces cards.
+
+- fix: chat input sends message as a part of reply even if its not meant to be reply (after closing reply UI). This is fixed now.
+
+- CRUD Sidesheets (Spaces, Pins, Events, Chat)
+  - [fix] Sidesheets will now properly scroll on smaller screens, enabling to view submit buttons. The buttons will remain stick to bottom.
+  - Sidesheet input validation fixes.
+
+- Fix: do not render space-chat under space but switch to chat-section
+
+- Dashboard/Overview:
+  - Spaces listing is now prioritized to be shown on top.
+  - Fewer joined spaces will now show 'create space' and 'join space' buttons below for easier accessibility. If more than 5 joined spaces, this'll be replaced with 'show all spaces' button.
+  - Calendar widget is now removed and will be added when its properly functional.
+  - Update theme of UI cards.
+- Pins:
+  - Remove non functional button (pins filtering).
+  - Update theme of section.
+- Calendar Events:
+  - Calendar events can now be accessed from quick jump actions, showing all events, user is part of.
+  - Update theme of section.
+- Some layout improvements in card component views.
+
+- You can now directly invite anyone in the invite screen all you need is type their full user-id
+