diff --git a/.github/actions/publish-release-apk/action.yml b/.github/actions/publish-release-apk/action.yml index adb66bd..c0fccd5 100644 --- a/.github/actions/publish-release-apk/action.yml +++ b/.github/actions/publish-release-apk/action.yml @@ -14,6 +14,10 @@ inputs: BUILD_FLAVOR: required: true description: "Choose build flavor [github/googlePlay]" + TAG_SUFFIX: + required: false + description: "Suffix to append to tag name" + default: "" runs: using: "docker" image: "Dockerfile" \ No newline at end of file diff --git a/.github/actions/publish-release-apk/entrypoint.sh b/.github/actions/publish-release-apk/entrypoint.sh index ccec9fd..9e38ec9 100644 --- a/.github/actions/publish-release-apk/entrypoint.sh +++ b/.github/actions/publish-release-apk/entrypoint.sh @@ -4,4 +4,4 @@ ls -a git config --global --add safe.directory /github/workspace hub checkout ${${REPO_BRANCH}:-master} VERSION_NAME=`grep -oP 'versionName = "\K(.*?)(?=")' ./${APP_FOLDER}/build.gradle.kts` -hub release create -a ./${APP_FOLDER}/build/outputs/apk/${BUILD_FLAVOR}/${BUILD_TYPE}/*-${BUILD_TYPE}.apk -m "${RELEASE_TITLE} - v${VERSION_NAME}" $(date +%Y%m%d%H%M%S) +hub release create -a ./${APP_FOLDER}/build/outputs/apk/${BUILD_FLAVOR}/${BUILD_TYPE}/*-${BUILD_TYPE}.apk -m "${RELEASE_TITLE} - v${VERSION_NAME}" v${VERSION_NAME}${TAG_SUFFIX} diff --git a/.github/workflows/publish_debug.yml b/.github/workflows/publish_debug.yml index 4210910..e1ca117 100644 --- a/.github/workflows/publish_debug.yml +++ b/.github/workflows/publish_debug.yml @@ -31,4 +31,5 @@ jobs: RELEASE_TITLE: Debug Build REPO_BRANCH: master BUILD_TYPE: debug - BUILD_FLAVOR: github \ No newline at end of file + BUILD_FLAVOR: github + TAG_SUFFIX: "-debug" \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 22d6901..5a76fb8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -24,7 +24,7 @@ android { minSdk = 29 targetSdk = 34 versionCode = (System.currentTimeMillis() / 1000).toInt() - versionName = "0.21.1-beta" + versionName = "0.21.2-beta" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -38,6 +38,8 @@ android { val DEBUG = "debug" val RELEASE = "release" + val NO_SIGNING_CONFIG = "no_signing_store" + signingConfigs { maybeCreate(DEBUG).apply { storeFile = file("../signing/debug-keystore.jks") @@ -65,7 +67,10 @@ android { isMinifyEnabled = true isShrinkResources = true isDebuggable = false - signingConfig = signingConfigs[RELEASE] + + val hasSignConfig = gradleLocalProperties(rootDir).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: NO_SIGNING_CONFIG) != NO_SIGNING_CONFIG + + signingConfig = if (hasSignConfig) signingConfigs[RELEASE] else null proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } } @@ -74,11 +79,19 @@ android { productFlavors { create("googlePlay") { dimension = "distribution" + isDefault = false buildConfigField("String", "DISTRIBUTION", "\"Google play\"") } + create("fdroid") { + dimension = "distribution" + isDefault = false + + buildConfigField("String", "DISTRIBUTION", "\"F-Droid\"") + } create("github") { dimension = "distribution" + isDefault = true buildConfigField("String", "DISTRIBUTION", "\"Github\"") } diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt new file mode 100644 index 0000000..4c24a70 --- /dev/null +++ b/metadata/en-US/full_description.txt @@ -0,0 +1,3 @@ +Bluetooth Radar in the background scans and analyzes Bluetooth Low Energy devices around you (eg smartwatches, headphones, speakers) and allows you to set complex rules to search for devices by specified filters. For example, by device name, address, location and time of discovery, manufacturer, and if an unknown device has been chasing you for a long time. Can be used to find missing devices, or notify you if the device of the person you are looking for is nearby. + +Bluetooth Radar does not collect or send your personal or geolocation data. The project is fully opensource and available on GitHub. \ No newline at end of file diff --git a/metadata/en-US/images/icon.png b/metadata/en-US/images/icon.png new file mode 100644 index 0000000..e4c8575 Binary files /dev/null and b/metadata/en-US/images/icon.png differ diff --git a/metadata/en-US/images/phoneScreenshots/screenshot.jpg b/metadata/en-US/images/phoneScreenshots/screenshot.jpg new file mode 100644 index 0000000..cc77989 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/screenshot.jpg differ diff --git a/metadata/en-US/images/phoneScreenshots/screenshot1.jpg b/metadata/en-US/images/phoneScreenshots/screenshot1.jpg new file mode 100644 index 0000000..1073c13 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/screenshot1.jpg differ diff --git a/metadata/en-US/images/phoneScreenshots/screenshot2.jpg b/metadata/en-US/images/phoneScreenshots/screenshot2.jpg new file mode 100644 index 0000000..51f07ae Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/screenshot2.jpg differ diff --git a/metadata/en-US/images/phoneScreenshots/screenshot3.jpg b/metadata/en-US/images/phoneScreenshots/screenshot3.jpg new file mode 100644 index 0000000..94b5069 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/screenshot3.jpg differ diff --git a/metadata/en-US/short_description.txt b/metadata/en-US/short_description.txt new file mode 100644 index 0000000..ae41973 --- /dev/null +++ b/metadata/en-US/short_description.txt @@ -0,0 +1 @@ +A tool to monitor, analyze and find BLE devices around you. \ No newline at end of file diff --git a/metadata/en-US/title.txt b/metadata/en-US/title.txt new file mode 100644 index 0000000..5e92cab --- /dev/null +++ b/metadata/en-US/title.txt @@ -0,0 +1 @@ +BLE Radar \ No newline at end of file