Merge remote-tracking branch 'origin/master'

flaam-org · Jul 28, 2022 · fa76333 · fa76333
2 parents 4312476 + 3a6c4be
commit fa76333
Show file tree

Hide file tree

Showing 2 changed files with 112 additions and 54 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -67,61 +67,60 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
+
+      - name: Build debug apk
+        run:  chmod +x gradlew && ./gradlew assembleDebug --stacktrace
 
-      # - name: Delete previous continuous release
-      #   if: "contains(github.event.head_commit.message, '#genapk')"
-      #   run: |
-      #     if git show-ref --tags | egrep -q "refs/tags/continuous"
-      #     then
-      #         release_query=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -s \
-      #         https://api.github.com/repos/${{ github.repository }}/releases \
-      #         | jq '. | map(select(.tag_name == "continuous"))[0]')
-      #         curl -i -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X DELETE \
-      #         https://api.github.com/repos/${{ github.repository }}/releases/assets/$(echo $release_query | jq .assets[0].id)
-      #         curl -i -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X DELETE \
-      #         https://api.github.com/repos/${{ github.repository }}/releases/$(echo $release_query | jq .id)
-      #         git tag -d continuous
-      #         curl -i -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X DELETE \
-      #         https://api.github.com/repos/${{ github.repository }}/git/refs/tags/continuous
-      #         sleep 1 #required else next action will fail
-      #     else 
-      #         echo "tag not found"
-      #     fi
-      # - name: Create Release
-      #   if: "contains(github.event.head_commit.message, '#genapk')"
-      #   id: create_release
-      #   uses: actions/create-release@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     tag_name: continuous
-      #     release_name: continuous-build-r${{ steps.commit_info.outputs.commit_count }}
-      #     draft: false
-      #     prerelease: true
+      - name: Delete previous continuous release
+        run: |
+          if git show-ref --tags | egrep -q "refs/tags/continuous"
+          then
+              release_query=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -s \
+              https://api.github.com/repos/${{ github.repository }}/releases \
+              | jq '. | map(select(.tag_name == "continuous"))[0]')
+              curl -i -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X DELETE \
+              https://api.github.com/repos/${{ github.repository }}/releases/assets/$(echo $release_query | jq .assets[0].id)
+              curl -i -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X DELETE \
+              https://api.github.com/repos/${{ github.repository }}/releases/$(echo $release_query | jq .id)
+              git tag -d continuous
+              curl -i -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X DELETE \
+              https://api.github.com/repos/${{ github.repository }}/git/refs/tags/continuous
+              sleep 1 #required else next action will fail
+          else 
+              echo "tag not found"
+          fi
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: continuous
+          release_name: continuous-build-r${{ steps.commit_info.outputs.commit_count }}
+          draft: false
+          prerelease: true
 
-      # - name: Upload Release Asset
-      #   if: "contains(github.event.head_commit.message, '#genapk')"
-      #   id: upload-release-asset
-      #   uses: actions/upload-release-asset@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #     asset_path: ./app/build/outputs/apk/debug/app-debug.apk
-      #     asset_name: app-debug.apk
-      #     asset_content_type: application/zip
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./app/build/outputs/apk/debug/app-debug.apk
+          asset_name: app-debug.apk
+          asset_content_type: application/zip
 
-      # - name: Send a message about the release
-      #   if: "contains(github.event.head_commit.message, '#genapk')"
-      #   run: |
-      #     curl \
-      #     -d chat_id=${{ secrets.TELEGRAM_CHAT_ID }} \
-      #     -d disable_notification=true \
-      #     -d parse_mode=HTML \
-      #     -d text=\
-      #     "📱 <b>Debug Apk released</b>%0A\
-      #     url: https://github.com/${{ github.repository }}/releases/tag/continuous" \
-      #     "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage"
+      - name: Send a message about the release
+        run: |
+          curl \
+          -d chat_id=${{ secrets.TELEGRAM_CHAT_ID }} \
+          -d disable_notification=true \
+          -d parse_mode=HTML \
+          -d text=\
+          "📱 <b>Debug Apk released</b>%0A\
+          url: https://github.com/${{ github.repository }}/releases/tag/continuous" \
+          "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage"
 
       - name: Send apk to chat
         if: contains(github.event.head_commit.message, 'tgapk') || github.event_name == 'workflow_dispatch'

diff --git a/README.md b/README.md
@@ -1,2 +1,61 @@
-# flaam-android
-Android App of Flaam (Collaboration platform for Developers and Ideators).
+
+<p align = "center"><img src="https://imgur.com/Pgx05dn.png"></p>
+
+<h1 align="center"> Flaam</h1>
+
+<h3 align="center">
+An open source collaboration platform for Developers and Ideators.
+</h3>
+<p align="center"><a href="https://github.com/flaam-org/flaam-android/releases/download/continuous/app-debug.apk"><img src="https://imgur.com/fsKjoYf.png" alt="Download Apk" style="width:300px;"></a>
+</p>
+</br>
+
+# About The App
+
+This app bridges the gap between the people who have ideas and the people who have skills to bring the idea to life.</br>
+</br>
+### this is how it works -
+
+* users who have an idea can post it.
+* it becomes visible to all the other users.
+* users can also provide milestones, that they want to achieve within the idea.
+* users who have added similiar tags to their interests get notified.
+* users can give suggestions through discussion section
+* users can also work on the idea, and can provide update as the development progresses.
+* users can also save the ideas to review later on.
+* users can filter feed on the basis of parameters like votes, relevance, time, etc.
+
+
+
+
+
+# Screenshots
+## Browse and post ideas
+<p float="left">
+<img src="https://imgur.com/7pSG9zV.png" alt="drawing" width="260"/>
+<img src="https://imgur.com/Shsiv0e.png" alt="drawing" width="260"/>
+</p>
+
+
+## Filter Feed
+<img src="https://imgur.com/tPLDjrH.png" alt="drawing" width="260"/>
+<img src="https://imgur.com/4AP6k4E.gif" alt="drawing" width="260">
+
+## Add your own implementations/solutions for an existing idea or simply contribute through discussion.
+
+<p float="left">
+<img src="https://imgur.com/wOnO7gj.png" alt="drawing" width="260"/>
+<img src="https://imgur.com/st1xDMw.jpeg" alt="drawing" width="260"/>
+</p>
+
+## post ideas
+<p float="left">
+<img src="https://imgur.com/0m0cg9l.png" alt="drawing" width="260"/>
+</p>
+
+## add implementations and attach source link.
+<p float="left">
+<img src="https://imgur.com/Jd0Mifp.png" alt="drawing" width="260"/>
+
+## backend source
+https://github.com/flaam-org/flaam-api