Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
94ece65
Merge pull request #634 from OpenArchive/feature/AOO-28-nick-name-for…
Elelan Dec 4, 2024
68c1536
AOO-37: Breadcrumb Navigation
Elelan Dec 21, 2024
a9e819d
AOO-37: More UI Improvements
Elelan Dec 23, 2024
1c92d9e
AOO-37: Upload Manager app bar refactor
Elelan Dec 23, 2024
cd356d2
AOO-37: fixed remaining ui refactor for OnboardingScreens
Elelan Dec 31, 2024
d5912fb
Added Splash
Elelan Jan 5, 2025
3eba03f
edit folder title left aligned
Elelan Jan 7, 2025
3b9797f
pref_general improvement
Elelan Jan 7, 2025
9a641d7
disabled media compression in preference
Elelan Jan 7, 2025
6486e63
set version in settings fragment
Elelan Jan 8, 2025
9c4e1e3
raven changes init
Elelan Jan 8, 2025
5125dc4
Add Media Options Hints
Elelan Jan 8, 2025
63af359
changed dividers in settings fragment to above preference category
Elelan Jan 8, 2025
c48be38
added Compose Preference sample ui
Elelan Jan 9, 2025
8f3280a
snowbird changes imported and refactored
Elelan Jan 19, 2025
a9d0549
removed temp snowbird menu
Elelan Jan 20, 2025
6b0cf60
Commented the temporary implementation
prathieshna Jan 20, 2025
9e12023
upgraded to kotlin 2.1.10-RC2 and ksp
Elelan Jan 23, 2025
929e747
raven changes init
Elelan Jan 8, 2025
cb061c8
rebased with breadcrumb-nav, snowbird changes imported and refactored
Elelan Jan 19, 2025
ae74adf
removed temp snowbird menu
Elelan Jan 20, 2025
08ab3c0
Commented the temporary implementation
prathieshna Jan 20, 2025
64cea8b
upgraded to kotlin 2.1.10-RC2 and ksp
Elelan Jan 23, 2025
1c85593
Merge remote-tracking branch 'origin/feature/raven-integration' into …
Elelan Jan 23, 2025
e5db399
libraries upgrade + removed fresco and used coil
Elelan Jan 23, 2025
8f124d4
Merge branch 'feature/AOO-37-breadcrumb-nav' into feature/raven-integ…
Elelan Jan 23, 2025
2532149
fixed merge conflicts with breadcrumb nav branch
Elelan Jan 23, 2025
ccb41bb
resolved merge conflicts with next
Elelan Jan 23, 2025
eecb605
raven integration feature toggling in SpaceSetup
Elelan Jan 27, 2025
f8185c2
kotlin upgrade 2.1.10
Elelan Jan 29, 2025
62f5162
upgraded dependencies
Elelan Jan 31, 2025
ca43133
updated gitignore
Elelan Jan 31, 2025
a9e73c9
updated gradle
Elelan Feb 2, 2025
176993c
moved BaseFragment to core module
Elelan Feb 2, 2025
5c33f51
BaseDialog and DialogConfig and builder pattern implemented completely
Elelan Feb 7, 2025
0bb6477
BaseDialog and DialogConfig and builder pattern implemented completely
Elelan Feb 7, 2025
6331bc7
Commented the implementation
prathieshna Feb 21, 2025
dee2c6e
implementation
prathieshna Feb 22, 2025
0cc4102
refactor & rewrite wip
Elelan Feb 23, 2025
1caad71
refactor-2
Elelan Feb 25, 2025
58cba76
refactor-3
Elelan Feb 26, 2025
ff0c684
detekt setup
Elelan Feb 26, 2025
a228dee
detekt fix
Elelan Feb 26, 2025
4f3beb2
commented out store data
Elelan Feb 26, 2025
34e2863
detekt check
Elelan Feb 26, 2025
dd8ff76
sarif file location updated
Elelan Feb 26, 2025
3993f3c
fixes after first design review
Elelan Mar 2, 2025
e37a5f0
removed kotlin-dotenv, downgraded gradle
Elelan Mar 2, 2025
2ecfb27
changed fonts, minor ui improvements according to figma design Save-3.0
Elelan Mar 5, 2025
90fe631
changed fonts, minor ui improvements according to figma design Save-3.0
Elelan Mar 5, 2025
bf667e5
text font weight changes
Elelan Mar 5, 2025
002f4a1
enabled dweb flag
Elelan Mar 6, 2025
8302cda
Merge pull request #646 from OpenArchive/feature/proofmode
prathieshna Mar 6, 2025
305de61
Merge branch 'feature/common-dialogs' into feature/mixpannel
prathieshna Mar 6, 2025
2284890
Merge pull request #647 from OpenArchive/feature/mixpannel
prathieshna Mar 6, 2025
b8d97ba
Resolved Merge Conflicts
prathieshna Mar 6, 2025
981fe4b
Merge pull request #648 from OpenArchive/new-release-branch
prathieshna Mar 6, 2025
bedc218
fixed CustomSwitchPreference id issue
Elelan Mar 6, 2025
1de387f
added rust libsave.so
Elelan Mar 6, 2025
e218f18
kotlin, gradle upgrade
Elelan Mar 6, 2025
8a2ed5b
added compose dialogs for dweb feature
Elelan Mar 7, 2025
4d1da10
updated onboarding png images
Elelan Mar 7, 2025
c0dfb76
fixed camera permission issue
Elelan Mar 7, 2025
367efb8
Merge remote-tracking branch 'origin/feature/common-dialogs' into new…
Elelan Mar 7, 2025
beff5d4
Merge pull request #650 from OpenArchive/new-release-branch
Elelan Mar 7, 2025
858a3f7
Updated the pref key
prathieshna Mar 10, 2025
ea6a11c
onboarding and other ui fixes
Elelan Mar 11, 2025
9a09921
upgraded gradle wrapper to latest (8.13)
Elelan Mar 11, 2025
f73b958
build.gradle.kts versions cleanup and moved to libs.versions.toml file
Elelan Mar 11, 2025
76d1e62
Merge branch 'next' into feature/common-dialogs
Elelan Mar 11, 2025
6384a60
updated collectAsStateWithLifecycle
Elelan Mar 11, 2025
6a5774d
PermissionManager
Elelan Mar 11, 2025
2b07bb7
fixed dark mode issue in FolderAdapter in FolderList
Elelan Mar 11, 2025
e0271c1
retry upload fix
Elelan Mar 12, 2025
dbfcdb9
fixed padding for btn in InternetArchiveLoginScreen
Elelan Mar 12, 2025
34d0138
removed padding for btns in InternetArchiveLoginScreen
Elelan Mar 12, 2025
a1e45e7
fixed padding for Account Text in InternetArchiveLoginScreen
Elelan Mar 12, 2025
7decff5
preview activity btn color change
Elelan Mar 13, 2025
e030d80
dark mode improvement
Elelan Mar 13, 2025
548b4ec
leakcanary leaks fix temp
Elelan Mar 13, 2025
da11ecd
commented out zxing barcode scanner code used for dweb temporarily
Elelan Mar 13, 2025
ce706c4
removed swipe to delete from upload media screen
Elelan Mar 14, 2025
07a878d
Merge remote-tracking branch 'origin/feature/common-dialogs' into fea…
Elelan Mar 14, 2025
204d011
removed camera permission from PreviewActivity
Elelan Mar 18, 2025
2f769f1
dark mode color fix for buttons and texts
Elelan Mar 18, 2025
a7a451b
extracted strings to resource file
Elelan Mar 18, 2025
9d036e1
updated env secret keys
Elelan Mar 18, 2025
142c6b9
fix missing local.properties
Elelan Mar 18, 2025
808c66a
removed circleci
Elelan Mar 18, 2025
1a6d08b
Merge remote-tracking branch 'origin/feature/common-dialogs' into fea…
Elelan Mar 18, 2025
a0b07f2
updated detekt github action
Elelan Mar 18, 2025
bf61050
Merge remote-tracking branch 'origin/feature/common-dialogs' into fea…
Elelan Mar 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 0 additions & 34 deletions .circleci/config.yml

