Fix merge conflicts

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: allanwang # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,3 +23,7 @@ Steps to reproduce the behaviour:
  - App Version:
  - Device: 
  - Android Version:
+
+**Logs/Screenshots:**
+<!-- Logs are very useful for debugging problems. This is optional if it's widely reproducible. -->
+<!-- For screenshots, please also provide browser screenshots if the preview differs from your browser -->

.github/ISSUE_TEMPLATE/feature-request.md

@@ -10,3 +10,4 @@ assignees: AllanWang
 **Describe the feature**
 <!-- Note that Frost is limited by Facebook's mobile site -->
 <!-- Features relating to the web content are not always possible -->
+<!-- Frost is also in more of a maintenance state, so unless a feature fixes a key element or is widely desired, it likely won't be a priority -->

.github/ISSUE_TEMPLATE/theme-report.md

@@ -9,6 +9,7 @@ assignees: AllanWang
 
 **Description**
 <!-- Please describe the theme error, and how to get to the page-->
+<!-- If possible, provide the CSS; see https://allanwang.github.io/Frost-for-Facebook/docs/Theming -->
 
 **Details (please provide at least the app version):**
  - App Version:

.github/workflows/android.yml

@@ -0,0 +1,213 @@
+name: Android CI
+
+on:
+  push:
+    branches:
+      - '*'
+      - '!l10n_dev'
+
+jobs:
+
+  pre_job:
+    # continue-on-error: true # Uncomment once integration is finished
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          # All of these options are optional, so you can remove them if you are happy with the defaults
+          concurrent_skipping: 'outdated_runs'
+          skip_after_successful_duplicate: 'true'
+          paths_ignore: '["**/*.md", "**/docs/**"]'
+          do_not_skip: '["workflow_dispatch", "schedule"]'
+
+  build:
+
+    needs: pre_job
+
+#    if: ${{ false }}
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 100
+
+    - name: Fetch all tags
+      run: git fetch origin +refs/tags/*:refs/tags/*
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        java-package: jdk
+        distribution: 'adopt'
+        cache: gradle
+
+    - name: Validate gradle wrapper
+      uses: gradle/wrapper-validation-action@v1
+
+    - name: Decrypt secret
+      run: |
+        gpg -d --passphrase "${{ secrets.FROST_TAR_SECRET }}" --batch "files/frost_github.tar.gpg" > "files/frost_github.tar"
+        tar xvf files/frost_github.tar -C files
+
+    - name: Checkout Gradle Build Cache
+      if: ${{ steps.self_hosted.outputs.FLAG != 'self-hosted' }}
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+          !~/.gradle/wrapper/dists/**/gradle*.zip
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+        restore-keys: |
+          gradle-${{ runner.os }}-
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Android Git Version
+      run: ./gradlew --quiet androidGitVersion
+
+    - name: Check and Test
+      run: ./gradlew spotlessCheck lintReleaseTest testReleaseUnitTest
+
+    - name: Assemble
+      run: ./gradlew assembleReleaseTest
+
+    - name: Upload Test APK
+      uses: actions/[email protected]
+      with:
+        name: Frost-releaseTest.apk
+        path: app/build/outputs/apk/releaseTest/Frost-releaseTest.apk
+        if-no-files-found: error
+
+  # Tests artifact upload
+  build-test:
+
+    needs: pre_job
+
+    if: ${{ false }}
+#    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Create
+        run: |
+          mkdir apk
+          echo "apk test" > apk/Frost-releaseTest.apk
+
+      - name: Upload Test APK
+        uses: actions/[email protected]
+        with:
+          name: Frost-releaseTest.apk
+          path: apk/Frost-releaseTest.apk
+          if-no-files-found: error
+
+  release-test:
+
+    runs-on: ubuntu-latest
+
+    needs: build
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.TEST_RELEASE_GITHUB_API_TOKEN }}
+      OWNER: AllanWang
+      REPO: Frost-for-Facebook-APK-Builder
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        repository: "${{ env.OWNER }}/${{ env.REPO }}"
+        token: ${{ env.GITHUB_TOKEN }}
+
+    # Contiguous to release IDs from Travis builds
+    - name: Current Version
+      run: |
+        CURR_ID=$(( ${{ github.run_number }} + 2914 ))
+        echo "RELEASE_ID_NUMBER=${CURR_ID}" >> $GITHUB_ENV
+
+    - name: Should Release
+      run: |
+        PREV_ID=$(cat Frost.txt | grep -o -E '[0-9]'+)
+        SHOULD_RELEASE=$( if [[ ${{ env.RELEASE_ID_NUMBER }} -gt $PREV_ID ]]; then echo true; else echo false; fi )
+        echo "Prev $PREV_ID Now ${{ env.RELEASE_ID_NUMBER }} Should Release $SHOULD_RELEASE"
+        echo "SHOULD_RELEASE=${SHOULD_RELEASE}" >> $GITHUB_ENV
+
+    - name: Update File
+      if: ${{ env.SHOULD_RELEASE == 'true' }}
+      run: echo "Frost v${{ env.RELEASE_ID_NUMBER }}" > Frost.txt
+
+    - name: Create Commit
+      if: ${{ env.SHOULD_RELEASE == 'true' }}
+      id: create_commit
+      uses: EndBug/add-and-commit@v7
+      with:
+        message: 'Github Action ${{ env.RELEASE_ID_NUMBER }} [skip ci]'
+        tag: 'v${{ env.RELEASE_ID_NUMBER }}'
+        author_name: Pitched Apps CI
+        author_email: [email protected]
+        branch: master
+        push: true
+
+    # After commit
+    - name: Download APK
+      if: ${{ env.SHOULD_RELEASE == 'true' }}
+      uses: actions/download-artifact@v2
+      with:
+        name: Frost-releaseTest.apk
+
+    - name: Rename APK
+      if: ${{ env.SHOULD_RELEASE == 'true' }}
+      run: |
+        mv Frost-releaseTest.apk Frost-releaseTest-v${{ env.RELEASE_ID_NUMBER }}.apk
+        ls -l
+
+    - name: Create Release
+      if: ${{ (env.SHOULD_RELEASE == 'true') && steps.create_commit.outputs.pushed }}
+      uses: ncipollo/release-action@v1
+      with:
+        token: ${{ env.GITHUB_TOKEN }}
+        owner: ${{ env.OWNER }}
+        repo: ${{ env.REPO }}
+        artifactErrorsFailBuild: true
+        artifacts: "Frost-releaseTest-v${{ env.RELEASE_ID_NUMBER }}.apk"
+        artifactContentType: "application/zip"
+        body: |
+          Automatic Release v${{ env.RELEASE_ID_NUMBER }} for branch `${{ github.ref }}`
+          https://github.com/${{ github.repository }}/commit/${{ github.sha }}
+        tag: 'v${{ env.RELEASE_ID_NUMBER }}'
+        allowUpdates: false
+
+    - name: Echo Result
+      if: ${{ env.SHOULD_RELEASE == 'true' }}
+      run: |
+        TEST_RELEASE_URL="https://github.com/${{ env.OWNER }}/${{ env.REPO }}/releases/tag/v${{ env.RELEASE_ID_NUMBER }}"
+        echo "Created release at $TEST_RELEASE_URL"
+        echo "TEST_RELEASE_URL=${TEST_RELEASE_URL}" >> $GITHUB_ENV
+
+    - name: Discord Ping
+      uses: Sniddl/[email protected]
+      with:
+        webhook: ${{ secrets.DISCORD_WEBHOOK }}
+        last-commit-only: true
+        # Frost Blue: 0xff3b5998 / 3889560
+        # https://github.com/octokit/webhooks
+        embed: '{"title":"Frost v{{ env.RELEASE_ID_NUMBER }}","color":3889560,"url":"{{ commit.url }}","author":{"name":"{{ github.context.payload.repository.owner.login }}","icon_url":"{{ github.context.payload.repository.owner.avatar_url }}"},"fields":[{"name":"Message","value":"{{ commit.title }}"},{"name":"Test Release","value":"{{ env.TEST_RELEASE_URL }}"},{"name":"Action CI","value":"https://github.com/{{ github.context.payload.repository.full_name }}/actions/runs/{{ env.RUN_ID }}"}]}'
+      env:
+        RUN_ID: ${{ github.RUN_ID }}
+
+
+
+
+
+