This file was deleted.

150 changes: 55 additions & 95 deletions .github/workflows/detekt.yml
Original file line number Diff line number Diff line change
@@ -1,116 +1,76 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# This workflow performs a static analysis of your Kotlin source code using
# Detekt.
#
# Scans are triggered:
# 1. On every push to default and protected branches
# 2. On every Pull Request targeting the default branch
# 3. On a weekly schedule
# 4. Manually, on demand, via the "workflow_dispatch" event
#
# The workflow should work with no modifications, but you might like to use a
# later version of the Detekt CLI by modifying the $DETEKT_RELEASE_TAG
# environment variable.
name: Scan with Detekt
name: Detekt Analysis

on:
# Triggers the workflow on push or pull request events but only for default and protected branches
# Triggers on push to key branches
push:
branches: [ "master" ]
branches: #[ "master", "stable", "next", "feature/major-refactor-ui-changes" ]
- '**' # Triggers on pull requests to any branch
pull_request:
branches: [ "master" ]
schedule:
branches:
- '**' # Triggers on pull requests to any branch
schedule: # Scheduled weekly scan
- cron: '35 5 * * 0'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

env:
# Release tag associated with version of Detekt to be installed
# SARIF support (required for this workflow) was introduced in Detekt v1.15.0
DETEKT_RELEASE_TAG: v1.22.0
DETEKT_RELEASE: 1.22.0

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "scan"
scan:
name: Scan
# The type of runner that the job will run on
detekt:
name: Static Code Analysis with Detekt
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
# ✅ Step 1: Checkout Repository
- name: Check out code
uses: actions/checkout@v4

# Gets the download URL associated with the $DETEKT_RELEASE_TAG
- name: Get Detekt download URL
id: detekt_info
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh api graphql --field tagName=$DETEKT_RELEASE_TAG --raw-field query='
query getReleaseAssetDownloadUrl($tagName: String!) {
repository(name: "detekt", owner: "detekt") {
release(tagName: $tagName) {
releaseAssets(name: "detekt", first: 1) {
nodes {
downloadUrl
}
}
tagCommit {
oid
}
}
}
}
' 1> gh_response.json
# ✅ Step 2: Set up Java 17
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

DETEKT_RELEASE_SHA=$(jq --raw-output '.data.repository.release.releaseAssets' gh_response.json)
if [ $DETEKT_RELEASE_SHA != "4b1da0d5feb53d9ae9b80193ad49c5597d7c4b42" ]; then
echo "Release tag doesn't match expected commit SHA"
exit 1
fi
cat gh_response.json
DETEKT_DOWNLOAD_URL=https://github.com/detekt/detekt/releases/download/$DETEKT_RELEASE_TAG/detekt-cli-$DETEKT_RELEASE-all.jar
echo $DETEKT_DOWNLOAD_URL
echo "download_url=$DETEKT_DOWNLOAD_URL" >> $GITHUB_OUTPUT
# ✅ Step 3: Install Ruby and Bundler (Required for Fastlane)
- name: Install Ruby and Bundler
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3'
bundler-cache: true

# Sets up and runs the detekt cli
- name: Setup and Run Detekt
continue-on-error: true
id: detekt_setup_and_run
- name: Create local.properties file
run: |
curl --request GET \
--url ${{ steps.detekt_info.outputs.download_url }} \
--silent \
--location \
--output detekt.jar
chmod a+x detekt.jar
# Performs static analysis using Detekt
java -jar "detekt.jar" --input ${{ github.workspace }} --all-rules --report sarif:${{ github.workspace }}/detekt.sarif.json
echo "MIXPANEL_KEY=${{ secrets.MIXPANEL_KEY }}" >> local.properties
echo "STOREFILE=${{ secrets.STOREFILE }}" >> local.properties
echo "STOREPASSWORD=${{ secrets.STOREPASSWORD }}" >> local.properties
echo "KEYALIAS=${{ secrets.KEYALIAS }}" >> local.properties
echo "KEYPASSWORD=${{ secrets.KEYPASSWORD }}" >> local.properties


# Modifies the SARIF output produced by Detekt so that absolute URIs are relative
# This is so we can easily map results onto their source files
# This can be removed once relative URI support lands in Detekt: https://git.io/JLBbA
- name: Make artifact location URIs relative
continue-on-error: true
# ✅ Step 4: Install Fastlane Dependencies
- name: Install Fastlane dependencies
run: |
echo "$(
jq \
--arg github_workspace ${{ github.workspace }} \
'. | ( .runs[].results[].locations[].physicalLocation.artifactLocation.uri |= if test($github_workspace) then .[($github_workspace | length | . + 1):] else . end )' \
${{ github.workspace }}/detekt.sarif.json
)" > ${{ github.workspace }}/detekt.sarif.json
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3

# ✅ Step 5: Run Detekt via Fastlane
- name: Run Detekt
run: |
bundle exec fastlane detekt

# ✅ Step 6: Upload SARIF report for GitHub Security Code Scanning
- name: Upload SARIF report for GitHub Code Scanning
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: "app/build/reports/detekt/detekt.sarif"
category: detekt-analysis

# Uploads results to GitHub repository using the upload-sarif action
- uses: github/codeql-action/upload-sarif@v2
# ✅ Step 7: Upload Detekt Reports as Artifacts for Download
- name: Upload Detekt Reports as Artifacts
uses: actions/upload-artifact@v4
with:
# Path to SARIF file relative to the root of the repository
sarif_file: ${{ github.workspace }}/detekt.sarif.json
checkout_path: ${{ github.workspace }}
name: detekt-reports
path: |
*/build/reports/detekt/*.html
*/build/reports/detekt/*.md
*/build/reports/detekt/*.xml
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,10 @@ fastlane/test_output
fastlane/README.md
fastlane/.env
.env.default
/app/release/baselineProfiles/0/save-unspecified-release.dm
/app/release/baselineProfiles/1/save-unspecified-release.dm
/app/release/output-metadata.json
/app/src/main/assets/.env
/.kotlin/sessions/kotlin-compiler-1215430679833621634.salive
/.kotlin/
/app/release/
Loading
Loading