diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index e824e3fa..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,85 +0,0 @@ -version: 2 - -jobs: - build: - working_directory: ~/code - docker: - - image: cimg/android:2022.12.1 - steps: - - checkout - - restore_cache: - key: jars-{{ checksum "build.gradle" }}-{{ checksum "presentation/build.gradle" }}-{{ checksum "data/build.gradle" }}-{{ checksum "domain/build.gradle" }} - - run: - name: Download dependencies - command: ./gradlew androidDependencies - - save_cache: - paths: - - ~/.gradle - key: jars-{{ checksum "build.gradle" }}-{{ checksum "presentation/build.gradle" }}-{{ checksum "data/build.gradle" }}-{{ checksum "domain/build.gradle" }} - - run: - name: Decrypt and unzip secrets - command: | - openssl aes-256-cbc -d -in secrets.tar.enc -md sha1 -k ${SECRETS_KEY} -iv ${SECRETS_IV} >> secrets.tar - tar xvf secrets.tar - - run: - name: Gradle build - command: ./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease - - run: - name: Flatten outputs - command: find presentation/build/outputs -mindepth 2 -type f -exec mv -i '{}' presentation/build/outputs/ ';' - - store_artifacts: - path: presentation/build/outputs - - persist_to_workspace: - root: presentation/build/outputs - paths: . - - test: - working_directory: ~/code - docker: - - image: cimg/android:2022.12.1 - steps: - - checkout - - restore_cache: - key: jars-{{ checksum "build.gradle" }}-{{ checksum "presentation/build.gradle" }}-{{ checksum "data/build.gradle" }}-{{ checksum "domain/build.gradle" }} - - run: - name: Download dependencies - command: ./gradlew androidDependencies - - save_cache: - paths: - - ~/.gradle - key: jars-{{ checksum "build.gradle" }}-{{ checksum "presentation/build.gradle" }}-{{ checksum "data/build.gradle" }}-{{ checksum "domain/build.gradle" }} - - store_test_results: - path: presentation/build/test-results - - deploy: - docker: - - image: cibuilds/github:0.10 - steps: - - attach_workspace: - at: presentation/build/outputs - - run: - name: "Publish Release on GitHub" - command: ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} presentation/build/outputs/ - -workflows: - version: 2 - main: - jobs: - - build: - filters: - tags: - only: /^v.*/ - - test: - requires: - - build - filters: - tags: - only: /^v.*/ - - deploy: - requires: - - test - filters: - branches: - ignore: /.*/ - tags: - only: /^v.*/ diff --git a/.github/workflows/PR-deploy.yml b/.github/workflows/PR-deploy.yml index b3c4a4a4..47b62d23 100644 --- a/.github/workflows/PR-deploy.yml +++ b/.github/workflows/PR-deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Build APK run: | - ./gradlew assembleNoAnalyticsRelease \ + ./gradlew assembleRelease \ -Pandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore \ -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ @@ -38,13 +38,13 @@ jobs: --stacktrace - name: Rename APK - run: mv presentation/build/outputs/apk/noAnalytics/release/QUIK-v*-noAnalytics-release.apk presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk + run: mv presentation/build/outputs/apk/release/QUIK-v*-release.apk presentation/build/outputs/apk/release/QUIK-release.apk - name: Upload APK uses: actions/upload-artifact@v4 with: name: apk - path: presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk + path: presentation/build/outputs/apk/release/QUIK-release.apk release: name: validate fdroid APK diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml deleted file mode 100644 index e519f16f..00000000 --- a/.github/workflows/android.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Android CI - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build diff --git a/.github/workflows/auto-update-mms-configs.yml b/.github/workflows/auto-update-mms-configs.yml index 3083c5a2..cfea4035 100644 --- a/.github/workflows/auto-update-mms-configs.yml +++ b/.github/workflows/auto-update-mms-configs.yml @@ -8,8 +8,6 @@ on: jobs: vvm: runs-on: ubuntu-latest - env: - DEFAULT_BRANCH: auto-update-mms-configs steps: - name: Checkout repository @@ -35,6 +33,9 @@ jobs: - name: Download Messaging APK run: apkeep -a com.google.android.apps.messaging -o device=walleye /home/runner/work/quik/quik + - name: List files in directory + run: ls /home/runner/work/quik/quik + - name: Unzip the Messaging APK from XAPK run: | unzip /home/runner/work/quik/quik/com.google.android.apps.messaging.xapk -d /home/runner/work/quik/quik @@ -78,4 +79,5 @@ jobs: - Updated by [Auto-Update MMS configs] [Auto-Update MMS configs](./.github%2Fworkflows%2Fauto-update-mms-configs.yml) add-paths: android-smsmms/src/main/res/xml-mcc* branch: ${{ env.NEW_BRANCH }} - base: ${{ env.DEFAULT_BRANCH }} + base: master + labels: automated diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 77093508..92d0e565 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -29,9 +29,41 @@ jobs: - name: List files in the APK directory run: ls -Rla ./ + - name: Bump MINOR version in build.gradle (features update) + working-directory: presentation + run: | + # Extract current versionName and versionCode + VERSION_LINE=$(grep "versionName" build.gradle) + VERSION_NAME=$(echo "$VERSION_LINE" | sed -n "s/.*versionName[ ]*['\"]\([^'\"]*\)['\"].*/\1/p") + VERSION_CODE=$(grep "versionCode" build.gradle | awk '{print $2}') + + # Error handling for version parsing + if [[ ! "$VERSION_NAME" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Error: versionName is not in MAJOR.MINOR.PATCH format: $VERSION_NAME" + exit 1 + fi + if ! [[ "$VERSION_CODE" =~ ^[0-9]+$ ]]; then + echo "Error: versionCode is not an integer: $VERSION_CODE" + exit 1 + fi + + # Split versionName into major, minor, patch + IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION_NAME" + # Bump minor version, reset patch to 0 + MINOR=$((MINOR + 1)) + PATCH=0 + NEW_VERSION_NAME="$MAJOR.$MINOR.$PATCH" + NEW_VERSION_CODE=$((VERSION_CODE + 1)) + + # Update build.gradle in-place + sed -i "s/versionName.*/versionName '$NEW_VERSION_NAME'/" build.gradle + sed -i "s/versionCode.*/versionCode $NEW_VERSION_CODE/" build.gradle + + echo "Bumped version to $NEW_VERSION_NAME ($NEW_VERSION_CODE)" + - name: Build APK run: | - ./gradlew assembleNoAnalyticsRelease \ + ./gradlew assembleRelease \ -Pandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore \ -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ @@ -39,13 +71,13 @@ jobs: --stacktrace - name: Rename APK - run: mv presentation/build/outputs/apk/noAnalytics/release/QUIK-v*-noAnalytics-release.apk presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk + run: mv presentation/build/outputs/apk/release/QUIK-v*-release.apk presentation/build/outputs/apk/release/QUIK-release.apk - name: Upload APK uses: actions/upload-artifact@v4 with: name: apk - path: presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk + path: presentation/build/outputs/apk/release/QUIK-release.apk release: name: Release APK @@ -78,7 +110,7 @@ jobs: with: prerelease: true tag_name: "v${{ env.DATETIME }}" - files: QUIK-noAnalytics-release.apk + files: QUIK-release.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-on-pull.yml b/.github/workflows/build-on-pull.yml index ad252a1b..994b4fa8 100644 --- a/.github/workflows/build-on-pull.yml +++ b/.github/workflows/build-on-pull.yml @@ -25,20 +25,20 @@ jobs: - name: Build with Gradle run: | - ./gradlew assembleNoAnalyticsDebug \ + ./gradlew assembleDebug \ -Dandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore - name: Run Tests run: ./gradlew test - name: List APK Output Directory - run: ls -R presentation/build/outputs/apk/noAnalytics/debug + run: ls -R presentation/build/outputs/apk/debug - name: Rename APK - run: mv presentation/build/outputs/apk/noAnalytics/debug/QUIK-v*-noAnalytics-debug.apk presentation/build/outputs/apk/noAnalytics/debug/QUIK-noAnalytics-debug.apk + run: mv presentation/build/outputs/apk/debug/QUIK-v*-debug.apk presentation/build/outputs/apk/debug/QUIK-debug.apk - name: Upload App uses: actions/upload-artifact@v4 with: name: apk-debug - path: presentation/build/outputs/apk/noAnalytics/debug/QUIK-noAnalytics-debug.apk + path: presentation/build/outputs/apk/debug/QUIK-debug.apk diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml new file mode 100644 index 00000000..a9ca87c9 --- /dev/null +++ b/.github/workflows/bump-and-build.yml @@ -0,0 +1,148 @@ +name: Bump Version & Prepare F-Droid Release + +on: + workflow_dispatch: + +jobs: + bump: + runs-on: ubuntu-latest + env: + META_YML: fdroid/metadata/dev.octoshrimpy.quik.yml + GRADLE_FILE: presentation/build.gradle + CHANGELOG: data/src/main/assets/changelog.json + + steps: + - name: Checkout full history + uses: actions/checkout@v4 + with: + fetch-depth: 0 + persist-credentials: true + + - name: Decode Android keystore + run: | + echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12 + + - name: Install repo icon + run: | + mkdir -p repo/icons/metadata/en-US/images + cp metadata/en-US/images/icon.png \ + repo/icons/metadata/en-US/images/icon.png + + - name: Write F-Droid config.yml + run: | + cat > config.yml <> "$GITHUB_ENV" + echo "NEW_NAME=$new_name" >> "$GITHUB_ENV" + # prepend to changelog.json + prev_tag="v${new_name}" + if git rev-parse --verify --quiet "$prev_tag" >/dev/null; then + base="$prev_tag" + else + base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "") + fi + [[ -n "$base" ]] && range="$base..HEAD" || range="HEAD" + mapfile -t commits < <( + git log --no-merges --reverse --pretty=format:"%s by %an" $range \ + | sed -E 's/[[:space:]]*\.*[[:space:]]+by/ by/' \ + | sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' \ + | awk '!seen[$0]++' + ) + changes_json=$(printf '%s\n' "${commits[@]:-}" | jq -R . | jq -s .) + jq --argjson changes "$changes_json" \ + --arg vc "$new_code" \ + --arg vn "$new_name" \ + ' + def capfirst: sub("^(.)"; "\(ascii_upcase(.1))"); + $all := ($changes | map(capfirst)); + $fixes := $all | map(select(test("^(Fix|fix)"))); + $others := $all | map(select(test("^(Fix|fix)") | not)); + . = [{ + versionCode: ($vc|tonumber), + versionName: $vn, + fixes: $fixes, + changes: $others + }] + . + ' "$CHANGELOG" > tmp && mv tmp "$CHANGELOG" + # write F-Droid .txt summary + mkdir -p fdroid/metadata + { + echo "Changes in $new_name ($new_code):" + echo + for c in "${commits[@]}"; do echo "- $c"; done + } > fdroid/metadata/"${new_code}".txt + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git add "$GRADLE_FILE" "$CHANGELOG" "fdroid/metadata/${new_code}.txt" + git commit -m "chore: bump to $new_name ($new_code)" + + - name: Push bump branch + run: | + branch="bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }}" + # Create or switch to the branch locally + if git rev-parse --verify "$branch" >/dev/null 2>&1; then + git checkout "$branch" + else + git checkout -b "$branch" + fi + # Force-push safely: only if the remote hasn't moved since last fetched + git push --force-with-lease origin HEAD:"$branch" + + - name: Open PR (no auto-merge) + uses: peter-evans/create-pull-request@v5 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: "chore: bump to ${{ env.NEW_NAME }} (${{ env.NEW_CODE }})" + title: "chore: bump to ${{ env.NEW_NAME }} (${{ env.NEW_CODE }})" + body: | + This PR bumps: + - versionCode → ${{ env.NEW_CODE }} + - versionName → ${{ env.NEW_NAME }} + branch: bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }} + base: master + labels: automated diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..a00237b1 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,55 @@ +name: Deploy APK from master + +on: + workflow_dispatch: + +jobs: + build-and-publish: + runs-on: ubuntu-latest + env: + GRADLE_FILE: presentation/build.gradle + + steps: + - name: Checkout master + uses: actions/checkout@v4 + with: + ref: master + fetch-depth: 0 + + - name: Set up Java 17 + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: '17' + + - name: Decode Android keystore + run: | + echo "${{ secrets.KEYSTORE_FILE }}" \ + | base64 --decode > keystore.p12 + + - name: Build release APK + run: | + chmod +x ./gradlew + ./gradlew clean :presentation:assembleRelease \ + -Pandroid.injected.signing.store.file=keystore.p12 \ + -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ + -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ + -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} + + # ───────────────────────────────────────────────────────────────── + # 1) Extract versionName into an environment variable + - name: Extract versionName + id: extract + run: | + version=$(grep versionName $GRADLE_FILE \ + | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') + echo "VERSION=$version" >> $GITHUB_ENV + + # 2) Publish using that VERSION + - name: Publish GitHub Release + uses: softprops/action-gh-release@v1 + with: + tag_name: v${{ env.VERSION }} + files: presentation/build/outputs/apk/release/*-release.apk + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d94af70b..00000000 --- a/.travis.yml +++ /dev/null @@ -1,98 +0,0 @@ -language: android -jdk: oraclejdk8 -sudo: false - -notifications: - email: - on_success: change - on_failure: change - -env: - global: - - COMPILE_API_LEVEL=29 - - EMULATOR_API_LEVEL=24 # It seems emulator levels 25,26,27 from main repos have google_apis by default, and do not support armeabi-v7a. Check commit comment. - - EMULATOR_TAG=default # Possible values are default, google_apis, android-tv, android-wear, android-wear-cn - - EMULATOR_ABI=armeabi-v7a # Default is armeabi-v7a, possible options are: x86, x86_64, mips, arm64-v8a, armeabi-v7a. Note: check commit comment - - EMULATOR_NAME=quik4 - - ANDROID_BUILD_TOOLS_VERSION=29.0.2 # Match build-tools version used in build.gradle - - EMULATOR="system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_TAG};${EMULATOR_ABI}" # Used to install/create emulator - -android: - components: - - tools - - platform-tools - - tools - - extra - - # The build tools used in the project - - build-tools-${ANDROID_BUILD_TOOLS_VERSION} - - # The SDK used in the project - - android-${COMPILE_API_LEVEL} - - # For running the emulator in Travis - - android-${EMULATOR_API_LEVEL} - - sys-img-${EMULATOR_ABI}-android-${EMULATOR_API_LEVEL} - -# Set up Android-sdk and the emulator -before_install: - # Decrypt keystore and google-services.json - - openssl aes-256-cbc -K $encrypted_4d1d940e2c65_key -iv $encrypted_4d1d940e2c65_iv -in secrets.tar.enc -out secrets.tar -d - - tar xvf secrets.tar - - - echo 'count=0' > /home/travis/.android/repositories.cfg # Avoid warning - - ls -lar $HOME/**/* - - # List and delete unnecessary components to free space - - sdkmanager --list || true # Print out package list for debug purposes - - sdkmanager --uninstall "extras;google;google_play_services" - - yes | sdkmanager "tools" # Update tools - - yes | sdkmanager "platforms;android-${EMULATOR_API_LEVEL}" # Android platform required by emulator - - yes | sdkmanager "platforms;android-${COMPILE_API_LEVEL}" # Android platform required by compiler - - yes | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" # Android build tools - - yes | sdkmanager "${EMULATOR}" # Install emulator system image - - sdkmanager --list || true # Print out package list for debug purposes - -# Run the emulator -install: - # emulator instance - - echo no | android create avd --force -n ${EMULATOR_NAME} -k "${EMULATOR}" - # Run emulator in a subshell, this seems to solve the travis QT issue - - ( cd "$(dirname "$(which emulator)")" && ./emulator -avd ${EMULATOR_NAME} -verbose -show-kernel -selinux permissive -no-audio -no-window -no-boot-anim -wipe-data & ) - - android-wait-for-emulator - - adb shell settings put global window_animation_scale 0 & - - adb shell settings put global transition_animation_scale 0 & - - adb shell settings put global animator_duration_scale 0 & - - sleep 30 - - adb shell input keyevent 82 & - - adb devices - -# Gradle setup -before_script: - - cd ${TRAVIS_BUILD_DIR} - - ./gradlew --version - - ./gradlew clean - -# Build APK -script: - - | - ./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease assembleAndroidTest -PtestCoverageEnabled='true' - retval=$? - if [$retval -ne 0]; then - echo "error on assembling, exit code: "$retval - exit $retval - fi - -# Deploy APK -deploy: - provider: releases - skip_cleanup: true - overwrite: true - api_key: - secure: XF7V/I02gpyOzCAFXEFyrThXVUUnKjSaWQ8lppO50mVtdugimjWIPtHrcYASaJQf9INhqo0lamk+khPxtKxc1BSCp8o+c22UKcpczyjD4kK27a3zKfuNQWteBRjCH34vIGnrRFSHSWYLIgeuoIK3q5Lq4IBK/Od3mfpRaDt1ER+IqMzR3L205x1H8dW3MVuxXgdnq3jHlRpq86oOe293+dnblVCtWUvAzwhZPnnbBc4JUaNomMI7dLJ/pAigByCoHHmG9pc2Cky1yyWVAnTZFAlf2PbzPDLRRnXmHuYKfHxiZgd/l8JTiZdhky9cXgFoSxvJyDABRqqLxVNfXt2ZwgdtiulZml8RB1FB0L37qL72mxWgi6y9IbQgt/FG20K2QpSBglk0bCGLS+h5Yz3kV4fhsBY7llpWGw14BvlAx9sUfl3Ej+IUsWoJgA00TFNGDG8sMyOFoCQVz/sB4Dv4h+JfynJZcmm8okcfYrWBHOoHY7cH3chBWp/2A736f2A/aqnBd6z8a03toe2ILC9eSOiIhrVxPyqLmEKBD1rCduVFNteqGwm9G9YwKpvFibTqu0gqEtfF7cmuMH6M5PYExI5EzoewZTYmgp02+lBuFAEMvycVvXcu8VfeeT6cgeLlmz2hsbo93UfoSQyP+gSojMOOkVUsl6mIp1STLiJ5IRY= - file: - - /home/travis/build/octoshrimpy/quik/presentation/build/outputs/bundle/withAnalyticsRelease/presentation.aab - - /home/travis/build/octoshrimpy/quik/presentation/build/outputs/apk/withAnalytics/release/presentation-withAnalytics-release.apk - on: - repo: octoshrimpy/quik - tags: true \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8ce56229..0859dde3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,12 +16,13 @@ When reporting a bug, please make sure to provide the following information: To do this, navigate to the release tab in this repository and click on releases. There are two types of releases in Quik. The first is the `Latest Release`. This is the version that is distributed over the app stores. The other type is `Pre-Release`, which contains the latest features and may have bugs. To install this, download the apk from the release tab and install it on your phone. (Instructions can be found in the wiki for a more detailed explanation). Once you have done this, simply use the app as normal, and report any bugs you come across. ## Translate -To translate this app navigate to `presentation/src/main/res` and find or make a values file with the language you wish to edit. Then copy over the `strings.xml` file from `presentation/src/main/res/values` and translate it. Please do not translate any string with the `translatable=false` attribute. Also, remember to make sure to insert a backslash `\` before any apostrophe `'` or quotes `"`. - +We recommend checking out the [Weblate documentation](https://docs.weblate.org/en/latest/index.html), and if you need any help please open an issue. ## Update the Wiki To update the wiki, simply navigate to the [wiki tab](https://github.com/octoshrimpy/quik/wiki) in this repository, find the file that you need to edit, and then click `Edit Page`. Then you can edit and commit your change. For more sizeable changes, and for feedback and questions please comment in [this discussion](https://github.com/octoshrimpy/quik/discussions/174). ## Fix Bugs @@ -41,43 +42,5 @@ To update the wiki, simply navigate to the [wiki tab](https://github.com/octoshr 6. Submit a pull request with your change. **We have a build action on each pull request, if this build fails, please edit the pull request in order to make the build succeed.** ## Helpful Tips -### [build.gradle](https://github.com/octoshrimpy/quik/blob/master/presentation/build.gradle) configuration for building locally -``` - -/* - signingConfigs { - release { - def keystoreProps = new Properties() - def keystorePropsFile = rootProject.file('./.gradle/.gradlerc') - storeFile file('./my-release-key.keystore') - keyAlias 'quik_release' - if (keystorePropsFile.exists()) { - keystoreProps.load(new FileInputStream(keystorePropsFile)) - } else if (System.getenv("CI") == "true") { -// do nothing - } else { - throw new GradleException("Keystore properties file not found.") - } - storePassword keystoreProps['storePassword'] - keyPassword keystoreProps['keyPassword'] - } - } -*/ - buildTypes { - release { - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - // signingConfig signingConfigs.release - } - } - - productFlavors { - withAnalytics { dimension "analytics" } - noAnalytics { - // signingConfig signingConfigs.release - } - } -``` ### Set Java Version When building QUIK, make sure to download JDK 17 and specify an installation path for it. In Android Studio, you can do that in Settings > Build, Execution, Deployment > Build Tools > Gradle. diff --git a/README.md b/README.md index 2fba3223..515956d0 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@ # QUIK [![Build and Release](https://github.com/octoshrimpy/quik/actions/workflows/build-and-release.yml/badge.svg)](https://github.com/octoshrimpy/quik/actions/workflows/build-and-release.yml) + +Translation status + QUIK is an open source replacement to the [stock messaging app](https://github.com/android/platform_packages_apps_mms) on Android. It is a continuation of [QKSMS](https://github.com/moezbhatti/qksms). @@ -46,6 +49,13 @@ When reporting a bug, please make sure to provide the following information: ## Contributing Contributions welcome! Please see the [contributing guidelines](/CONTRIBUTING.md) for details. +## Translations +If you'd like to add translations to QUIK, please join the project on [Weblate](https://hosted.weblate.org/engage/quik/)! Translations that are committed directly to source files will not be accepted. For more information see the [translation guidelines](/CONTRIBUTING.md#translate). + + +Translation status + + ## Thank you A special thank you to Jake ([@klinker41](https://github.com/klinker41)) and Luke Klinker ([@klinker24](https://github.com/klinker24)) for their work on [android-smsmms](https://github.com/klinker41/android-smsmms), which has been an unspeakably large help in implementing MMS into QUIK. diff --git a/build.gradle b/build.gradle index 1e6de0b2..1502af56 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { ext.exoplayer_version = "r2.9.0" ext.glide_version = "4.16.0" ext.junit_version = '4.12' - ext.kotlin_version = '1.7.20' + ext.kotlin_version = '1.7.21' ext.lifecycle_version = '2.1.0' ext.material_version = '1.0.0' ext.mockito_version = '2.18.3' @@ -32,7 +32,7 @@ buildscript { ext.rxjava_version = '2.1.4' ext.rxkotlin_version = '2.1.0' ext.rx_preferences_version = '2.0.0-RC3' - ext.timber_version = '4.5.1' + ext.timber_version = '5.0.1' ext.androidx_work_version = "2.8.0" ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2] @@ -46,7 +46,6 @@ buildscript { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } dependencies { @@ -72,7 +71,7 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/common/build.gradle b/common/build.gradle index f240c7c4..01bfcc38 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -48,5 +48,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java b/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java index c49c8c76..7f1d8593 100644 --- a/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java +++ b/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java @@ -4,15 +4,17 @@ package com.bumptech.glide.gifencoder; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import timber.log.Timber; import java.io.BufferedOutputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import timber.log.Timber; + public class AnimatedGifEncoder { // The minimum % of an images pixels that must be transparent for us to set a transparent index diff --git a/config.yml b/config.yml new file mode 100644 index 00000000..b065f90d --- /dev/null +++ b/config.yml @@ -0,0 +1,5 @@ +repo_keystore: keystore.p12 +keystorepass: ekaterina +repo_keyalias: quik_release +keypass: ekaterina +repo_icon: metadata/en-US/images/icon.png diff --git a/data/build.gradle b/data/build.gradle index c376e7f4..1819170d 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -22,8 +22,6 @@ apply plugin: 'kotlin-kapt' android { compileSdk 34 - publishNonDefault true - flavorDimensions "analytics" compileOptions { sourceCompatibility 1.8 @@ -34,14 +32,8 @@ android { minSdk 23 targetSdkVersion 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - - buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" } - productFlavors { - withAnalytics { dimension "analytics" } - noAnalytics { dimension "analytics" } - } namespace 'dev.octoshrimpy.quik.data' } @@ -64,8 +56,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // rxjava @@ -91,6 +81,7 @@ dependencies { implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation "com.squareup.moshi:moshi:$moshi_version" + kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" implementation "com.squareup.okhttp3:okhttp:$okhttp3_version" implementation 'io.michaelrocks:libphonenumber-android:8.13.47' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" @@ -103,8 +94,6 @@ dependencies { implementation project(':common') implementation project(':domain') - withAnalyticsImplementation 'com.android.installreferrer:installreferrer:1.1' - withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0" } repositories { @@ -116,5 +105,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt index ce68ceee..01b6b188 100644 --- a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt +++ b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt @@ -26,7 +26,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import java.util.* +import java.util.Locale @RunWith(AndroidJUnit4::class) class PhoneNumberUtilsTest { diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json new file mode 100644 index 00000000..e36ffacd --- /dev/null +++ b/data/src/main/assets/emojis/en.json @@ -0,0 +1,22 @@ +{ + "emoji_reaction_ios_generic_added": "^(?s)Reacted (.+?) to “(.+?)”$", + "emoji_reaction_ios_generic_removed": "^(?s)Removed (.+?) from “(.+?)”$", + + "emoji_reaction_ios_heart_added": "^(?s)Loved “(.+?)”$", + "emoji_reaction_ios_heart_removed": "^(?s)Removed a heart from “(.+?)”$", + + "emoji_reaction_ios_like_added": "^(?s)Liked “(.+?)”$", + "emoji_reaction_ios_like_removed": "^(?s)Removed a like from “(.+?)”$", + + "emoji_reaction_ios_dislike_added": "^(?s)Disliked “(.+?)”$", + "emoji_reaction_ios_dislike_removed": "^(?s)Removed a dislike from “(.+?)”$", + + "emoji_reaction_ios_laugh_added": "^(?s)Laughed at “(.+?)”$", + "emoji_reaction_ios_laugh_removed": "^(?s)Removed a laugh from “(.+?)”$", + + "emoji_reaction_ios_exclamation_added": "^(?s)Emphasized “(.+?)”$", + "emoji_reaction_ios_exclamation_removed": "^(?s)Removed an exclamation from “(.+?)”$", + + "emoji_reaction_ios_question_mark_added": "^(?s)Questioned “(.+?)”$", + "emoji_reaction_ios_question_mark_removed": "^(?s)Removed a question mark from “(.+?)”$" +} diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json new file mode 100644 index 00000000..f93d0e96 --- /dev/null +++ b/data/src/main/assets/emojis/ru.json @@ -0,0 +1,13 @@ +{ + "emoji_reaction_ios_heart_added": "^(?s)Очень понравилось «(.+?)»$", + + "emoji_reaction_ios_like_added": "^(?s)Понравилось «(.+?)»$", + + "emoji_reaction_ios_dislike_added": "^(?s)Не понравилось «(.+?)»$", + + "emoji_reaction_ios_laugh_added": "^(?s)Посмеялись над «(.+?)»$", + + "emoji_reaction_ios_exclamation_added": "^(?s)Отмечено «(.+?)»$", + + "emoji_reaction_ios_question_mark_added": "^(?s)Поставлен вопрос на «(.+?)»$" +} diff --git a/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt index 76befb70..d1a62ba1 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt @@ -28,7 +28,6 @@ import dev.octoshrimpy.quik.extensions.map import io.reactivex.Completable import io.reactivex.Single import timber.log.Timber -import java.util.* import javax.inject.Inject class CallBlockerBlockingClient @Inject constructor( diff --git a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt index 4da398d8..66e98db5 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt @@ -20,12 +20,12 @@ package dev.octoshrimpy.quik.manager import android.content.Context import android.util.Log -import dev.octoshrimpy.quik.common.util.extensions.versionCode -import dev.octoshrimpy.quik.util.Preferences import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import com.squareup.moshi.Moshi import com.squareup.moshi.Types +import dev.octoshrimpy.quik.common.util.extensions.versionCode +import dev.octoshrimpy.quik.util.Preferences import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt new file mode 100644 index 00000000..741d059b --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt @@ -0,0 +1,10 @@ +package dev.octoshrimpy.quik.manager + +import javax.inject.Inject + +class ReferralManagerImpl @Inject constructor() : ReferralManager { + + override suspend fun trackReferrer() { + } + +} \ No newline at end of file diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt index 4628e4cd..dd0b68fa 100644 --- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt @@ -20,7 +20,9 @@ package dev.octoshrimpy.quik.mapper import android.content.Context import android.database.Cursor -import android.provider.Telephony.* +import android.provider.Telephony.Mms +import android.provider.Telephony.MmsSms +import android.provider.Telephony.Sms import com.google.android.mms.pdu_alt.EncodedStringValue import com.google.android.mms.pdu_alt.PduHeaders import com.google.android.mms.pdu_alt.PduPersister diff --git a/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt index 83a9cfaa..38891c1a 100644 --- a/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt @@ -19,14 +19,12 @@ package dev.octoshrimpy.quik.mapper import com.f2prateek.rx.preferences2.RxSharedPreferences -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.RatingManager import io.reactivex.rxkotlin.Observables import javax.inject.Inject class RatingManagerImpl @Inject constructor( rxPrefs: RxSharedPreferences, - private val analyticsManager: AnalyticsManager ) : RatingManager { companion object { @@ -50,12 +48,10 @@ class RatingManagerImpl @Inject constructor( } override fun rate() { -// analyticsManager.track("Clicked Rate") rated.set(true) } override fun dismiss() { -// analyticsManager.track("Clicked Rate (Dismiss)") dismissed.set(true) } diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 09332158..13f76f64 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -37,7 +37,7 @@ class QkRealmMigration @Inject constructor( ) : RealmMigration { companion object { - const val SCHEMA_VERSION: Long = 12 + const val SCHEMA_VERSION: Long = 14 } @SuppressLint("ApplySharedPref") @@ -234,8 +234,19 @@ class QkRealmMigration @Inject constructor( version++ } - if (version == 11L) { + realm.schema.get("ScheduledMessage") + ?.addField("conversationId", Long::class.java, FieldAttribute.REQUIRED) + // Because there was never any property associated with which conversation/recipients a scheduled message was for, + // we can't update this field on a realm migration. It will be set to a default of 0 + + realm.schema.create("MessageContentFilter") + .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) + .addField("value", String::class.java, FieldAttribute.REQUIRED) + .addField("caseSensitive", Boolean::class.java, FieldAttribute.REQUIRED) + .addField("isRegex", Boolean::class.java, FieldAttribute.REQUIRED) + .addField("includeContacts", Boolean::class.java, FieldAttribute.REQUIRED) + realm.schema.get("Conversation") ?.addField("sendAsGroup", Boolean::class.java, FieldAttribute.REQUIRED) ?.transform { conversation -> @@ -248,6 +259,38 @@ class QkRealmMigration @Inject constructor( realm.schema.get("Message") ?.addField("sendAsGroup", Boolean::class.java, FieldAttribute.REQUIRED) + + version++ + } + + if (version == 12L) { + realm.schema.get("Conversation") + ?.addField("draftDate", Long::class.java, FieldAttribute.REQUIRED) + + version++ + } + + if (version == 13L) { + val emojiReactionTable = realm.schema.create("EmojiReaction") + .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) + .addField("reactionMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) + .addField("senderAddress", String::class.java, FieldAttribute.REQUIRED) + .addField("emoji", String::class.java, FieldAttribute.REQUIRED) + .addField("originalMessageText", String::class.java, FieldAttribute.REQUIRED) + .addField("threadId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) + + realm.schema.get("Message") + ?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED) + ?.addRealmListField("emojiReactions", emojiReactionTable) + ?.transform { msg -> + msg.setBoolean("isEmojiReaction", false) + } + + realm.schema.create("EmojiSyncNeeded") + .addField("createdAt", Long::class.java, FieldAttribute.REQUIRED) + + realm.createObject("EmojiSyncNeeded") + version++ } diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt index 0d4b2c3d..a00a3837 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt @@ -18,14 +18,15 @@ */ package dev.octoshrimpy.quik.receiver +import android.annotation.SuppressLint import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.interactor.MarkBlocked import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences -import dagger.android.AndroidInjection import io.reactivex.schedulers.Schedulers import timber.log.Timber import javax.inject.Inject @@ -37,6 +38,7 @@ class BlockThreadReceiver : BroadcastReceiver() { @Inject lateinit var markBlocked: MarkBlocked @Inject lateinit var prefs: Preferences + @SuppressLint("CheckResult") override fun onReceive(context: Context, intent: Intent) { AndroidInjection.inject(this, context) @@ -57,8 +59,14 @@ class BlockThreadReceiver : BroadcastReceiver() { MarkBlocked.Params(listOf(threadId), prefs.blockingManager.get(), null) ) ) - .subscribe { goAsync().finish() } - .dispose() + .subscribe( + { + goAsync().finish() + }, + { error -> + Timber.e("BlockThreadReceiver", "blocking failed") + goAsync().finish() + } + ) } - } diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt index 67f57e51..f20ccf68 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.UpdateScheduledMessageAlarms import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.UpdateScheduledMessageAlarms import javax.inject.Inject class BootReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt index 796bed0d..0edce8b0 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt @@ -24,9 +24,9 @@ import android.content.Intent import android.os.Build import android.provider.Telephony import androidx.annotation.RequiresApi +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.SyncMessages import dev.octoshrimpy.quik.util.Preferences -import dagger.android.AndroidInjection import javax.inject.Inject class DefaultSmsChangedReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt index 608445bc..d01b2b6f 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.DeleteMessages import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.DeleteMessages import timber.log.Timber import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MessageDeliveredReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MessageDeliveredReceiver.kt index 77a57762..1809e2b4 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MessageDeliveredReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MessageDeliveredReceiver.kt @@ -22,9 +22,9 @@ import android.app.Activity import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.MarkDelivered import dev.octoshrimpy.quik.interactor.MarkDeliveryFailed -import dagger.android.AndroidInjection import timber.log.Timber import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt index 9167def3..5d0a23af 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.util.NightModeManager import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.util.NightModeManager import javax.inject.Inject class NightModeReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index a4cbbd56..87f46e52 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -22,12 +22,12 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import androidx.core.app.RemoteInput +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.compat.SubscriptionManagerCompat import dev.octoshrimpy.quik.interactor.MarkRead import dev.octoshrimpy.quik.interactor.SendNewMessage import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository -import dagger.android.AndroidInjection import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt index ba966c0f..4b3424ce 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt @@ -21,9 +21,9 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.SendScheduledMessage import dev.octoshrimpy.quik.repository.MessageRepository -import dagger.android.AndroidInjection import timber.log.Timber import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt index fd3aa8d3..db80a9c6 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.SyncMessage import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.SyncMessage import javax.inject.Inject /** diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt index d51fec09..2f4b0e95 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.SpeakThreads import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.SpeakThreads import dev.octoshrimpy.quik.repository.ConversationRepository import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt index ef5469a1..02808d97 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt @@ -27,11 +27,11 @@ import android.provider.Telephony import androidx.core.content.contentValuesOf import androidx.core.net.toUri import androidx.documentfile.provider.DocumentFile +import com.squareup.moshi.Moshi import dev.octoshrimpy.quik.common.util.extensions.now import dev.octoshrimpy.quik.model.BackupFile import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.util.Preferences -import com.squareup.moshi.Moshi import io.reactivex.Observable import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject @@ -40,7 +40,8 @@ import okio.buffer import okio.source import timber.log.Timber import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale +import java.util.Timer import javax.inject.Inject import javax.inject.Singleton import kotlin.concurrent.schedule diff --git a/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt index b549f9c6..97e86a54 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt @@ -171,4 +171,14 @@ class ContactRepositoryImpl @Inject constructor( } } + override fun isContact(address: String): Boolean { + val uri : Uri + if (address.contains('@')) { + uri = Uri.withAppendedPath(Email.CONTENT_FILTER_URI, Uri.encode(address)) + } else { + uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address)) + } + return context.contentResolver.query(uri, arrayOf(BaseColumns._ID), null, null, null)?.count!! > 0 + } + } diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index 5682a560..4f7fe359 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -355,6 +355,7 @@ class ConversationRepositoryImpl @Inject constructor( realm.executeTransaction { conversation?.takeIf { it.isValid }?.draft = draft + conversation?.takeIf { it.isValid }?.draftDate = System.currentTimeMillis() } } diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt new file mode 100644 index 00000000..81aba099 --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -0,0 +1,296 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ +package dev.octoshrimpy.quik.repository + +import android.content.Context +import com.squareup.moshi.Moshi +import dev.octoshrimpy.quik.extensions.insertOrUpdate +import dev.octoshrimpy.quik.manager.KeyManager +import dev.octoshrimpy.quik.model.EmojiReaction +import dev.octoshrimpy.quik.model.Message +import dev.octoshrimpy.quik.util.EmojiPatternStrings +import io.realm.Realm +import io.realm.Sort +import timber.log.Timber +import javax.inject.Inject + +class EmojiReactionRepositoryImpl @Inject constructor( + private val context: Context, + private val keyManager: KeyManager, + private val moshi: Moshi, +) : EmojiReactionRepository { + // We use an ordered map to make sure we can test tapback regexes before generic ones + private val reactionPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf( + Regex( // Google Messages + "(?s)^\u200a[^\u200b\u200a]*\u200b([^\u200b]*)\u200b[^\u200b\u200a]*\u200a(.*)\u200a[^\u200b\u200a]*\u200a\\Z" + ) to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } + ) + private val removalPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf( + Regex( // Google Messages + "(?s)^\u200a[^\u200c\u200a]*\u200c([^\u200c]*)\u200c[^\u200c\u200a]*\u200a(.*)\u200a[^\u200c\u200a]*\u200a\\Z" + ) to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + ) + + init { + val assetEntries = loadEmojiPatternEntriesFromAssets() + assetEntries.forEach { (localeTag, strings) -> + try { + addPatternsForLocaleStrings(localeTag, strings, reactionPatterns, removalPatterns) + } catch (e: Exception) { + Timber.w(e, "Failed to load asset patterns for locale: $localeTag") + } + } + Timber.i("Loaded emoji reaction patterns for locales: ${assetEntries.map { it.first }}") + } + + private fun addPatternsForLocaleStrings( + localeTag: String, + strings: EmojiPatternStrings, + reactionPatterns: LinkedHashMap ParsedEmojiReaction?>, + removalPatterns: LinkedHashMap ParsedEmojiReaction?> + ) { + // iOS tapbacks (important to add these before generic emoji patterns as the regexes may overlap) + listOf( + Triple("❤️", strings.iosHeartAdded, strings.iosHeartRemoved), + Triple("👍", strings.iosLikeAdded, strings.iosLikeRemoved), + Triple("👎", strings.iosDislikeAdded, strings.iosDislikeRemoved), + Triple("😂", strings.iosLaughAdded, strings.iosLaughRemoved), + Triple("‼️", strings.iosExclamationAdded, strings.iosExclamationRemoved), + Triple("❓", strings.iosQuestionMarkAdded, strings.iosQuestionMarkRemoved) + ).forEach { (emoji, added, removed) -> + added?.let { + reactionPatterns[Regex(it)] = + { match -> ParsedEmojiReaction(emoji, match.groupValues[1]) } + } + removed?.let { + removalPatterns[Regex(it)] = + { match -> ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval = true) } + } + } + + // Generic iOS emoji patterns + strings.iosGenericAdded?.let { pattern -> + reactionPatterns[Regex(pattern)] = { match -> + if (match.groupValues.getOrNull(1) == "with a sticker") null // TODO: localize "with a sticker" + else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + } + } + strings.iosGenericRemoved?.let { pattern -> + removalPatterns[Regex(pattern)] = { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + } + } + + Timber.d("Loaded emoji regex patterns for $localeTag from assets") + } + + private fun loadEmojiPatternEntriesFromAssets(): List> { + val dir = "emojis" + val files = context.assets.list(dir) ?: emptyArray() + return files.filter { it.endsWith(".json", ignoreCase = true) } + .mapNotNull { filename -> + val localeTag = filename.removeSuffix(".json") + try { + val json = context.assets.open("$dir/$filename").bufferedReader().use { it.readText() } + val data = parseEmojiPatternsJson(json) + localeTag to data + } catch (e: Exception) { + Timber.w(e, "Failed parsing emoji patterns asset: $filename") + null + } + } + } + + private fun parseEmojiPatternsJson(json: String): EmojiPatternStrings { + val adapter = moshi.adapter(EmojiPatternStrings::class.java) + return requireNotNull(adapter.fromJson(json)) { "Invalid emoji patterns JSON" } + } + + override fun parseEmojiReaction(body: String): ParsedEmojiReaction? { + val removal = parseRemoval(body) + if (removal != null) return removal + + for ((pattern, parser) in reactionPatterns) { + val match = pattern.find(body) + if (match == null) continue; + + val result = parser(match) + if (result == null) continue + + Timber.d("Reaction found with ${result.emoji}") + return result + } + + return null + } + + private fun parseRemoval(body: String): ParsedEmojiReaction? { + for ((pattern, parser) in removalPatterns) { + val match = pattern.find(body) + if (match == null) continue; + + val result = parser(match) + if (result == null) continue + + Timber.d("Removal found with ${result.emoji}") + return result + } + + return null + } + + /** + * Search for messages in the same thread with matching text content + * We'll search recent messages first + */ + override fun findTargetMessage( + threadId: Long, + originalMessageText: String, + realm: Realm + ): Message? { + val startTime = System.currentTimeMillis() + val messages = realm.where(Message::class.java) + .equalTo("threadId", threadId) + .sort("date", Sort.DESCENDING) + .findAll() + val endTime = System.currentTimeMillis() + Timber.d("Found ${messages.size} messages as potential emoji targets in ${endTime - startTime}ms") + + val match = messages.find { message -> + message.getText(false).trim() == originalMessageText.trim() + } + if (match != null) { + Timber.d("Found match for reaction target: message ID ${match.id}") + return match + } + + Timber.w("No target message found for reaction text: '$originalMessageText'") + return null + } + + private fun removeEmojiReaction( + reactionMessage: Message, + reaction: ParsedEmojiReaction, + targetMessage: Message?, + realm: Realm, + ) { + if (targetMessage == null) { + Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") + return + } + + val existingReaction = targetMessage.emojiReactions.find { candidate -> + candidate.senderAddress == reactionMessage.address && candidate.emoji == reaction.emoji + } + + if (existingReaction != null) { + existingReaction.deleteFromRealm() + Timber.d("Removed emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") + } else { + Timber.w("No existing emoji reaction found to remove: ${reaction.emoji} to message ${targetMessage.id}") + } + + reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) + } + + override fun saveEmojiReaction( + reactionMessage: Message, + parsedReaction: ParsedEmojiReaction, + targetMessage: Message?, + realm: Realm, + ) { + if (parsedReaction.isRemoval) { + removeEmojiReaction(reactionMessage, parsedReaction, targetMessage, realm) + return + } + + val reaction = EmojiReaction().apply { + id = keyManager.newId() + reactionMessageId = reactionMessage.id + senderAddress = reactionMessage.address + emoji = parsedReaction.emoji + originalMessageText = parsedReaction.originalMessage + threadId = reactionMessage.threadId + } + realm.insertOrUpdate(reaction) + + if (targetMessage != null) { + reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) + + // Overwrite any previous reaction from this sender for this target + val priorFromSender = targetMessage.emojiReactions.filter { it.senderAddress == reaction.senderAddress } + priorFromSender.forEach { it.deleteFromRealm() } + + targetMessage.emojiReactions.add(reaction) + + Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") + } else { + Timber.w("No target message, cannot save emoji reaction: ${reaction.emoji}") + } + } + + override fun deleteAndReparseAllEmojiReactions(realm: Realm) { + val startTime = System.currentTimeMillis() + + realm.delete(EmojiReaction::class.java) + realm.where(Message::class.java).findAll().map { + it.isEmojiReaction = false + } + + val allMessages = realm.where(Message::class.java) + .beginGroup() + .beginGroup() + .equalTo("type", "sms") + .isNotEmpty("body") + .endGroup() + .or() + .beginGroup() + .equalTo("type", "mms") + .notEqualTo("messageType", 130.toLong()) + .isNotEmpty("parts.text") + .endGroup() + .endGroup() + .sort("date", Sort.ASCENDING) // parse oldest to newest to handle reactions & removals properly + .findAll() + + allMessages.forEach { message -> + val text = message.getText(false) + val parsedReaction = parseEmojiReaction(text) + if (parsedReaction != null) { + val targetMessage = findTargetMessage( + message.threadId, + parsedReaction.originalMessage, + realm + ) + saveEmojiReaction( + message, + parsedReaction, + targetMessage, + realm, + ) + } + } + + val endTime = System.currentTimeMillis() + Timber.d("Deleted and reparsed all emoji reactions in ${endTime - startTime}ms") + } + +} diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepositoryImpl.kt new file mode 100644 index 00000000..869c5506 --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepositoryImpl.kt @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.repository + +import dev.octoshrimpy.quik.model.MessageContentFilter +import dev.octoshrimpy.quik.model.MessageContentFilterData +import io.realm.Realm +import io.realm.RealmResults +import javax.inject.Inject + +class MessageContentFilterRepositoryImpl @Inject constructor() : MessageContentFilterRepository { + override fun createFilter(data: MessageContentFilterData) { + Realm.getDefaultInstance().use { realm -> + realm.refresh() + val maxId = realm.where(MessageContentFilter::class.java) + .max("id")?.toLong() ?: -1 + + realm.executeTransaction { + realm.insert(MessageContentFilter(maxId + 1, data.value, data.caseSensitive, data.isRegex, data.includeContacts)) + } + } + } + + override fun getMessageContentFilters(): RealmResults { + return Realm.getDefaultInstance() + .where(MessageContentFilter::class.java) + .findAllAsync() + } + + override fun getMessageContentFilter(id: Long): MessageContentFilter? { + return Realm.getDefaultInstance() + .where(MessageContentFilter::class.java) + .equalTo("id", id) + .findFirst() + } + + override fun isBlocked(messageBody: String, address: String, contactsRepo: ContactRepository): Boolean { + val isContact = contactsRepo.isContact(address) + + return Realm.getDefaultInstance().use { realm -> + realm.where(MessageContentFilter::class.java) + .findAll() + .any { filter -> + if (isContact && !filter.includeContacts) { + false + } else if (filter.isRegex) { + Regex(filter.value).matches(messageBody) + } else if (filter.caseSensitive) { + val regexp = ".*\\b" + Regex.escape(filter.value) + "\\b.*" + Regex(regexp).matches(messageBody) + } else { + val regexp = ".*\\b" + Regex.escape(filter.value.lowercase()) + "\\b.*" + Regex(regexp).matches(messageBody.lowercase()) + } + } + } + } + + override fun removeFilter(id: Long) { + Realm.getDefaultInstance().use { realm -> + realm.executeTransaction { + realm.where(MessageContentFilter::class.java) + .equalTo("id", id) + .findAll() + .deleteAllFromRealm() + } + } + } + +} diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 81a79999..5398940c 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -81,6 +81,8 @@ open class MessageRepositoryImpl @Inject constructor( private val messageIds: KeyManager, private val phoneNumberUtils: PhoneNumberUtils, private val prefs: Preferences, + private val syncRepository: SyncRepository, + private val reactions: EmojiReactionRepository, private val cursorToMessage: CursorToMessage, private val cursorToPart: CursorToPart, ) : MessageRepository { @@ -93,6 +95,7 @@ open class MessageRepositoryImpl @Inject constructor( Realm.getDefaultInstance() .where(Message::class.java) .equalTo("threadId", threadId) + .equalTo("isEmojiReaction", false) .let { when (query.isEmpty()) { true -> it @@ -188,9 +191,10 @@ open class MessageRepositoryImpl @Inject constructor( val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(part.type) ?: return null - val date = part.messages?.first()?.date - val fileName = part.name?.takeIf { name -> name.endsWith(extension) } - ?: "${part.type.split("/").last()}_$date.$extension" + // fileDateAndTime is divided by 1000 in order to remove the extra 0's after date and time + // This way the file name isn't so long. + val fileDateAndTime = (part.messages?.first()?.date)?.div(1000) + val fileName = "QUIK_${part.type.split("/").last()}_$fileDateAndTime.$extension" val values = contentValuesOf( MediaStore.MediaColumns.DISPLAY_NAME to fileName, @@ -731,7 +735,33 @@ open class MessageRepositoryImpl @Inject constructor( } Realm.getDefaultInstance().use { realm -> - realm.executeTransaction { realm.copyToRealmOrUpdate(message) } + var managedMessage: Message? = null + realm.executeTransaction { managedMessage = realm.copyToRealmOrUpdate(message) } + + context.contentResolver.insert(Sms.Inbox.CONTENT_URI, values) + ?.lastPathSegment?.toLong()?.let { id -> + // Update contentId after the message has been inserted to the content provider + realm.executeTransaction { managedMessage?.contentId = id } + } + + managedMessage?.let { savedMessage -> + val parsedReaction = reactions.parseEmojiReaction(body) + if (parsedReaction != null) { + val targetMessage = reactions.findTargetMessage( + savedMessage.threadId, + parsedReaction.originalMessage, + realm + ) + realm.executeTransaction { + reactions.saveEmojiReaction( + savedMessage, + parsedReaction, + targetMessage, + realm, + ) + } + } + } } return message diff --git a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt index 14a3b33f..774efeaf 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt @@ -8,6 +8,7 @@ import io.reactivex.schedulers.Schedulers import io.realm.Realm import io.realm.RealmList import io.realm.RealmResults +import timber.log.Timber import javax.inject.Inject class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRepository { @@ -20,7 +21,8 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep recipients: List, sendAsGroup: Boolean, body: String, - attachments: List + attachments: List, + conversationId: Long ): ScheduledMessage { Realm.getDefaultInstance().use { realm -> val id = (realm @@ -33,7 +35,7 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep val attachmentsRealmList = RealmList(*attachments.toTypedArray()) val message = ScheduledMessage(id, date, subId, recipientsRealmList, sendAsGroup, body, - attachmentsRealmList) + attachmentsRealmList, conversationId) realm.executeTransaction { realm.insertOrUpdate(message) } @@ -62,6 +64,13 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep .findFirst() } + override fun getScheduledMessagesForConversation(conversationId: Long): RealmResults { + return Realm.getDefaultInstance() + .where(ScheduledMessage::class.java) + .equalTo("conversationId", conversationId) + .findAllAsync() + } + override fun deleteScheduledMessage(id: Long) { val subscription = Completable.fromAction { Realm.getDefaultInstance().use { realm -> @@ -71,12 +80,12 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep realm.executeTransaction { message?.deleteFromRealm() } } - }.subscribeOn(Schedulers.io()) // Perform the operation in a background thread - .observeOn(AndroidSchedulers.mainThread()) // Switch back to the main thread if needed + }.subscribeOn(Schedulers.io()) // Run on a background thread and switch to main if needed + .observeOn(AndroidSchedulers.mainThread()) .subscribe({ - // Handle completion, e.g., log success or update UI + Timber.v("Successfully deleted scheduled messages.") }, { - // Handle error, e.g., log or show error message + Timber.e("Deleting scheduled messages failed.") }) disposables.add(subscription) @@ -96,5 +105,4 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep .map { it.id } } } - } diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index d2c911d4..d65500a0 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -21,6 +21,8 @@ package dev.octoshrimpy.quik.repository import android.content.ContentResolver import android.content.ContentUris import android.net.Uri +import android.os.Handler +import android.os.HandlerThread import android.provider.Telephony import com.f2prateek.rx.preferences2.RxSharedPreferences import dev.octoshrimpy.quik.extensions.forEach @@ -37,6 +39,7 @@ import dev.octoshrimpy.quik.mapper.CursorToRecipient import dev.octoshrimpy.quik.model.Contact import dev.octoshrimpy.quik.model.ContactGroup import dev.octoshrimpy.quik.model.Conversation +import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.model.MmsPart import dev.octoshrimpy.quik.model.PhoneNumber @@ -49,6 +52,7 @@ import io.reactivex.subjects.Subject import io.realm.Realm import io.realm.RealmList import io.realm.Sort +import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton @@ -65,7 +69,8 @@ class SyncRepositoryImpl @Inject constructor( private val cursorToContactGroupMember: CursorToContactGroupMember, private val keys: KeyManager, private val phoneNumberUtils: PhoneNumberUtils, - private val rxPrefs: RxSharedPreferences + private val rxPrefs: RxSharedPreferences, + private val reactions: EmojiReactionRepository, ) : SyncRepository { override val syncProgress: Subject = @@ -73,144 +78,173 @@ class SyncRepositoryImpl @Inject constructor( override fun syncMessages() { + val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders") + // If the sync is already running, don't try to do another one if (syncProgress.blockingFirst() is SyncRepository.SyncProgress.Running) return syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) - val realm = Realm.getDefaultInstance() - realm.beginTransaction() + val handlerThread = HandlerThread("RealmSyncThread") + handlerThread.start() + Handler(handlerThread.looper).post { + Realm.getDefaultInstance().executeTransactionAsync( + { realm -> + // Prepare existing conversation data + val persistedData = realm.copyFromRealm( + realm.where(Conversation::class.java) + .beginGroup() + .equalTo("archived", true) + .or() + .equalTo("blocked", true) + .or() + .equalTo("pinned", true) + .or() + .isNotEmpty("name") + .or() + .isNotNull("blockingClient") + .or() + .isNotEmpty("blockReason") + .endGroup() + .findAll() + ).associateBy { conversation -> conversation.id }.toMutableMap() - val persistedData = realm.copyFromRealm(realm.where(Conversation::class.java) - .beginGroup() - .equalTo("archived", true) - .or() - .equalTo("blocked", true) - .or() - .equalTo("pinned", true) - .or() - .isNotEmpty("name") - .or() - .isNotNull("blockingClient") - .or() - .isNotEmpty("blockReason") - .endGroup() - .findAll()) - .associateBy { conversation -> conversation.id } - .toMutableMap() + removeOldMessages(realm) - realm.delete(Contact::class.java) - realm.delete(ContactGroup::class.java) - realm.delete(Conversation::class.java) - realm.delete(Message::class.java) - realm.delete(MmsPart::class.java) - realm.delete(Recipient::class.java) + keys.reset() - keys.reset() + val partsCursor = cursorToPart.getPartsCursor() + val messageCursor = cursorToMessage.getMessagesCursor() + val conversationCursor = cursorToConversation.getConversationsCursor() + val recipientCursor = cursorToRecipient.getRecipientCursor() - val partsCursor = cursorToPart.getPartsCursor() - val messageCursor = cursorToMessage.getMessagesCursor() - val conversationCursor = cursorToConversation.getConversationsCursor() - val recipientCursor = cursorToRecipient.getRecipientCursor() + val max = (partsCursor?.count ?: 0) + + (messageCursor?.count ?: 0) + + (conversationCursor?.count ?: 0) + + (recipientCursor?.count ?: 0) - val max = (partsCursor?.count ?: 0) + - (messageCursor?.count ?: 0) + - (conversationCursor?.count ?: 0) + - (recipientCursor?.count ?: 0) + var progress = 0 - var progress = 0 - - // Sync message parts - partsCursor?.use { - partsCursor.forEach { - tryOrNull { - progress++ - val part = cursorToPart.map(partsCursor) - realm.insertOrUpdate(part) + // Sync message parts + partsCursor?.use { + partsCursor.forEach { cursor -> + tryOrNull { + val part = cursorToPart.map(partsCursor) + realm.insertOrUpdate(part) + progress++ + } + } } - } - } - // Sync messages - messageCursor?.use { - val messageColumns = CursorToMessage.MessageColumns(messageCursor) - messageCursor.forEach { cursor -> - tryOrNull { - progress++ - syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false)) - val message = cursorToMessage.map(Pair(cursor, messageColumns)).apply { - if (isMms()) { - parts = RealmList().apply { - addAll(realm.where(MmsPart::class.java) - .equalTo("messageId", contentId) - .findAll()) + // Sync messages + messageCursor?.use { + val messageColumns = CursorToMessage.MessageColumns(messageCursor) + messageCursor.forEach { cursor -> + tryOrNull { + syncProgress.onNext( + SyncRepository.SyncProgress.Running( + max, + ++progress, + false + ) + ) + val message = cursorToMessage.map(Pair(cursor, messageColumns)).apply { + if (isMms()) { + parts = RealmList().apply { + addAll( + realm.where(MmsPart::class.java) + .equalTo("messageId", contentId) + .findAll() + ) + } + } } + realm.insertOrUpdate(message) } } - realm.insertOrUpdate(message) } - } - } - // Migrate blocked conversations from 2.7.3 - val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders") - oldBlockedSenders.get() - .map { threadIdString -> threadIdString.toLong() } - .filter { threadId -> !persistedData.contains(threadId) } - .forEach { threadId -> persistedData[threadId] = Conversation(id = threadId, blocked = true) } - - // Sync conversations - conversationCursor?.use { - conversationCursor.forEach { cursor -> - tryOrNull { - progress++ - syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false)) - val conversation = cursorToConversation.map(cursor).apply { - persistedData[id]?.let { persistedConversation -> - archived = persistedConversation.archived - blocked = persistedConversation.blocked - pinned = persistedConversation.pinned - name = persistedConversation.name - blockingClient = persistedConversation.blockingClient - blockReason = persistedConversation.blockReason - } - lastMessage = realm.where(Message::class.java) - .sort("date", Sort.DESCENDING) - .equalTo("threadId", id) - .findFirst() + // Migrate blocked conversations from 2.7.3 + oldBlockedSenders.get() + .map { threadIdString -> threadIdString.toLong() } + .filter { threadId -> !persistedData.contains(threadId) } + .forEach { threadId -> + persistedData[threadId] = Conversation(id = threadId, blocked = true) } - realm.insertOrUpdate(conversation) - } - } - } - // Sync recipients - recipientCursor?.use { - val contacts = realm.copyToRealmOrUpdate(getContacts()) - recipientCursor.forEach { cursor -> - tryOrNull { - progress++ - syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false)) - val recipient = cursorToRecipient.map(cursor).apply { - contact = contacts.firstOrNull { contact -> - contact.numbers.any { phoneNumberUtils.compare(address, it.address) } + // Sync conversations + conversationCursor?.use { + conversationCursor.forEach { cursor -> + tryOrNull { + syncProgress.onNext( + SyncRepository.SyncProgress.Running( + max, + ++progress, + false + ) + ) + val conversation = cursorToConversation.map(cursor).apply { + persistedData[id]?.let { persistedConversation -> + archived = persistedConversation.archived + blocked = persistedConversation.blocked + pinned = persistedConversation.pinned + name = persistedConversation.name + blockingClient = persistedConversation.blockingClient + blockReason = persistedConversation.blockReason + } + lastMessage = realm.where(Message::class.java) + .sort("date", Sort.DESCENDING) + .equalTo("threadId", id) + .findFirst() + } + realm.insertOrUpdate(conversation) } } - realm.insertOrUpdate(recipient) } - } + + // Sync recipients + val contacts = realm.copyToRealmOrUpdate(getContacts()) + recipientCursor?.use { + recipientCursor.forEach { cursor -> + tryOrNull { + syncProgress.onNext( + SyncRepository.SyncProgress.Running( + max, + ++progress, + false + ) + ) + val rec = cursorToRecipient.map(cursor).apply { + contact = contacts.firstOrNull { c -> + c.numbers.any { num -> + phoneNumberUtils.compare( + address, + num.address + ) + } + } + } + realm.insertOrUpdate(rec) + } + } + } + + syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) + + // Now that we have all the messages, we can scan for emoji reactions + reactions.deleteAndReparseAllEmojiReactions(realm) + + realm.insert(SyncLog()) + }, { + handlerThread.quitSafely() + oldBlockedSenders.delete() + syncProgress.onNext(SyncRepository.SyncProgress.Idle) + }, + { error -> + handlerThread.quitSafely() + Timber.e(error, "syncMessages Failed") + syncProgress.onNext(SyncRepository.SyncProgress.Idle) + }) } - - syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) - - - realm.insert(SyncLog()) - realm.commitTransaction() - realm.close() - - // Only delete this after the sync has successfully completed - oldBlockedSenders.delete() - - syncProgress.onNext(SyncRepository.SyncProgress.Idle) } override fun syncMessage(uri: Uri, messageId: Long): Message? { @@ -265,6 +299,26 @@ class SyncRepositoryImpl @Inject constructor( conversationRepo.getOrCreateConversation(threadId) insertOrUpdate() + + val text = getText(false) + val parsedReaction = reactions.parseEmojiReaction(text) + if (parsedReaction != null) { + Realm.getDefaultInstance().use { realm -> + val targetMessage = reactions.findTargetMessage( + threadId, + parsedReaction.originalMessage, + realm + ) + realm.executeTransaction { + reactions.saveEmojiReaction( + this, + parsedReaction, + targetMessage, + realm, + ) + } + } + } } } } @@ -351,4 +405,13 @@ class SyncRepositoryImpl @Inject constructor( return groups } + private fun removeOldMessages(realm: Realm) { + realm.delete(Contact::class.java) + realm.delete(ContactGroup::class.java) + realm.delete(Conversation::class.java) + realm.delete(Message::class.java) + realm.delete(MmsPart::class.java) + realm.delete(Recipient::class.java) + } + } diff --git a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt index 59d1a69a..f49442c6 100644 --- a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt +++ b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt @@ -6,9 +6,9 @@ import android.app.job.JobParameters import android.app.job.JobService import android.content.ComponentName import android.content.Context +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.common.util.extensions.jobScheduler import dev.octoshrimpy.quik.interactor.DeleteOldMessages -import dagger.android.AndroidInjection import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign import timber.log.Timber diff --git a/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt index e8d0f12d..ef6da910 100644 --- a/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt +++ b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt @@ -22,9 +22,9 @@ import android.app.IntentService import android.content.Intent import android.net.Uri import android.telephony.TelephonyManager +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.SendNewMessage import dev.octoshrimpy.quik.repository.ConversationRepository -import dagger.android.AndroidInjection import javax.inject.Inject class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") { diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt new file mode 100644 index 00000000..d2509232 --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt @@ -0,0 +1,28 @@ +package dev.octoshrimpy.quik.util + +import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = false) +data class EmojiPatternStrings( + @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String? = null, + @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String? = null, + + @Json(name = "emoji_reaction_ios_heart_added") val iosHeartAdded: String? = null, + @Json(name = "emoji_reaction_ios_heart_removed") val iosHeartRemoved: String? = null, + + @Json(name = "emoji_reaction_ios_like_added") val iosLikeAdded: String? = null, + @Json(name = "emoji_reaction_ios_like_removed") val iosLikeRemoved: String? = null, + + @Json(name = "emoji_reaction_ios_dislike_added") val iosDislikeAdded: String? = null, + @Json(name = "emoji_reaction_ios_dislike_removed") val iosDislikeRemoved: String? = null, + + @Json(name = "emoji_reaction_ios_laugh_added") val iosLaughAdded: String? = null, + @Json(name = "emoji_reaction_ios_laugh_removed") val iosLaughRemoved: String? = null, + + @Json(name = "emoji_reaction_ios_exclamation_added") val iosExclamationAdded: String? = null, + @Json(name = "emoji_reaction_ios_exclamation_removed") val iosExclamationRemoved: String? = null, + + @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String? = null, + @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String? = null, +) diff --git a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt index 0414661e..ccb419e1 100644 --- a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt +++ b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt @@ -26,7 +26,8 @@ import androidx.appcompat.app.AppCompatDelegate import dev.octoshrimpy.quik.manager.WidgetManager import dev.octoshrimpy.quik.receiver.NightModeReceiver import java.text.SimpleDateFormat -import java.util.* +import java.util.Calendar +import java.util.Locale import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt index 408fd84a..24b62caf 100644 --- a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt @@ -22,7 +22,7 @@ import android.content.Context import android.telephony.PhoneNumberUtils import io.michaelrocks.libphonenumber.android.PhoneNumberUtil import io.michaelrocks.libphonenumber.android.Phonenumber -import java.util.* +import java.util.Locale import javax.inject.Inject import javax.inject.Singleton @@ -39,12 +39,14 @@ class PhoneNumberUtils @Inject constructor(context: Context) { * This method will run successfully stricter checks without compromising much speed */ fun compare(first: String, second: String): Boolean { - if (first.equals(second, true)) { + val normalizedFirst = normalizeNumber(first) + val normalizedSecond = normalizeNumber(second) + if (normalizedFirst.equals(normalizedSecond, true)) { return true } if (PhoneNumberUtils.compare(first, second)) { - val matchType = phoneNumberUtil.isNumberMatch(first, second) + val matchType = phoneNumberUtil.isNumberMatch(normalizedFirst, normalizedSecond) if (matchType >= PhoneNumberUtil.MatchType.SHORT_NSN_MATCH) { return true } diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt deleted file mode 100644 index 2f81c87a..00000000 --- a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2020 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ - -package dev.octoshrimpy.quik.manager - -import javax.inject.Inject - -class ReferralManagerImpl @Inject constructor() : ReferralManager { - - override suspend fun trackReferrer() { - } - -} diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt deleted file mode 100644 index aa548786..00000000 --- a/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.manager - -import android.content.Context -import com.amplitude.api.Amplitude -import com.amplitude.api.AmplitudeClient -import com.amplitude.api.Identify -import dev.octoshrimpy.quik.data.BuildConfig -import org.json.JSONArray -import org.json.JSONObject -import timber.log.Timber -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -class AnalyticsManagerImpl @Inject constructor(context: Context) : AnalyticsManager { - - private val amplitude: AmplitudeClient = Amplitude.getInstance().initialize(context, BuildConfig.AMPLITUDE_API_KEY) - - init { - amplitude.trackSessionEvents(true) - } - - override fun track(event: String, vararg properties: Pair) { - val propertiesJson = JSONObject(properties - .associateBy { pair -> pair.first } - .mapValues { pair -> pair.value.second }) - .also { Timber.v("$event: $it") } - - amplitude.logEvent(event, propertiesJson) - } - - override fun setUserProperty(key: String, value: Any) { - Timber.v("$key: $value") - - // Set the value in Amplitude - val identify = Identify() - when (value) { - is Boolean -> identify.set(key, value) - is BooleanArray -> identify.set(key, value) - is Double -> identify.set(key, value) - is DoubleArray -> identify.set(key, value) - is Float -> identify.set(key, value) - is FloatArray -> identify.set(key, value) - is Int -> identify.set(key, value) - is IntArray -> identify.set(key, value) - is Long -> identify.set(key, value) - is LongArray -> identify.set(key, value) - is String -> identify.set(key, value) - is JSONArray -> identify.set(key, value) - is JSONObject -> identify.set(key, value) - else -> Timber.e("Value of type ${value::class.java} not supported") - } - amplitude.identify(identify) - } - -} diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt deleted file mode 100644 index f59df235..00000000 --- a/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2020 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ - -package dev.octoshrimpy.quik.manager - -import android.content.Context -import com.android.installreferrer.api.InstallReferrerClient -import com.android.installreferrer.api.InstallReferrerStateListener -import dev.octoshrimpy.quik.util.Preferences -import kotlinx.coroutines.suspendCancellableCoroutine -import javax.inject.Inject -import kotlin.coroutines.resume - -class ReferralManagerImpl @Inject constructor( - private val analytics: AnalyticsManager, - private val context: Context, - private val prefs: Preferences -) : ReferralManager { - - override suspend fun trackReferrer() { - if (prefs.didSetReferrer.get()) { - return - } - - context.packageManager.getInstallerPackageName(context.packageName)?.let { installer -> - analytics.setUserProperty("Installer", installer) - } - - val referrerClient = InstallReferrerClient.newBuilder(context).build() - val responseCode = suspendCancellableCoroutine { cont -> - referrerClient.startConnection(object : InstallReferrerStateListener { - override fun onInstallReferrerSetupFinished(responseCode: Int) { - cont.resume(responseCode) - } - - override fun onInstallReferrerServiceDisconnected() { - cont.resume(InstallReferrerClient.InstallReferrerResponse.SERVICE_DISCONNECTED) - } - }) - - cont.invokeOnCancellation { - referrerClient.endConnection() - } - } - - when (responseCode) { - InstallReferrerClient.InstallReferrerResponse.OK -> { - analytics.setUserProperty("Referrer", referrerClient.installReferrer.installReferrer) - prefs.didSetReferrer.set(true) - } - - InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED -> { - prefs.didSetReferrer.set(true) - } - } - - referrerClient.endConnection() - } - -} diff --git a/domain/build.gradle b/domain/build.gradle index 2d07c9c1..9c0d0c16 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -46,8 +46,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // realm @@ -70,8 +68,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(":common") -// implementation 'com.github.pengrad:jdk9-deps:1ffe84c' - } repositories { @@ -83,5 +79,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt index 51fa95ca..d1f3cc3c 100644 --- a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt +++ b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt @@ -20,10 +20,10 @@ package dev.octoshrimpy.quik.experiment import android.content.Context import android.preference.PreferenceManager -import dev.octoshrimpy.quik.manager.AnalyticsManager -import java.util.* +import java.util.Locale +import java.util.Random -abstract class Experiment(val context: Context, val analytics: AnalyticsManager) { +abstract class Experiment(val context: Context) { private val prefs by lazy { PreferenceManager.getDefaultSharedPreferences(context) } private val prefKey: String @@ -48,7 +48,6 @@ abstract class Experiment(val context: Context, val analytics: AnalyticsManag else -> { // Variant hasn't been set yet variants[Random().nextInt(variants.size)].also { variant -> - analytics.setUserProperty("Experiment: $key", variant.key) prefs.edit().putString(prefKey, variant.key).apply() }.value } diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt index 3d55eae0..9891f2f0 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.interactor import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import androidx.core.net.toUri import dev.octoshrimpy.quik.extensions.getName import dev.octoshrimpy.quik.extensions.getResourceBytes import dev.octoshrimpy.quik.repository.ScheduledMessageRepository @@ -42,7 +43,8 @@ class AddScheduledMessage @Inject constructor( val recipients: List, val sendAsGroup: Boolean, val body: String, - val attachments: List + val attachments: List, + val conversationId: Long ) @SuppressLint("Range") @@ -52,7 +54,13 @@ class AddScheduledMessage @Inject constructor( .map { // step 1 - save, without attachments, to db to get primary key id which is // needed for building the save file location dir name in step 2 scheduledMessageRepo.saveScheduledMessage( - it.date, it.subId, it.recipients, it.sendAsGroup, it.body, listOf() + it.date, + it.subId, + it.recipients, + it.sendAsGroup, + it.body, + listOf(), + it.conversationId ) } .map { scheduledMessage -> @@ -86,5 +94,4 @@ class AddScheduledMessage @Inject constructor( } .flatMap { updateScheduledMessageAlarms.buildObservable(Unit) } } - -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteScheduledMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteScheduledMessages.kt index df864e74..62706145 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteScheduledMessages.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteScheduledMessages.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.interactor import android.content.Context import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import io.reactivex.Flowable +import timber.log.Timber import java.io.File import javax.inject.Inject @@ -39,11 +40,12 @@ class DeleteScheduledMessages @Inject constructor( val topDir = File(context.filesDir, "scheduled-${scheduledMessageId}") topDir.exists() && topDir.deleteRecursively() } - } catch (e: Exception) { /* nothing */ } + } catch (e: Exception) { + Timber.e("Unable to delete scheduled messages.") + } // delete the db entries scheduledMessageRepo.deleteScheduledMessages(params) } } - -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SendExistingMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendExistingMessage.kt index bbb88491..12aaf82a 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/SendExistingMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendExistingMessage.kt @@ -18,15 +18,22 @@ */ package dev.octoshrimpy.quik.interactor +import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject class SendExistingMessage @Inject constructor( - private val messageRepo: MessageRepository + private val messageRepo: MessageRepository, + private val notificationManager: NotificationManager ) : Interactor() { override fun buildObservable(params: Long): Flowable = Flowable.just(params) - .doOnNext { messageId -> messageRepo.sendMessage(messageId) } + .doOnNext { messageId -> + val message = messageRepo.getMessage(messageId) + messageRepo.sendMessage(messageId) + val threadId = message!!.threadId + notificationManager.cancel(threadId.toInt() + 100000) + } } diff --git a/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt index 1fdb53ee..b2c910a5 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt @@ -35,4 +35,6 @@ interface NotificationManager { fun getNotificationForBackup(): NotificationCompat.Builder + fun cancel(i: Int) + } diff --git a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt index 9b7814ff..c6d67395 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt @@ -18,7 +18,6 @@ */ package dev.octoshrimpy.quik.manager -import android.content.pm.ShortcutInfo import androidx.core.content.pm.ShortcutInfoCompat interface ShortcutManager { diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt index a60383f1..8ff53af5 100644 --- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt @@ -19,7 +19,9 @@ package dev.octoshrimpy.quik.mapper import android.database.Cursor -import android.provider.Telephony.* +import android.provider.Telephony.Mms +import android.provider.Telephony.MmsSms +import android.provider.Telephony.Sms import dev.octoshrimpy.quik.model.Message import timber.log.Timber diff --git a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt index c2a8e817..dde5ae94 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt @@ -31,6 +31,7 @@ open class Conversation( var recipients: RealmList = RealmList(), var lastMessage: Message? = null, var draft: String = "", + var draftDate: Long = 0, var blockingClient: Int? = null, var blockReason: String? = null, @@ -40,7 +41,7 @@ open class Conversation( var sendAsGroup: Boolean = false, ) : RealmObject() { - val date: Long get() = lastMessage?.date ?: 0 + val date: Long get() = lastMessage?.date ?: if (draft.isNotEmpty()) draftDate else 0 val snippet: String? get() = lastMessage?.getSummary() val unread: Boolean get() = lastMessage?.read == false val me: Boolean get() = lastMessage?.isMe() == true diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt new file mode 100644 index 00000000..437a2809 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.model + +import io.realm.RealmObject +import io.realm.annotations.Index +import io.realm.annotations.PrimaryKey + +open class EmojiReaction : RealmObject() { + @PrimaryKey var id: Long = 0 + + /** The reaction message ID itself */ + @Index var reactionMessageId: Long = 0 + + /** The sender's address (phone number) */ + var senderAddress: String = "" + + /** The emoji used in the reaction */ + var emoji: String = "" + + /** The original message text that was reacted to */ + var originalMessageText: String = "" + + /** Thread ID for easier querying */ + @Index var threadId: Long = 0 +} diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt new file mode 100644 index 00000000..1801df38 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ +package dev.octoshrimpy.quik.model + +import io.realm.RealmObject + +open class EmojiSyncNeeded : RealmObject() { + var createdAt: Long = System.currentTimeMillis() +} diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt index e02bd341..d2480f41 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -20,7 +20,9 @@ package dev.octoshrimpy.quik.model import android.content.ContentUris import android.net.Uri -import android.provider.Telephony.* +import android.provider.Telephony.Mms +import android.provider.Telephony.MmsSms +import android.provider.Telephony.Sms import dev.octoshrimpy.quik.extensions.joinTo import io.realm.RealmList import io.realm.RealmObject @@ -76,6 +78,8 @@ open class Message : RealmObject() { var subject: String = "" var textContentType: String = "" var parts: RealmList = RealmList() + var isEmojiReaction: Boolean = false + val emojiReactions: RealmList = RealmList() var sendAsGroup: Boolean = false diff --git a/domain/src/main/java/com/moez/QKSMS/model/MessageContentFilter.kt b/domain/src/main/java/com/moez/QKSMS/model/MessageContentFilter.kt new file mode 100644 index 00000000..c0560617 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/model/MessageContentFilter.kt @@ -0,0 +1,20 @@ +package dev.octoshrimpy.quik.model + +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey + +open class MessageContentFilter( + @PrimaryKey var id: Long = 0, + + var value: String = "", + var caseSensitive: Boolean = false, + var isRegex: Boolean = false, + var includeContacts: Boolean = false +) : RealmObject() + +data class MessageContentFilterData( + var value: String = "", + var caseSensitive: Boolean = false, + var isRegex: Boolean = false, + var includeContacts: Boolean = false +) diff --git a/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt index 93ad077e..9cc298a0 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt @@ -21,7 +21,7 @@ package dev.octoshrimpy.quik.model import android.telephony.PhoneNumberUtils import io.realm.RealmObject import io.realm.annotations.PrimaryKey -import java.util.* +import java.util.Locale open class Recipient( @PrimaryKey var id: Long = 0, diff --git a/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt index a49c486b..09f586a1 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt @@ -29,7 +29,8 @@ open class ScheduledMessage( var recipients: RealmList = RealmList(), var sendAsGroup: Boolean = true, var body: String = "", - var attachments: RealmList = RealmList() + var attachments: RealmList = RealmList(), + var conversationId: Long = 0 ) : RealmObject() { fun copy( @@ -39,10 +40,11 @@ open class ScheduledMessage( recipients: RealmList = this.recipients, sendAsGroup: Boolean = this.sendAsGroup, body: String = this.body, - attachments: RealmList = this.attachments + attachments: RealmList = this.attachments, + conversationId: Long = this.conversationId ): ScheduledMessage { - return ScheduledMessage(id, date, subId, recipients, sendAsGroup, body, attachments) + return ScheduledMessage(id, date, subId, recipients, sendAsGroup, body, attachments, conversationId) } } \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt index 88341465..446dbebb 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt @@ -41,4 +41,6 @@ interface ContactRepository { fun setDefaultPhoneNumber(lookupKey: String, phoneNumberId: Long) + fun isContact(address: String): Boolean + } diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt new file mode 100644 index 00000000..8c648249 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ +package dev.octoshrimpy.quik.repository + +import dev.octoshrimpy.quik.model.Message +import io.realm.Realm + +data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val isRemoval: Boolean = false) + +interface EmojiReactionRepository { + fun parseEmojiReaction(body: String): ParsedEmojiReaction? + + fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? + + fun saveEmojiReaction( + reactionMessage: Message, + parsedReaction: ParsedEmojiReaction, + targetMessage: Message?, + realm: Realm, + ) + + fun deleteAndReparseAllEmojiReactions(realm: Realm) +} diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepository.kt similarity index 52% rename from data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt rename to domain/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepository.kt index 58dba725..031e89d9 100644 --- a/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepository.kt @@ -16,27 +16,22 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package dev.octoshrimpy.quik.manager +package dev.octoshrimpy.quik.repository -import org.json.JSONObject -import timber.log.Timber -import javax.inject.Inject -import javax.inject.Singleton +import dev.octoshrimpy.quik.model.MessageContentFilter +import dev.octoshrimpy.quik.model.MessageContentFilterData +import io.realm.RealmResults -@Singleton -class AnalyticsManagerImpl @Inject constructor() : AnalyticsManager { +interface MessageContentFilterRepository { - override fun track(event: String, vararg properties: Pair) { + fun createFilter(data: MessageContentFilterData) - // Log the event, but don't do anything else - JSONObject(properties - .associateBy { pair -> pair.first } - .mapValues { pair -> pair.value.second }) - .also { Timber.v("$event: $it") } - } + fun getMessageContentFilters(): RealmResults - override fun setUserProperty(key: String, value: Any) { - Timber.v("$key: $value") - } + fun getMessageContentFilter(id: Long): MessageContentFilter? + + fun isBlocked(messageBody: String, address: String, contactsRepo: ContactRepository): Boolean + + fun removeFilter(id: Long) } diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt index e210bd57..53a0c2eb 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt @@ -18,7 +18,9 @@ */ package dev.octoshrimpy.quik.repository +import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.ScheduledMessage +import io.realm.RealmList import io.realm.RealmResults interface ScheduledMessageRepository { @@ -32,9 +34,13 @@ interface ScheduledMessageRepository { recipients: List, sendAsGroup: Boolean, body: String, - attachments: List + attachments: List, + conversationId: Long ): ScheduledMessage + /** + * Updates scheduled messages with new uris + */ fun updateScheduledMessage(scheduledMessage: ScheduledMessage) /** @@ -47,15 +53,24 @@ interface ScheduledMessageRepository { */ fun getScheduledMessage(id: Long): ScheduledMessage? + /** + * Returns all scheduled messages with the given [conversationId] + */ + fun getScheduledMessagesForConversation(conversationId: Long): RealmResults + /** * Deletes the scheduled message with the given [id] */ fun deleteScheduledMessage(id: Long) - // delete multiple scheduled messages by id list + /** + * Delete multiple scheduled messages by id list + */ fun deleteScheduledMessages(ids: List) - // get a list of all scheduled message ids (in scheduled date order) + /** + * Get a list of all scheduled message ids (in scheduled date order) + */ fun getAllScheduledMessageIdsSnapshot(): List -} \ No newline at end of file +} diff --git a/fdroid/metadata/dev.octoshrimpy.quik.yml b/fdroid/metadata/dev.octoshrimpy.quik.yml new file mode 100644 index 00000000..9a6d9b14 --- /dev/null +++ b/fdroid/metadata/dev.octoshrimpy.quik.yml @@ -0,0 +1,20 @@ +PackageName: dev.octoshrimpy.quik +Name: QUIK +Summary: The most beautiful SMS messenger for Android +License: GPL-3.0 +AuthorName: Marcos Jones +SourceCode: https://github.com/octoshrimpy/quik +IssueTracker: https://github.com/octoshrimpy/quik/issues +WebSite: "" +Categories: + - Communication + - Internet +AntiFeatures: NonFreeNet +CurrentVersion: "4.1.1" +CurrentVersionCode: 2229 +Description: | + QUIK is an open source replacement for the stock messaging app on Android. + It displays SMS/MMS conversations, supports scheduled sends, backups, voice + messages, speech-to-text and text-to-speech, and more. + QUIK connects to public APIs (e.g. Space Devs) for news and may fetch + thumbnails from third-party hosts, so it’s marked as NonFreeNet. diff --git a/gradle.properties b/gradle.properties index 9d2f340c..887e2632 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,6 @@ org.gradle.jvmargs=-Xmx1536m org.gradle.caching=true android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false diff --git a/keystore.p12 b/keystore.p12 new file mode 100644 index 00000000..07c99388 Binary files /dev/null and b/keystore.p12 differ diff --git a/presentation/build.gradle b/presentation/build.gradle index 2f309e71..69bd31eb 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -24,7 +24,6 @@ apply plugin: 'kotlin-kapt' android { compileSdk 34 - flavorDimensions "analytics" defaultConfig { applicationId 'dev.octoshrimpy.quik' @@ -34,12 +33,10 @@ android { versionName '4.1.1' setProperty("archivesBaseName", "QUIK-v${versionName}") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - - setProperty("archivesBaseName", "QUIK-v${versionName}") - // versionNameSuffix '-beta' } signingConfigs { + debug // Uses the default debug keystore. release { def keystoreProps = new Properties() def keystorePropsFile = rootProject.file('./.gradle/.gradlerc') @@ -47,16 +44,14 @@ android { keyAlias 'quik_release' if (keystorePropsFile.exists()) { keystoreProps.load(new FileInputStream(keystorePropsFile)) - } else if (System.getenv("CI") == "true") { -// do nothing } else { - throw new GradleException("Keystore properties file not found.") + // do nothing } storePassword keystoreProps['storePassword'] keyPassword keystoreProps['keyPassword'] } } - + dependenciesInfo { // Disables dependency metadata when building APKs. includeInApk = false @@ -76,6 +71,7 @@ android { versionNameSuffix "-debug" resValue("string", "app_name", "QUIK-Debug") resValue("string", "application_id", defaultConfig.applicationId) + signingConfig signingConfigs.debug } } @@ -88,17 +84,14 @@ android { jvmTarget = "1.8" } - - productFlavors { - withAnalytics { dimension "analytics" } - noAnalytics { - signingConfig signingConfigs.release - } - } lint { abortOnError false } namespace 'dev.octoshrimpy.quik' + buildFeatures { + buildConfig true + viewBinding true + } if (System.getenv("CI") == "true") { signingConfigs.release.storePassword = System.getenv("keystore_password") signingConfigs.release.keyAlias = System.getenv("key_alias") @@ -111,10 +104,8 @@ androidExtensions { } configurations { - noAnalyticsDebug - noAnalyticsRelease - withAnalyticsDebug - withAnalyticsRelease + debug + release } dependencies { @@ -161,11 +152,8 @@ dependencies { implementation "com.google.dagger:dagger-android-support:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" -// compileOnly "javax.annotation:jsr250-api:1.0" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // ezvcard @@ -177,7 +165,6 @@ dependencies { // realm implementation "com.github.realm:realm-android-adapters:$realm_adapters_version" -// implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false } kapt "io.realm:realm-annotations:$realm_version" kapt "io.realm:realm-annotations-processor:$realm_version" @@ -221,16 +208,13 @@ dependencies { implementation project(':data') implementation project(':domain') - withAnalyticsImplementation 'com.google.firebase:firebase-crashlytics:17.3.0' - withAnalyticsImplementation "com.android.billingclient:billing:$billing_version" - withAnalyticsImplementation "com.android.billingclient:billing-ktx:$billing_version" - noAnalyticsDebug project(path: ':data', configuration: 'noAnalyticsDebug') - noAnalyticsRelease project(path: ':data', configuration: 'noAnalyticsRelease') - withAnalyticsDebug project(path: ':data', configuration: 'withAnalyticsDebug') - withAnalyticsRelease project(path: ':data', configuration: 'withAnalyticsRelease') } - -if (getGradle().getStartParameter().getTaskRequests().toString().contains("WithAnalytics")) { - apply plugin: 'com.google.gms.google-services' - apply plugin: 'com.google.firebase.crashlytics' +// Check to make sure that the keystore file is present when building a release +gradle.taskGraph.whenReady { taskGraph -> + if ((taskGraph.hasTask(':assembleRelease') || + taskGraph.allTasks.any { it.name == 'assembleRelease' }) && + !file('./.gradle/.gradlerc').exists() && + System.getenv("CI") != "true") { + throw new GradleException("Keystore properties file not found") + } } diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 05b4a7d9..e5240d3c 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -192,6 +192,7 @@ diff --git a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt index 55c658b8..0423e5c0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt @@ -24,22 +24,20 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.annotation.ArrayRes import androidx.recyclerview.widget.RecyclerView -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.databinding.MenuListItemBinding import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.menu_list_item.* -import kotlinx.android.synthetic.main.menu_list_item.view.* import javax.inject.Inject data class MenuItem(val title: String, val actionId: Int) -class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter() { +class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter>() { val menuItemClicks: Subject = PublishSubject.create() @@ -63,31 +61,30 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private .mapIndexed { index, title -> MenuItem(title, valueInts?.getOrNull(index) ?: index) } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val layoutInflater = LayoutInflater.from(parent.context) - val view = layoutInflater.inflate(R.layout.menu_list_item, parent, false) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = MenuListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) val states = arrayOf( intArrayOf(android.R.attr.state_activated), intArrayOf(-android.R.attr.state_activated)) val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary) - view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text)) + binding.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text)) - return QkViewHolder(view).apply { - view.setOnClickListener { + return QkBindingViewHolder(binding).apply { + binding.root.setOnClickListener { val menuItem = getItem(adapterPosition) menuItemClicks.onNext(menuItem.actionId) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val menuItem = getItem(position) - holder.title.text = menuItem.title - holder.check.isActivated = (menuItem.actionId == selectedItem) - holder.check.setVisible(selectedItem != null) + holder.binding.title.text = menuItem.title + holder.binding.check.isActivated = (menuItem.actionId == selectedItem) + holder.binding.check.setVisible(selectedItem != null) } override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index 77a8ff33..92167d1b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -36,11 +36,11 @@ import dev.octoshrimpy.quik.feature.blocking.BlockingActivity import dev.octoshrimpy.quik.feature.compose.ComposeActivity import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoActivity import dev.octoshrimpy.quik.feature.gallery.GalleryActivity +import dev.octoshrimpy.quik.feature.main.MainActivity import dev.octoshrimpy.quik.feature.notificationprefs.NotificationPrefsActivity import dev.octoshrimpy.quik.feature.plus.PlusActivity import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity import dev.octoshrimpy.quik.feature.settings.SettingsActivity -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.manager.PermissionManager @@ -51,7 +51,6 @@ import javax.inject.Singleton @Singleton class Navigator @Inject constructor( private val context: Context, - private val analyticsManager: AnalyticsManager, private val billingManager: BillingManager, private val notificationManager: NotificationManager, private val permissions: PermissionManager @@ -75,7 +74,6 @@ class Navigator @Inject constructor( * one of [main_menu, compose_schedule, settings_night, settings_theme] */ fun showQksmsPlusActivity(source: String) { -// analyticsManager.track("Viewed QKSMS+", Pair("source", source)) val intent = Intent(context, PlusActivity::class.java) startActivity(intent) } @@ -95,6 +93,11 @@ class Navigator @Inject constructor( } } + fun showMainActivity() { + val intent = Intent(context, MainActivity::class.java) + startActivity(intent) + } + fun showCompose(body: String? = null, attachments: List? = null, mode: String? = null) { val intent = Intent(context, ComposeActivity::class.java) intent.putExtra(Intent.EXTRA_TEXT, body) @@ -160,13 +163,12 @@ class Navigator @Inject constructor( } fun showBackup() { -// analyticsManager.track("Viewed Backup") startActivity(Intent(context, BackupActivity::class.java)) } - fun showScheduled() { -// analyticsManager.track("Viewed Scheduled") + fun showScheduled(conversationId: Long?) { val intent = Intent(context, ScheduledActivity::class.java) + conversationId?.let { intent.putExtra("conversationId", it) } startActivity(intent) } @@ -264,14 +266,12 @@ class Navigator @Inject constructor( .append("Device: ${Build.BRAND} ${Build.MODEL}\n") .append("SDK: ${Build.VERSION.SDK_INT}\n") .append("Upgraded" - .takeIf { BuildConfig.FLAVOR != "noAnalytics" } .takeIf { billingManager.upgradeStatus.blockingFirst() } ?: "") .toString()) startActivityExternal(intent) } fun showInvite() { -// analyticsManager.track("Clicked Invite") Intent(Intent.ACTION_SEND) .setType("text/plain") .putExtra(Intent.EXTRA_TEXT, "https://github.com/octoshrimpy/quik/releases/latest") diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index 97278de6..36d018fe 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -27,17 +27,6 @@ import androidx.emoji2.text.EmojiCompat import androidx.work.Configuration import androidx.work.WorkManager import androidx.work.WorkerFactory -import dev.octoshrimpy.quik.R -import dev.octoshrimpy.quik.common.util.CrashlyticsTree -import dev.octoshrimpy.quik.common.util.FileLoggingTree -import dev.octoshrimpy.quik.injection.AppComponentManager -import dev.octoshrimpy.quik.injection.appComponent -import dev.octoshrimpy.quik.manager.AnalyticsManager -import dev.octoshrimpy.quik.manager.BillingManager -import dev.octoshrimpy.quik.manager.ReferralManager -import dev.octoshrimpy.quik.migration.QkMigration -import dev.octoshrimpy.quik.migration.QkRealmMigration -import dev.octoshrimpy.quik.util.NightModeManager import com.uber.rxdogtag.RxDogTag import com.uber.rxdogtag.autodispose.AutoDisposeConfigurer import dagger.android.AndroidInjector @@ -45,7 +34,16 @@ import dagger.android.DispatchingAndroidInjector import dagger.android.HasActivityInjector import dagger.android.HasBroadcastReceiverInjector import dagger.android.HasServiceInjector +import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.common.util.FileLoggingTree +import dev.octoshrimpy.quik.injection.AppComponentManager +import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.interactor.SpeakThreads +import dev.octoshrimpy.quik.manager.BillingManager +import dev.octoshrimpy.quik.manager.ReferralManager +import dev.octoshrimpy.quik.migration.QkMigration +import dev.octoshrimpy.quik.migration.QkRealmMigration +import dev.octoshrimpy.quik.util.NightModeManager import dev.octoshrimpy.quik.worker.HousekeepingWorker import io.realm.Realm import io.realm.RealmConfiguration @@ -61,8 +59,6 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn * Inject these so that they are forced to initialize */ @Suppress("unused") - @Inject lateinit var analyticsManager: AnalyticsManager - @Suppress("unused") @Inject lateinit var qkMigration: QkMigration @Inject lateinit var billingManager: BillingManager @@ -102,7 +98,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn nightModeManager.updateCurrentTheme() // configure timber logging - Timber.plant(Timber.DebugTree(), CrashlyticsTree(), fileLoggingTree) + Timber.plant(Timber.DebugTree(), fileLoggingTree) // configure emoji compatibility with bundled package // (bundled library works with no play-services/gsm os versions) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java index 0ed38ae8..fba29ebc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java @@ -18,14 +18,17 @@ */ package dev.octoshrimpy.quik.common.androidxcompat; +import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread; + import android.view.View; + import androidx.drawerlayout.widget.DrawerLayout; + import com.jakewharton.rxbinding2.InitialValueObservable; + import io.reactivex.Observer; import io.reactivex.android.MainThreadDisposable; -import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread; - final class DrawerLayoutDrawerOpenedObservable extends InitialValueObservable { private final DrawerLayout view; private final int gravity; diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt index 89a583fe..3a49726b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt @@ -22,6 +22,7 @@ import android.annotation.SuppressLint import android.os.Bundle import android.view.Menu import android.view.MenuItem +import android.view.View import android.view.WindowManager import androidx.appcompat.app.AppCompatActivity import dev.octoshrimpy.quik.util.Preferences @@ -63,6 +64,12 @@ abstract class QkActivity : AppCompatActivity() { title = title // The title may have been set before layout inflation } + override fun setContentView(view: View?) { + super.setContentView(view) + setSupportActionBar(toolbar) + title = title // The title may have been set before layout inflation + } + override fun setTitle(titleId: Int) { title = getString(titleId) } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt index c4e016a8..e6da54e2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt @@ -30,7 +30,7 @@ import io.realm.RealmRecyclerViewAdapter import io.realm.RealmResults import timber.log.Timber -abstract class QkRealmAdapter : RealmRecyclerViewAdapter(null, true) { +abstract class QkRealmAdapter : RealmRecyclerViewAdapter(null, true) { /** * This view can be set, and the adapter will automatically control the visibility of this view diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt index d1a3efe3..edd3b493 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt @@ -26,6 +26,8 @@ import android.os.Bundle import android.view.View import androidx.core.view.iterator import androidx.lifecycle.Lifecycle +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.resolveThemeBoolean @@ -36,8 +38,6 @@ import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt index 4bf15117..889fdd36 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt @@ -20,8 +20,11 @@ package dev.octoshrimpy.quik.common.base import android.view.View import androidx.recyclerview.widget.RecyclerView +import androidx.viewbinding.ViewBinding import kotlinx.android.extensions.LayoutContainer open class QkViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer { override val containerView: View = view } + +open class QkBindingViewHolder(val binding: T) : QkViewHolder(binding.root) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt new file mode 100644 index 00000000..8d671337 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt @@ -0,0 +1,21 @@ +package dev.octoshrimpy.quik.common.util + +import android.app.Activity +import dev.octoshrimpy.quik.manager.BillingManager +import io.reactivex.Observable +import io.reactivex.subjects.BehaviorSubject +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class BillingManagerImpl @Inject constructor( +): BillingManager { + + override val products: Observable> = BehaviorSubject.createDefault(listOf()) + override val upgradeStatus: Observable = BehaviorSubject.createDefault(true) + + override suspend fun checkForPurchases() = Unit + override suspend fun queryProducts() = Unit + override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = Unit + +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt index 66eca516..f9d4253e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt @@ -24,7 +24,8 @@ import dev.octoshrimpy.quik.common.util.extensions.isSameDay import dev.octoshrimpy.quik.common.util.extensions.isSameWeek import dev.octoshrimpy.quik.common.util.extensions.isSameYear import java.text.SimpleDateFormat -import java.util.* +import java.util.Calendar +import java.util.Locale import javax.inject.Inject import javax.inject.Singleton diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt index ed9563c9..c8fc9de1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt @@ -27,7 +27,7 @@ import io.reactivex.schedulers.Schedulers import timber.log.Timber import java.io.FileNotFoundException import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale import javax.inject.Inject import javax.inject.Singleton @@ -45,7 +45,7 @@ class FileLoggingTree @Inject constructor( private var logFileUri: Uri? = null - override fun log(priority: Int, tag: String, message: String, t: Throwable?) { + override fun log(priority: Int, tag: String?, message: String, t: Throwable?) { if (!prefs.logging.get()) return Schedulers.io().scheduleDirect { diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt index 91642cdd..d6d06657 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt @@ -51,6 +51,7 @@ import dev.octoshrimpy.quik.receiver.DeleteMessagesReceiver import dev.octoshrimpy.quik.receiver.MessageMarkReceiver import dev.octoshrimpy.quik.receiver.RemoteMessagingReceiver import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver +import dev.octoshrimpy.quik.receiver.SendSmsReceiver import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository @@ -388,9 +389,29 @@ class NotificationManagerImpl @Inject constructor( .addNextIntent(contentIntent) val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) + //Action for resending a failed message + val resendIntent = Intent(context, SendSmsReceiver::class.java).apply { + putExtra("id", message.id) + } + val resendPendingIntent = PendingIntent.getBroadcast( + context, + message.id.toInt(), + resendIntent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + ) + + val resendAction = NotificationCompat.Action.Builder( + R.drawable.ic_send_black_24dp, + context.getString(R.string.notification_message_failed_action), + resendPendingIntent + ) + .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_NONE) + .build() + val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId)) .setContentTitle(context.getString(R.string.notification_message_failed_title)) .setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle())) + .addAction(resendAction) .setColor(colors.theme(lastRecipient).theme) .setPriority(NotificationManagerCompat.IMPORTANCE_MAX) .setSmallIcon(R.drawable.ic_notification_failed) @@ -523,4 +544,8 @@ class NotificationManagerImpl @Inject constructor( .setOngoing(true) } + override fun cancel(i: Int) { + notificationManager.cancel(i) + } + } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt index 44872678..fc352ae5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.common.util import android.annotation.TargetApi import android.content.Context import android.content.Intent -import android.os.Build import android.content.pm.ShortcutManager +import android.os.Build import androidx.core.app.Person import androidx.core.content.pm.ShortcutInfoCompat import androidx.core.content.pm.ShortcutManagerCompat @@ -101,7 +101,7 @@ class ShortcutManagerImpl @Inject constructor( @TargetApi(29) private fun createShortcutForConversation(conversation: Conversation): ShortcutInfoCompat { - Timber.v("creating shortcut for conversation ${conversation.id} : ${conversation.getTitle()}") + Timber.v("creating shortcut for conversation ${conversation.id}") val icon = when { conversation.recipients.size == 1 -> { val recipient = conversation.recipients.first()!! diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt index 358d5ece..e772b795 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt @@ -18,7 +18,7 @@ */ package dev.octoshrimpy.quik.common.util.extensions -import java.util.* +import java.util.Calendar fun Calendar.isSameDay(other: Calendar): Boolean { return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.DAY_OF_YEAR) == other.get(Calendar.DAY_OF_YEAR) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt index 06d1ee92..0cbad1c3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt @@ -8,7 +8,9 @@ import android.provider.ContactsContract import android.util.TypedValue import android.view.Gravity import android.view.LayoutInflater -import android.view.View.* +import android.view.View.GONE +import android.view.View.MeasureSpec +import android.view.View.VISIBLE import android.widget.FrameLayout import android.widget.ImageView import androidx.core.app.Person diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt index b213ba51..40503010 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt @@ -20,17 +20,17 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet -import android.view.View +import android.view.LayoutInflater import android.widget.FrameLayout import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint +import dev.octoshrimpy.quik.databinding.AvatarViewBinding import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.util.GlideApp -import kotlinx.android.synthetic.main.avatar_view.view.* import javax.inject.Inject class AvatarView @JvmOverloads constructor( @@ -45,6 +45,7 @@ class AvatarView @JvmOverloads constructor( private var photoUri: String? = null private var lastUpdated: Long? = null private var theme: Colors.Theme + private var layout: AvatarViewBinding init { if (!isInEditMode) { @@ -53,7 +54,7 @@ class AvatarView @JvmOverloads constructor( theme = colors.theme() - View.inflate(context, R.layout.avatar_view, this) + layout = AvatarViewBinding.inflate(LayoutInflater.from(context), this) setBackgroundResource(R.drawable.circle) clipToOutline = true } @@ -81,8 +82,8 @@ class AvatarView @JvmOverloads constructor( private fun updateView() { // Apply theme setBackgroundTint(theme.theme) - initial.setTextColor(theme.textPrimary) - icon.setTint(theme.textPrimary) + layout.initial.setTextColor(theme.textPrimary) + layout.icon.setTint(theme.textPrimary) val initials = fullName ?.substringBefore(',') @@ -93,18 +94,18 @@ class AvatarView @JvmOverloads constructor( .map { initial -> initial.toString() } if (initials.isNotEmpty()) { - initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first() - icon.visibility = GONE + layout.initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first() + layout.icon.visibility = GONE } else { - initial.text = null - icon.visibility = VISIBLE + layout.initial.text = null + layout.icon.visibility = VISIBLE } - photo.setImageDrawable(null) + layout.photo.setImageDrawable(null) photoUri?.let { photoUri -> - GlideApp.with(photo) + GlideApp.with(layout.photo) .load(photoUri) - .into(photo) + .into(layout.photo) } } } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt index 26e95e94..641261a7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt @@ -20,31 +20,29 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet -import android.view.View +import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.extensions.getColorCompat import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint +import dev.octoshrimpy.quik.databinding.GroupAvatarViewBinding import dev.octoshrimpy.quik.model.Recipient -import kotlinx.android.synthetic.main.group_avatar_view.view.* class GroupAvatarView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : ConstraintLayout(context, attrs) { + private var layout: GroupAvatarViewBinding = + GroupAvatarViewBinding.inflate(LayoutInflater.from(context), this) + var recipients: List = ArrayList() set(value) { field = value.sortedWith(compareByDescending { contact -> contact.contact?.lookupKey }) updateView() } - init { - View.inflate(context, R.layout.group_avatar_view, this) - } - override fun onFinishInflate() { super.onFinishInflate() @@ -54,18 +52,18 @@ class GroupAvatarView @JvmOverloads constructor( } private fun updateView() { - avatar1Frame.setBackgroundTint(when (recipients.size > 1) { + layout.avatar1Frame.setBackgroundTint(when (recipients.size > 1) { true -> context.resolveThemeColor(android.R.attr.windowBackground) false -> context.getColorCompat(android.R.color.transparent) }) - avatar1Frame.updateLayoutParams { + layout.avatar1Frame.updateLayoutParams { matchConstraintPercentWidth = if (recipients.size > 1) 0.75f else 1.0f } - avatar2.isVisible = recipients.size > 1 + layout.avatar2.isVisible = recipients.size > 1 - recipients.getOrNull(0).run(avatar1::setRecipient) - recipients.getOrNull(1).run(avatar2::setRecipient) + recipients.getOrNull(0).run(layout.avatar1::setRecipient) + recipients.getOrNull(1).run(layout.avatar2::setRecipient) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index ac620afe..eb90b584 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt @@ -25,18 +25,17 @@ import android.view.LayoutInflater import android.widget.LinearLayout import android.widget.TextView import androidx.viewpager.widget.ViewPager -import dev.octoshrimpy.quik.R +import com.uber.autodispose.android.ViewScopeProvider +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.forEach import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor +import dev.octoshrimpy.quik.databinding.TabViewBinding import dev.octoshrimpy.quik.extensions.Optional import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.repository.ConversationRepository -import com.uber.autodispose.android.ViewScopeProvider -import com.uber.autodispose.autoDisposable import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.tab_view.view.* import javax.inject.Inject class PagerTitleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) { @@ -66,11 +65,11 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut removeAllViews() pager?.adapter?.count?.forEach { position -> - val view = LayoutInflater.from(context).inflate(R.layout.tab_view, this, false) + val view = TabViewBinding.inflate(LayoutInflater.from(context), this, false) view.label.text = pager?.adapter?.getPageTitle(position) - view.setOnClickListener { pager?.currentItem = position } + view.root.setOnClickListener { pager?.currentItem = position } - addView(view) + addView(view.root) } childCount.forEach { index -> diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt index f68de924..8486e510 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet import android.view.Gravity +import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.appcompat.widget.LinearLayoutCompat @@ -28,13 +29,17 @@ import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColorStateList import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.databinding.PreferenceViewBinding import dev.octoshrimpy.quik.injection.appComponent -import kotlinx.android.synthetic.main.preference_view.view.* class PreferenceView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : LinearLayoutCompat(context, attrs) { + private var layout: PreferenceViewBinding + + val titleTextView: TextView get() = layout.titleView + var title: String? = null set(value) { field = value @@ -42,7 +47,7 @@ class PreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + layout.titleView.text = value } } @@ -57,8 +62,8 @@ class PreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + layout.summaryView.text = value + layout.summaryView.setVisible(value?.isNotEmpty() == true) } } @@ -67,12 +72,12 @@ class PreferenceView @JvmOverloads constructor( appComponent.inject(this) } - View.inflate(context, R.layout.preference_view, this) + layout = PreferenceViewBinding.inflate(LayoutInflater.from(context), this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) orientation = HORIZONTAL gravity = Gravity.CENTER_VERTICAL - icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary) + layout.icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary) context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run { title = getString(R.styleable.PreferenceView_title) @@ -80,17 +85,17 @@ class PreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.PreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, layout.widgetFrame) } // If an icon is being used, set up the icon view getResourceId(R.styleable.PreferenceView_icon, -1).takeIf { it != -1 }?.let { id -> - icon.setVisible(true) - icon.setImageResource(id) + layout.icon.setVisible(true) + layout.icon.setImageResource(id) } recycle() } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt index 6d134cd3..f5b74229 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt @@ -23,13 +23,12 @@ import android.view.LayoutInflater import androidx.annotation.StringRes import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import kotlinx.android.synthetic.main.qk_dialog.view.* +import dev.octoshrimpy.quik.databinding.QkDialogBinding class QkDialog(private val context: Activity) : AlertDialog(context) { - private val view = LayoutInflater.from(context).inflate(R.layout.qk_dialog, null) + private val view = QkDialogBinding.inflate(LayoutInflater.from(context)) @StringRes var titleRes: Int? = null @@ -99,7 +98,7 @@ class QkDialog(private val context: Activity) : AlertDialog(context) { } init { - setView(view) + setView(view.root) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt index b323f4c8..7a51e062 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet +import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout @@ -30,8 +31,8 @@ import dev.octoshrimpy.quik.common.util.extensions.forwardTouches import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.databinding.RadioPreferenceViewBinding import dev.octoshrimpy.quik.injection.appComponent -import kotlinx.android.synthetic.main.radio_preference_view.view.* import javax.inject.Inject class RadioPreferenceView @JvmOverloads constructor( @@ -39,6 +40,7 @@ class RadioPreferenceView @JvmOverloads constructor( ) : ConstraintLayout(context, attrs) { @Inject lateinit var colors: Colors + private var layout: RadioPreferenceViewBinding var title: String? = null set(value) { @@ -47,7 +49,7 @@ class RadioPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + layout.titleView.text = value } } @@ -62,8 +64,8 @@ class RadioPreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + layout.summaryView.text = value + layout.summaryView.setVisible(value?.isNotEmpty() == true) } } @@ -72,7 +74,7 @@ class RadioPreferenceView @JvmOverloads constructor( appComponent.inject(this) } - View.inflate(context, R.layout.radio_preference_view, this) + layout = RadioPreferenceViewBinding.inflate(LayoutInflater.from(context), this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) val states = arrayOf( @@ -84,8 +86,8 @@ class RadioPreferenceView @JvmOverloads constructor( false -> colors.theme().theme } val textSecondary = context.resolveThemeColor(android.R.attr.textColorTertiary) - radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary)) - radioButton.forwardTouches(this) + layout.radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary)) + layout.radioButton.forwardTouches(this) context.obtainStyledAttributes(attrs, R.styleable.RadioPreferenceView).run { title = getString(R.styleable.RadioPreferenceView_title) @@ -93,7 +95,7 @@ class RadioPreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.RadioPreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, layout.widgetFrame) } recycle() diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt index f27808a1..39b59957 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt @@ -23,16 +23,16 @@ import android.content.DialogInterface import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.R -import kotlinx.android.synthetic.main.text_input_dialog.view.* +import dev.octoshrimpy.quik.databinding.TextInputDialogBinding class TextInputDialog(context: Activity, hint: String, listener: (String) -> Unit) : AlertDialog(context) { - private val layout = LayoutInflater.from(context).inflate(R.layout.text_input_dialog, null) + private val layout = TextInputDialogBinding.inflate(LayoutInflater.from(context)) init { layout.field.hint = hint - setView(layout) + setView(layout.root) setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> } setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.button_delete)) { _, _ -> listener("") } setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ -> diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt index b35c901d..fdf7b8ac 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt @@ -22,22 +22,24 @@ import android.os.Bundle import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import dagger.android.AndroidInjection -import kotlinx.android.synthetic.main.container_activity.* +import dev.octoshrimpy.quik.databinding.ContainerActivityBinding class BackupActivity : QkThemedActivity() { private lateinit var router: Router + private lateinit var binding: ContainerActivityBinding override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.container_activity) + binding = ContainerActivityBinding.inflate(layoutInflater) + setContentView(binding.root) - router = Conductor.attachRouter(this, container, savedInstanceState) + router = Conductor.attachRouter(this, binding.container, savedInstanceState) if (!router.hasRootController()) { router.setRoot(RouterTransaction.with(BackupController())) } @@ -49,4 +51,4 @@ class BackupActivity : QkThemedActivity() { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index ef9b5e01..a2eaefd7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.backup import android.content.Context +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter @@ -27,11 +29,8 @@ import dev.octoshrimpy.quik.common.util.extensions.makeToast import dev.octoshrimpy.quik.interactor.PerformBackup import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.repository.BackupRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt index 9b52e3a9..f3975cb1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt @@ -26,10 +26,10 @@ import android.net.Uri import android.os.IBinder import androidx.core.app.NotificationManagerCompat import androidx.core.content.ContextCompat +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.common.util.extensions.getLabel import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.repository.BackupRepository -import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.schedulers.Schedulers import timber.log.Timber diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt index 850f4b7e..8afc1554 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt @@ -22,21 +22,23 @@ import android.os.Bundle import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import dagger.android.AndroidInjection -import kotlinx.android.synthetic.main.container_activity.* +import dev.octoshrimpy.quik.databinding.ContainerActivityBinding class BlockingActivity : QkThemedActivity() { private lateinit var router: Router + private lateinit var binding: ContainerActivityBinding override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.container_activity) + binding = ContainerActivityBinding.inflate(layoutInflater) + setContentView(binding.root) - router = Conductor.attachRouter(this, container, savedInstanceState) + router = Conductor.attachRouter(this, binding.container, savedInstanceState) if (!router.hasRootController()) { router.setRoot(RouterTransaction.with(BlockingController())) } @@ -48,4 +50,4 @@ class BlockingActivity : QkThemedActivity() { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt index e29f62ed..40bf0207 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt @@ -29,6 +29,7 @@ import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.feature.blocking.manager.BlockingManagerController import dev.octoshrimpy.quik.feature.blocking.messages.BlockedMessagesController import dev.octoshrimpy.quik.feature.blocking.numbers.BlockedNumbersController +import dev.octoshrimpy.quik.feature.blocking.filters.MessageContentFiltersController import dev.octoshrimpy.quik.injection.appComponent import kotlinx.android.synthetic.main.blocking_controller.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* @@ -38,6 +39,7 @@ class BlockingController : QkController { val blockingManagerIntent: Observable<*> val blockedNumbersIntent: Observable<*> + val messageContentFiltersIntent: Observable<*> val blockedMessagesIntent: Observable<*> val dropClickedIntent: Observable<*> fun openBlockingManager() fun openBlockedNumbers() + fun openMessageContentFilters() fun openBlockedMessages() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt new file mode 100644 index 00000000..afd7df03 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.feature.blocking.filters + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.common.base.QkRealmAdapter +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.model.MessageContentFilter +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import dev.octoshrimpy.quik.databinding.MessageContentFilterListItemBinding + +class MessageContentFiltersAdapter : QkRealmAdapter>() { + + val removeMessageContentFilter: Subject = PublishSubject.create() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = MessageContentFilterListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.removeFilter.setOnClickListener { + val filter = getItem(adapterPosition) ?: return@setOnClickListener + removeMessageContentFilter.onNext(filter.id) + } + } + } + + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { + val item = getItem(position)!! + holder.binding.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE + holder.binding.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE + holder.binding.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE + holder.binding.filter.text = item.value + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersController.kt new file mode 100644 index 00000000..61eb2079 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersController.kt @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.feature.blocking.filters + +import android.view.LayoutInflater +import android.view.View +import androidx.appcompat.app.AlertDialog +import com.jakewharton.rxbinding2.view.clicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable +import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.common.base.QkController +import dev.octoshrimpy.quik.common.util.Colors +import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint +import dev.octoshrimpy.quik.common.util.extensions.setTint +import dev.octoshrimpy.quik.common.widget.PreferenceView +import dev.octoshrimpy.quik.injection.appComponent +import dev.octoshrimpy.quik.model.MessageContentFilterData +import io.reactivex.Observable +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.message_content_filters_add_dialog.view.* +import kotlinx.android.synthetic.main.message_content_filters_controller.* +import kotlinx.android.synthetic.main.settings_switch_widget.view.* +import javax.inject.Inject + +class MessageContentFiltersController : QkController(), MessageContentFiltersView { + + @Inject override lateinit var presenter: MessageContentFiltersPresenter + @Inject lateinit var colors: Colors + + private val adapter = MessageContentFiltersAdapter() + private val saveFilterSubject: Subject = PublishSubject.create() + + init { + appComponent.inject(this) + retainViewMode = RetainViewMode.RETAIN_DETACH + layoutRes = R.layout.message_content_filters_controller + } + + override fun onAttach(view: View) { + super.onAttach(view) + presenter.bindIntents(this) + setTitle(R.string.message_content_filters_title) + showBackButton(true) + } + + override fun onViewCreated() { + super.onViewCreated() + add.setBackgroundTint(colors.theme().theme) + add.setTint(colors.theme().textPrimary) + adapter.emptyView = empty + filters.adapter = adapter + } + + override fun render(state: MessageContentFiltersState) { + adapter.updateData(state.filters) + } + + override fun removeFilter(): Observable = adapter.removeMessageContentFilter + override fun addFilter(): Observable<*> = add.clicks() + override fun saveFilter(): Observable = saveFilterSubject + + override fun showAddDialog() { + val layout = LayoutInflater.from(activity).inflate(R.layout.message_content_filters_add_dialog, null) + + (0 until layout.add_dialog.childCount) + .map { index -> layout.add_dialog.getChildAt(index) } + .mapNotNull { view -> view as? PreferenceView } + .map { preference -> preference.clicks().map { preference } } + .let { Observable.merge(it) } + .autoDisposable(scope()) + .subscribe { + it.checkbox.isChecked = !it.checkbox.isChecked + layout.caseSensitivity.isEnabled = !layout.regexp.checkbox.isChecked + } + + val dialog = AlertDialog.Builder(activity!!) + .setView(layout) + .setPositiveButton(R.string.message_content_filters_dialog_create) { _, _ -> + var text = layout.input.text.toString(); + if (!text.isBlank()) { + if (!layout.regexp.checkbox.isChecked) text = text.trim() + saveFilterSubject.onNext( + MessageContentFilterData( + text, + layout.caseSensitivity.checkbox.isChecked && !layout.regexp.checkbox.isChecked, + layout.regexp.checkbox.isChecked, + layout.contacts.checkbox.isChecked + ) + ) + } + } + .setNegativeButton(R.string.button_cancel) { _, _ -> } + dialog.show() + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersPresenter.kt new file mode 100644 index 00000000..a4860f4a --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersPresenter.kt @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.feature.blocking.filters + +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable +import dev.octoshrimpy.quik.common.base.QkPresenter +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository +import io.reactivex.schedulers.Schedulers +import javax.inject.Inject + +class MessageContentFiltersPresenter @Inject constructor( + private val filterRepo: MessageContentFilterRepository, +) : QkPresenter( + MessageContentFiltersState(filters = filterRepo.getMessageContentFilters()) +) { + + override fun bindIntents(view: MessageContentFiltersView) { + super.bindIntents(view) + + view.removeFilter() + .observeOn(Schedulers.io()) + .doOnNext(filterRepo::removeFilter) + .subscribeOn(Schedulers.io()) + .autoDisposable(view.scope()) + .subscribe() + + view.addFilter() + .autoDisposable(view.scope()) + .subscribe { view.showAddDialog() } + + view.saveFilter() + .observeOn(Schedulers.io()) + .subscribeOn(Schedulers.io()) + .autoDisposable(view.scope()) + .subscribe { filterData -> filterRepo.createFilter(filterData) } + } + +} diff --git a/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersState.kt similarity index 75% rename from domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersState.kt index 7c8109a8..a3c44663 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersState.kt @@ -16,12 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package dev.octoshrimpy.quik.manager +package dev.octoshrimpy.quik.feature.blocking.filters -interface AnalyticsManager { +import dev.octoshrimpy.quik.model.MessageContentFilter +import io.realm.RealmResults - fun track(event: String, vararg properties: Pair) - - fun setUserProperty(key: String, value: Any) - -} \ No newline at end of file +data class MessageContentFiltersState( + val filters: RealmResults? = null +) diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersView.kt similarity index 62% rename from presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersView.kt index da897ad9..e3dda14b 100644 --- a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersView.kt @@ -16,14 +16,18 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package dev.octoshrimpy.quik.common.util +package dev.octoshrimpy.quik.feature.blocking.filters -import timber.log.Timber +import dev.octoshrimpy.quik.common.base.QkViewContract +import dev.octoshrimpy.quik.model.MessageContentFilterData +import io.reactivex.Observable -class CrashlyticsTree : Timber.Tree() { +interface MessageContentFiltersView : QkViewContract { - override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { - // Do nothing for noAnalytics build flavor - } + fun removeFilter(): Observable + fun addFilter(): Observable<*> + fun saveFilter(): Observable + + fun showAddDialog() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt index c1576ec7..a668d4bf 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt @@ -22,6 +22,7 @@ package dev.octoshrimpy.quik.feature.blocking.manager import android.content.Context import android.graphics.drawable.Drawable import android.util.AttributeSet +import android.view.LayoutInflater import android.view.View import android.widget.ImageView import android.widget.TextView @@ -29,12 +30,15 @@ import androidx.constraintlayout.widget.ConstraintLayout import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.setVisible -import kotlinx.android.synthetic.main.blocking_manager_preference_view.view.* +import dev.octoshrimpy.quik.databinding.BlockingManagerPreferenceViewBinding class BlockingManagerPreferenceView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : ConstraintLayout(context, attrs) { + private val binding: BlockingManagerPreferenceViewBinding = + BlockingManagerPreferenceViewBinding.inflate(LayoutInflater.from(context), this) + var icon: Drawable? = null set(value) { field = value @@ -42,7 +46,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.iconView).setImageDrawable(value) } else { - iconView.setImageDrawable(value) + binding.iconView.setImageDrawable(value) } } @@ -53,7 +57,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + binding.titleView.text = value } } @@ -67,13 +71,12 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + binding.summaryView.text = value + binding.summaryView.setVisible(value?.isNotEmpty() == true) } } init { - View.inflate(context, R.layout.blocking_manager_preference_view, this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) context.obtainStyledAttributes(attrs, R.styleable.BlockingManagerPreferenceView).run { @@ -83,7 +86,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.BlockingManagerPreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, binding.widgetFrame) } recycle() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt index 231e5bbb..07fc11bc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt @@ -1,6 +1,8 @@ package dev.octoshrimpy.quik.feature.blocking.manager import android.content.Context +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.blocking.CallBlockerBlockingClient @@ -9,11 +11,8 @@ import dev.octoshrimpy.quik.blocking.QksmsBlockingClient import dev.octoshrimpy.quik.blocking.ShouldIAnswerBlockingClient import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign @@ -21,7 +20,6 @@ import io.reactivex.schedulers.Schedulers import javax.inject.Inject class BlockingManagerPresenter @Inject constructor( - private val analytics: AnalyticsManager, private val callBlocker: CallBlockerBlockingClient, private val callControl: CallControlBlockingClient, private val context: Context, @@ -69,7 +67,6 @@ class BlockingManagerPresenter @Inject constructor( .switchMap { numbers -> qksms.block(numbers).andThen(Observable.just(Unit)) } // Hack .autoDisposable(view.scope()) .subscribe { - analytics.setUserProperty("Blocking Manager", "QKSMS") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS) } @@ -77,7 +74,6 @@ class BlockingManagerPresenter @Inject constructor( .filter { val installed = callBlocker.isAvailable() if (!installed) { - analytics.track("Install Call Blocker") navigator.installCallBlocker() } @@ -86,7 +82,6 @@ class BlockingManagerPresenter @Inject constructor( } .autoDisposable(view.scope()) .subscribe { - analytics.setUserProperty("Blocking Manager", "Call Blocker") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CB) } @@ -94,7 +89,6 @@ class BlockingManagerPresenter @Inject constructor( .filter { val installed = callControl.isAvailable() if (!installed) { - analytics.track("Install Call Control") navigator.installCallControl() } @@ -119,7 +113,6 @@ class BlockingManagerPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe { callControl.shouldBlock("callcontrol").blockingGet() - analytics.setUserProperty("Blocking Manager", "Call Control") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CC) } @@ -127,7 +120,6 @@ class BlockingManagerPresenter @Inject constructor( .filter { val installed = shouldIAnswer.isAvailable() if (!installed) { - analytics.track("Install SIA") navigator.installSia() } @@ -136,7 +128,6 @@ class BlockingManagerPresenter @Inject constructor( } .autoDisposable(view.scope()) .subscribe { - analytics.setUserProperty("Blocking Manager", "SIA") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt index b264fe44..5a2a88de 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt @@ -38,7 +38,7 @@ import javax.inject.Inject class BlockedMessagesAdapter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter -) : QkRealmAdapter() { +) : QkRealmAdapter() { val clicks: PublishSubject = PublishSubject.create() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt index adc207d1..44dfefee 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt @@ -18,12 +18,12 @@ */ package dev.octoshrimpy.quik.feature.blocking.messages -import android.app.AlertDialog import android.content.Context import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import android.view.View +import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkController import dev.octoshrimpy.quik.common.util.Colors @@ -107,7 +107,7 @@ class BlockedMessagesController : QkController) { val count = conversations.size - AlertDialog.Builder(activity) + AlertDialog.Builder(activity!!) .setTitle(R.string.dialog_delete_title) .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count)) .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt index f92ebb09..ab4e1a33 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt @@ -18,15 +18,14 @@ */ package dev.octoshrimpy.quik.feature.blocking.messages +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.interactor.DeleteConversations import dev.octoshrimpy.quik.repository.ConversationRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject class BlockedMessagesPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt index 3ef278e9..e08bd9bb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt @@ -22,31 +22,30 @@ import android.view.LayoutInflater import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.model.BlockedNumber import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.blocked_number_list_item.* -import kotlinx.android.synthetic.main.blocked_number_list_item.view.* +import dev.octoshrimpy.quik.databinding.BlockedNumberListItemBinding -class BlockedNumbersAdapter : QkRealmAdapter() { +class BlockedNumbersAdapter : QkRealmAdapter>() { val unblockAddress: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_number_list_item, parent, false) - return QkViewHolder(view).apply { - containerView.unblock.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = BlockedNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.unblock.setOnClickListener { val number = getItem(adapterPosition) ?: return@setOnClickListener unblockAddress.onNext(number.id) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val item = getItem(position)!! - holder.number.text = item.address + holder.binding.number.text = item.address } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt index 1bcba8e5..f5fb23d7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt @@ -18,12 +18,12 @@ */ package dev.octoshrimpy.quik.feature.blocking.numbers +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.interactor.MarkUnblocked import dev.octoshrimpy.quik.repository.BlockingRepository import dev.octoshrimpy.quik.repository.ConversationRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.schedulers.Schedulers import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt index 441ba84b..463e2701 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt @@ -24,11 +24,11 @@ import android.view.LayoutInflater import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.databinding.ChangelogListItemBinding import dev.octoshrimpy.quik.manager.ChangelogManager -import kotlinx.android.synthetic.main.changelog_list_item.* -class ChangelogAdapter(private val context: Context) : QkAdapter() { +class ChangelogAdapter(private val context: Context) : QkAdapter>() { data class ChangelogItem(val type: Int, val label: String) @@ -57,19 +57,18 @@ class ChangelogAdapter(private val context: Context) : QkAdapter { + val binding = ChangelogListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { if (viewType == 0) { - changelogItem.setTypeface(changelogItem.typeface, Typeface.BOLD) + binding.changelogItem.setTypeface(binding.changelogItem.typeface, Typeface.BOLD) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val item = getItem(position) - - holder.changelogItem.text = item.label + holder.binding.changelogItem.text = item.label } override fun getItemViewType(position: Int): Int { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt index 94a7e774..01f775ba 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt @@ -22,11 +22,11 @@ import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.BuildConfig import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.databinding.ChangelogDialogBinding import dev.octoshrimpy.quik.feature.main.MainActivity import dev.octoshrimpy.quik.manager.ChangelogManager import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.changelog_dialog.view.* class ChangelogDialog(activity: MainActivity) { @@ -36,11 +36,11 @@ class ChangelogDialog(activity: MainActivity) { private val adapter = ChangelogAdapter(activity) init { - val layout = LayoutInflater.from(activity).inflate(R.layout.changelog_dialog, null) + val layout = ChangelogDialogBinding.inflate(LayoutInflater.from(activity)) dialog = AlertDialog.Builder(activity) .setCancelable(true) - .setView(layout) + .setView(layout.root) .create() layout.version.text = activity.getString(R.string.changelog_version, BuildConfig.VERSION_NAME) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt index ae9c1b11..3efbab19 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt @@ -29,6 +29,7 @@ object BubbleUtils { fun canGroup(message: Message, other: Message?): Boolean { if (other == null) return false + if (message.emojiReactions.isNotEmpty() || other.emojiReactions.isNotEmpty()) return false val diff = TimeUnit.MILLISECONDS.toMinutes(abs(message.date - other.date)) return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 2c6412fb..aa569b43 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -43,8 +43,8 @@ import android.view.DragEvent.ACTION_DROP import android.view.Menu import android.view.MenuItem import android.view.View -import android.widget.Toast import android.widget.SeekBar +import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.constraintlayout.widget.ConstraintSet import androidx.core.app.ActivityCompat @@ -90,11 +90,14 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.attach import kotlinx.android.synthetic.main.compose_activity.attachAFileIcon import kotlinx.android.synthetic.main.compose_activity.attachAFileLabel +import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageIcon +import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageLabel import kotlinx.android.synthetic.main.compose_activity.attaching -import kotlinx.android.synthetic.main.compose_activity.shadeBackground import kotlinx.android.synthetic.main.compose_activity.audioMsgAbort import kotlinx.android.synthetic.main.compose_activity.audioMsgAttach import kotlinx.android.synthetic.main.compose_activity.audioMsgBackground +import kotlinx.android.synthetic.main.compose_activity.audioMsgBluetooth +import kotlinx.android.synthetic.main.compose_activity.audioMsgDuration import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerBackground import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerPlayPause import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerSeekBar @@ -111,25 +114,23 @@ import kotlinx.android.synthetic.main.compose_activity.gallery import kotlinx.android.synthetic.main.compose_activity.galleryLabel import kotlinx.android.synthetic.main.compose_activity.loading import kotlinx.android.synthetic.main.compose_activity.message +import kotlinx.android.synthetic.main.compose_activity.messageAttachments import kotlinx.android.synthetic.main.compose_activity.messageList import kotlinx.android.synthetic.main.compose_activity.messagesEmpty import kotlinx.android.synthetic.main.compose_activity.noValidRecipients -import kotlinx.android.synthetic.main.compose_activity.messageAttachments -import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageIcon -import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageLabel -import kotlinx.android.synthetic.main.compose_activity.audioMsgBluetooth -import kotlinx.android.synthetic.main.compose_activity.audioMsgDuration import kotlinx.android.synthetic.main.compose_activity.recordAudioMsg import kotlinx.android.synthetic.main.compose_activity.schedule import kotlinx.android.synthetic.main.compose_activity.scheduleLabel import kotlinx.android.synthetic.main.compose_activity.scheduledCancel import kotlinx.android.synthetic.main.compose_activity.scheduledGroup import kotlinx.android.synthetic.main.compose_activity.scheduledTime +import kotlinx.android.synthetic.main.compose_activity.scheduledSend import kotlinx.android.synthetic.main.compose_activity.send import kotlinx.android.synthetic.main.compose_activity.sendAsGroup import kotlinx.android.synthetic.main.compose_activity.sendAsGroupBackground import kotlinx.android.synthetic.main.compose_activity.sendAsGroupSummary import kotlinx.android.synthetic.main.compose_activity.sendAsGroupSwitch +import kotlinx.android.synthetic.main.compose_activity.shadeBackground import kotlinx.android.synthetic.main.compose_activity.sim import kotlinx.android.synthetic.main.compose_activity.simIndex import kotlinx.android.synthetic.main.compose_activity.speechToTextFrame @@ -183,7 +184,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val scheduleSelectedIntent: Subject = PublishSubject.create() override val changeSimIntent by lazy { sim.clicks() } override val scheduleCancelIntent by lazy { scheduledCancel.clicks() } - override val sendIntent by lazy { send.clicks() } + override val sendIntent by lazy { Observable.merge(send.clicks(), scheduledSend.clicks()) } override val viewQksmsPlusIntent: Subject = PublishSubject.create() override val backPressedIntent: Subject = PublishSubject.create() override val confirmDeleteIntent: Subject> = PublishSubject.create() @@ -469,6 +470,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { // Don't set the adapters unless needed if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter + toolbar.menu.findItem(R.id.viewScheduledMessages)?.isVisible = !state.editingMode && state.selectedMessages == 0 + && state.query.isEmpty() && state.hasScheduledMessages toolbar.menu.findItem(R.id.select_all)?.isVisible = !state.editingMode && (messageAdapter.itemCount > 1) && state.selectedMessages != 0 toolbar.menu.findItem(R.id.add)?.isVisible = state.editingMode toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0 @@ -537,9 +540,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView { sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName) simIndex.text = state.subscription?.simSlotIndex?.plus(1)?.toString() - // show either send or audio msg record button - send.visibility = if (state.canSend && !state.loading) View.VISIBLE else View.INVISIBLE + // show either send, audio msg record, or sendScheduled button + send.visibility = if (state.canSend && !state.loading && state.scheduled == 0L) View.VISIBLE else View.INVISIBLE recordAudioMsg.visibility = if (state.canSend && !state.loading) View.INVISIBLE else View.VISIBLE + scheduledSend.visibility = if (state.canSend && (state.scheduled != 0L) && !state.loading) View.VISIBLE else View.INVISIBLE // if not in editing mode, and there are no non-me participants that can be sent to, // hide controls that allow constructing a reply and inform user no valid recipients @@ -734,7 +738,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override fun showDeleteDialog(messages: List) { val count = messages.size - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.dialog_delete_title) .setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count)) .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(messages) } @@ -743,7 +747,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { } override fun showClearCurrentMessageDialog() { - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.dialog_clear_compose_title) .setMessage(R.string.dialog_clear_compose) .setPositiveButton(R.string.button_clear) { _, _ -> diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt index 0da7dbff..754efdb4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt @@ -21,11 +21,11 @@ package dev.octoshrimpy.quik.feature.compose import android.content.Intent import android.net.Uri import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey -import dev.octoshrimpy.quik.model.Attachment import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey +import dev.octoshrimpy.quik.model.Attachment import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt index cfe35d2e..1a752b0f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt @@ -47,6 +47,7 @@ data class ComposeState( val remaining: String = "", val subscription: SubscriptionInfoCompat? = null, val canSend: Boolean = false, + val hasScheduledMessages: Boolean = false, val validRecipientNumbers: Int = 1, val recipientCount: Int = 1, val audioMsgRecording: Boolean = false, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index f32eb18d..3f4cec17 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -26,8 +26,8 @@ import android.net.Uri import android.os.Vibrator import android.telephony.SmsMessage import android.widget.Toast -import androidx.core.content.getSystemService import androidx.core.content.FileProvider +import androidx.core.content.getSystemService import androidx.core.net.toFile import com.google.android.exoplayer2.util.MimeTypes import com.moez.QKSMS.common.QkMediaPlayer @@ -72,13 +72,14 @@ import dev.octoshrimpy.quik.model.getText import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository +import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable +import dev.octoshrimpy.quik.util.FileUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.Preferences import dev.octoshrimpy.quik.extensions.getResourceBytes import dev.octoshrimpy.quik.util.Constants.Companion.DELAY_CANCELLED_CACHED_ATTACHMENTS_FILE_PREFIX import dev.octoshrimpy.quik.util.Constants.Companion.SAVED_MESSAGE_TEXT_FILE_PREFIX -import dev.octoshrimpy.quik.util.FileUtils import dev.octoshrimpy.quik.util.tryOrNull import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -91,7 +92,8 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import timber.log.Timber import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale +import java.util.UUID import javax.inject.Inject import javax.inject.Named @@ -116,6 +118,7 @@ class ComposeViewModel @Inject constructor( private val markRead: MarkRead, private val messageDetailsFormatter: MessageDetailsFormatter, private val messageRepo: MessageRepository, + private val scheduledMessageRepo: ScheduledMessageRepository, private val navigator: Navigator, private val permissionManager: PermissionManager, private val phoneNumberUtils: PhoneNumberUtils, @@ -137,6 +140,7 @@ class ComposeViewModel @Inject constructor( private val searchSelection: Subject = BehaviorSubject.createDefault(-1) private var shouldShowContacts = threadId == 0L && addresses.isEmpty() + private var showScheduledToast = false private var bluetoothMicManager: BluetoothMicManager? = null @@ -280,6 +284,22 @@ class ComposeViewModel @Inject constructor( newState { copy(subscription = sub) } }.subscribe() + // checks if there are any scheduled messages in convo + disposables += conversation + .distinctUntilChanged { conversation -> conversation.id } + .observeOn(AndroidSchedulers.mainThread()) + .switchMap { conversation -> + scheduledMessageRepo + .getScheduledMessagesForConversation(conversation.id) + .asFlowable() + .toObservable() + } + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { liveResults -> + val hasAny = liveResults.isNotEmpty() + newState { copy(hasScheduledMessages = hasAny) } + } + // actions if (mode == "scheduling") newState { copy(scheduling = true) } @@ -353,6 +373,15 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { newState { copy() } } + // Show scheduled messages + view.optionsItemIntent + .filter {it == R.id.viewScheduledMessages} + .withLatestFrom(state, conversation) + .autoDisposable(view.scope()) + .subscribe { (_, _, conversation) -> + navigator.showScheduled(conversation.id) + } + // toggle select all / select none view.optionsItemIntent .filter { it == R.id.select_all } @@ -887,7 +916,8 @@ class ComposeViewModel @Inject constructor( .subscribe { newState { copy( - canSend = (it.first.isNotBlank() || (it.second > 0)) || (it.third > 0) + canSend = (it.first.isNotBlank() || (it.second > 0)), + scheduled = it.third ) } } @@ -1151,6 +1181,7 @@ class ComposeViewModel @Inject constructor( } val subId = state.subscription?.subscriptionId ?: -1 + val conversationId = (conversation.id) val addresses = when (conversation.recipients.isNotEmpty()) { true -> conversation.recipients.map { it.address } false -> chips.map { chip -> chip.address } @@ -1169,9 +1200,13 @@ class ComposeViewModel @Inject constructor( addresses, sendAsGroup, body.toString(), - state.attachments.map { it.uri } - ) + state.attachments.map { it.uri }, + conversationId ) + ).also { + newState { copy(scheduled = 0) } + showScheduledToast = true + } scheduled = true } @@ -1194,8 +1229,10 @@ class ComposeViewModel @Inject constructor( .doOnNext { scheduled -> view.focusMessage() - if (scheduled) + if (showScheduledToast) { context.makeToast(R.string.compose_scheduled_toast) + showScheduledToast = false + } } .autoDisposable(view.scope()) .subscribe() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 785ae8e5..b2e5d535 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -72,8 +72,10 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.* -import kotlinx.android.synthetic.main.message_list_item_in.parts import kotlinx.android.synthetic.main.message_list_item_in.body +import kotlinx.android.synthetic.main.message_list_item_in.reactionText +import kotlinx.android.synthetic.main.message_list_item_in.parts +import kotlinx.android.synthetic.main.message_list_item_in.reactions import kotlinx.android.synthetic.main.message_list_item_in.sim import kotlinx.android.synthetic.main.message_list_item_in.simIndex import kotlinx.android.synthetic.main.message_list_item_in.status @@ -95,7 +97,7 @@ class MessagesAdapter @Inject constructor( private val phoneNumberUtils: PhoneNumberUtils, private val prefs: Preferences, private val textViewStyler: TextViewStyler, -) : QkRealmAdapter() { +) : QkRealmAdapter() { class AudioState( var partId: Long = -1, var state: QkMediaPlayer.PlayingState = QkMediaPlayer.PlayingState.Stopped, @@ -390,6 +392,50 @@ class MessagesAdapter @Inject constructor( contextMenuValue = message.id clicks.subscribe(partClicks) // part clicks gets passed back to compose view model } + + showEmojiReactions(holder, message) + } + + private fun showEmojiReactions(holder: QkViewHolder, message: Message) { + holder.reactions?.let { reactionsContainer -> + val reactions = message.emojiReactions + val hasReactions = reactions.isNotEmpty() + + if (hasReactions) { + val reactionCounts = reactions.groupBy { it.emoji } + .mapValues { it.value.size } + .toList() + .sortedByDescending { it.second } // Sort by count, most reactions first + + // For now, show just the first (most popular) reaction + val topReaction = reactionCounts.first() + val reactionText = if (topReaction.second == 1) { + topReaction.first + } else { + // Use a non-breaking space to keep the emoji and count together + "${topReaction.first}\u00A0${topReaction.second}" + } + + holder.reactionText?.text = reactionText + reactionsContainer.setVisible(true) + makeRoomForEmojis(holder) + } else { + reactionsContainer.setVisible(false) + } + } + } + + private fun makeRoomForEmojis(holder: QkViewHolder) { + val paddingBottom = 25.dpToPx(context) + + (holder.reactions?.parent?.parent as? ViewGroup)?.let { parent -> + parent.setPadding( + parent.paddingLeft, + parent.paddingTop, + parent.paddingRight, + paddingBottom + ) + } } private fun bindStatus( @@ -472,4 +518,4 @@ class MessagesAdapter @Inject constructor( } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt index 96474577..b67715ad 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt @@ -23,36 +23,34 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.RelativeLayout import androidx.recyclerview.widget.RecyclerView -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.common.util.extensions.dpToPx +import dev.octoshrimpy.quik.databinding.ContactChipBinding import dev.octoshrimpy.quik.model.Recipient import io.reactivex.subjects.PublishSubject -import kotlinx.android.synthetic.main.contact_chip.* import javax.inject.Inject -class ChipsAdapter @Inject constructor() : QkAdapter() { +class ChipsAdapter @Inject constructor() : QkAdapter>() { var view: RecyclerView? = null val chipDeleted: PublishSubject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val inflater = LayoutInflater.from(parent.context) - val view = inflater.inflate(R.layout.contact_chip, parent, false) - return QkViewHolder(view).apply { - view.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ContactChipBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.root.setOnClickListener { val chip = getItem(adapterPosition) - showDetailedChip(view.context, chip) + showDetailedChip(binding.root.context, chip) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val recipient = getItem(position) - holder.avatar.setRecipient(recipient) - holder.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address + holder.binding.avatar.setRecipient(recipient) + holder.binding.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address } /** diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt index 5d2658aa..7260bc84 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt @@ -22,23 +22,22 @@ import android.view.LayoutInflater import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.databinding.ContactNumberListItemBinding import dev.octoshrimpy.quik.model.PhoneNumber -import kotlinx.android.synthetic.main.contact_number_list_item.* -class PhoneNumberAdapter : QkAdapter() { +class PhoneNumberAdapter : QkAdapter>() { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val inflater = LayoutInflater.from(parent.context) - val view = inflater.inflate(R.layout.contact_number_list_item, parent, false) - return QkViewHolder(view) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ContactNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding) } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val number = getItem(position) - holder.address.text = number.address - holder.type.text = number.type + holder.binding.address.text = number.address + holder.binding.type.text = number.type } override fun areItemsTheSame(old: PhoneNumber, new: PhoneNumber): Boolean { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt index 1a84cb68..cee1a302 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt @@ -26,6 +26,7 @@ import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.editorActions import com.jakewharton.rxbinding2.widget.textChanges +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.ViewModelFactory import dev.octoshrimpy.quik.common.base.QkThemedActivity @@ -37,7 +38,6 @@ import dev.octoshrimpy.quik.feature.compose.editing.ComposeItem import dev.octoshrimpy.quik.feature.compose.editing.ComposeItemAdapter import dev.octoshrimpy.quik.feature.compose.editing.PhoneNumberAction import dev.octoshrimpy.quik.feature.compose.editing.PhoneNumberPickerAdapter -import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt index 943d83bd..d45a7925 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.contacts import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey @Module class ContactsActivityModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt index 3dbcad44..80fe0ec6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.contacts import android.view.inputmethod.EditorInfo +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.base.QkViewModel import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.extensions.removeAccents @@ -35,12 +37,9 @@ import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import io.realm.RealmList import kotlinx.coroutines.runBlocking diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt index bf8cb5b0..16069617 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt @@ -22,9 +22,9 @@ import android.os.Bundle import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.container_activity.* class ConversationInfoActivity : QkThemedActivity() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt index 35182204..e34663e9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt @@ -31,6 +31,7 @@ class ConversationInfoAdapter @Inject constructor( val themeClicks: Subject = PublishSubject.create() val nameClicks: Subject = PublishSubject.create() val notificationClicks: Subject = PublishSubject.create() + val markUnreadClicks: Subject = PublishSubject.create() val archiveClicks: Subject = PublishSubject.create() val blockClicks: Subject = PublishSubject.create() val deleteClicks: Subject = PublishSubject.create() @@ -60,6 +61,7 @@ class ConversationInfoAdapter @Inject constructor( 1 -> QkViewHolder(inflater.inflate(R.layout.conversation_info_settings, parent, false)).apply { groupName.clicks().subscribe(nameClicks) notifications.clicks().subscribe(notificationClicks) + markUnread.clicks().subscribe(markUnreadClicks) archive.clicks().subscribe(archiveClicks) block.clicks().subscribe(blockClicks) delete.clicks().subscribe(deleteClicks) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt index 032e59ac..e7c64578 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt @@ -22,6 +22,8 @@ import android.view.View import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.GridLayoutManager import com.bluelinelabs.conductor.RouterTransaction +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.QkChangeHandler @@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.feature.blocking.BlockingDialog import dev.octoshrimpy.quik.feature.conversationinfo.injection.ConversationInfoModule import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.appComponent -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -102,6 +102,7 @@ class ConversationInfoController( override fun nameClicks(): Observable<*> = adapter.nameClicks override fun nameChanges(): Observable = nameChangeSubject override fun notificationClicks(): Observable<*> = adapter.notificationClicks + override fun markUnreadClicks(): Observable<*> = adapter.markUnreadClicks override fun archiveClicks(): Observable<*> = adapter.archiveClicks override fun blockClicks(): Observable<*> = adapter.blockClicks override fun deleteClicks(): Observable<*> = adapter.deleteClicks @@ -132,5 +133,4 @@ class ConversationInfoController( .setNegativeButton(R.string.button_cancel, null) .show() } - -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index fcd3a6c5..209c56fe 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt @@ -20,6 +20,8 @@ package dev.octoshrimpy.quik.feature.conversationinfo import android.content.Context import androidx.lifecycle.Lifecycle +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter @@ -32,16 +34,14 @@ import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoItem.Conver import dev.octoshrimpy.quik.interactor.DeleteConversations import dev.octoshrimpy.quik.interactor.MarkArchived import dev.octoshrimpy.quik.interactor.MarkUnarchived +import dev.octoshrimpy.quik.interactor.MarkUnread import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.model.Conversation import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject @@ -54,6 +54,7 @@ class ConversationInfoPresenter @Inject constructor( private val context: Context, private val conversationRepo: ConversationRepository, private val deleteConversations: DeleteConversations, + private val markUnread: MarkUnread, private val markArchived: MarkArchived, private val markUnarchived: MarkUnarchived, private val navigator: Navigator, @@ -159,6 +160,14 @@ class ConversationInfoPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe { conversation -> navigator.showNotificationSettings(conversation.id) } + view.markUnreadClicks() + .withLatestFrom(conversation) { _, conversation -> conversation } + .autoDisposable(view.scope()) + .subscribe {conversation -> + markUnread.execute(listOf(conversation.id)) + navigator.showMainActivity() + } + // Toggle the archived state of the conversation view.archiveClicks() .withLatestFrom(conversation) { _, conversation -> conversation } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt index b0ab0561..cf0124bb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt @@ -29,6 +29,7 @@ interface ConversationInfoView : QkViewContract { fun nameClicks(): Observable<*> fun nameChanges(): Observable fun notificationClicks(): Observable<*> + fun markUnreadClicks(): Observable<*> fun archiveClicks(): Observable<*> fun blockClicks(): Observable<*> fun deleteClicks(): Observable<*> diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt index 35cfdb03..80255a12 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt @@ -18,9 +18,9 @@ */ package dev.octoshrimpy.quik.feature.conversationinfo.injection +import dagger.Subcomponent import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController import dev.octoshrimpy.quik.injection.scope.ControllerScope -import dagger.Subcomponent @ControllerScope @Subcomponent(modules = [ConversationInfoModule::class]) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt index 7edc22ec..7fde018b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt @@ -18,10 +18,10 @@ */ package dev.octoshrimpy.quik.feature.conversationinfo.injection -import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController -import dev.octoshrimpy.quik.injection.scope.ControllerScope import dagger.Module import dagger.Provides +import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController +import dev.octoshrimpy.quik.injection.scope.ControllerScope import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt index e5a82ca5..ffad063a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt @@ -23,8 +23,8 @@ import android.graphics.Typeface import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.text.buildSpannedString -import androidx.core.text.color import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkRealmAdapter @@ -34,7 +34,9 @@ import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setTint import dev.octoshrimpy.quik.model.Conversation +import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils +import io.reactivex.disposables.CompositeDisposable import kotlinx.android.synthetic.main.conversation_list_item.* import kotlinx.android.synthetic.main.conversation_list_item.view.* import javax.inject.Inject @@ -43,9 +45,11 @@ class ConversationsAdapter @Inject constructor( private val colors: Colors, private val context: Context, private val dateFormatter: DateFormatter, + private val scheduledMessageRepo: ScheduledMessageRepository, private val navigator: Navigator, private val phoneNumberUtils: PhoneNumberUtils -) : QkRealmAdapter() { +) : QkRealmAdapter() { + private val disposables = CompositeDisposable() init { // This is how we access the threadId for the swipe actions @@ -118,6 +122,16 @@ class ConversationsAdapter @Inject constructor( // Make the preview in italics if draft if (conversation.draft.isNotEmpty()) holder.snippet.setTypeface(null, Typeface.ITALIC) + // Get Scheduled Messages + val disposable = scheduledMessageRepo + .getScheduledMessagesForConversation(conversation.id) + .asFlowable() + .toObservable() + .subscribe { messages -> + holder.scheduled.isVisible = messages.isNotEmpty() + } + disposables.add(disposable) + holder.pinned.isVisible = conversation.pinned holder.unread.setTint(theme) } @@ -130,4 +144,10 @@ class ConversationsAdapter @Inject constructor( return if (getItem(position)?.unread == false) 0 else 1 } + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { + super.onDetachedFromRecyclerView(recyclerView) + disposables.clear() + } + + } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt index 1329b315..2189035b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt @@ -29,12 +29,12 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkActivity import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.model.MmsPart -import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt index a0d28c03..09a77518 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt @@ -20,10 +20,10 @@ package dev.octoshrimpy.quik.feature.gallery import android.content.Intent import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt index c6497932..65882e5b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt @@ -45,7 +45,7 @@ import kotlinx.android.synthetic.main.gallery_video_page.* import java.util.* import javax.inject.Inject -class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter() { +class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter() { companion object { private const val VIEW_TYPE_INVALID = 0 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt index a650ed8b..c5c64e41 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt @@ -20,6 +20,8 @@ package dev.octoshrimpy.quik.feature.gallery import android.content.Context import com.moez.QKSMS.contentproviders.MmsPartProvider +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel @@ -29,11 +31,8 @@ import dev.octoshrimpy.quik.interactor.SaveImage import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject import javax.inject.Named diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt index fd4c3567..7288d9fc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt @@ -21,13 +21,11 @@ package dev.octoshrimpy.quik.feature.main import android.content.Context import dev.octoshrimpy.quik.experiment.Experiment import dev.octoshrimpy.quik.experiment.Variant -import dev.octoshrimpy.quik.manager.AnalyticsManager import javax.inject.Inject class DrawerBadgesExperiment @Inject constructor( context: Context, - analyticsManager: AnalyticsManager -) : Experiment(context, analyticsManager) { +) : Experiment(context) { override val key: String = "Drawer Badges" diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 458282cd..d2244b48 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.feature.main import android.Manifest import android.animation.ObjectAnimator -import android.app.AlertDialog import android.content.Intent import android.content.res.ColorStateList import android.os.Build @@ -31,6 +30,7 @@ import android.view.MenuItem import android.view.View import android.view.ViewStub import androidx.appcompat.app.ActionBarDrawerToggle +import androidx.appcompat.app.AlertDialog import androidx.core.app.ActivityCompat import androidx.core.view.GravityCompat import androidx.core.view.isVisible @@ -41,6 +41,9 @@ import androidx.recyclerview.widget.ItemTouchHelper import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.androidxcompat.drawerOpen @@ -52,16 +55,13 @@ import dev.octoshrimpy.quik.common.util.extensions.scrapViews import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.common.widget.TextInputDialog import dev.octoshrimpy.quik.feature.blocking.BlockingDialog import dev.octoshrimpy.quik.feature.changelog.ChangelogDialog import dev.octoshrimpy.quik.feature.conversations.ConversationItemTouchCallback import dev.octoshrimpy.quik.feature.conversations.ConversationsAdapter import dev.octoshrimpy.quik.manager.ChangelogManager import dev.octoshrimpy.quik.repository.SyncRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dagger.android.AndroidInjection -import dev.octoshrimpy.quik.common.widget.TextInputDialog import io.reactivex.Observable import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject @@ -255,8 +255,10 @@ class MainActivity : QkThemedActivity(), MainView { findItem(R.id.add)?.isVisible = addContact && selectedConversations != 0 findItem(R.id.pin)?.isVisible = markPinned && selectedConversations != 0 findItem(R.id.unpin)?.isVisible = !markPinned && selectedConversations != 0 - findItem(R.id.read)?.isVisible = markRead && selectedConversations != 0 - findItem(R.id.unread)?.isVisible = !markRead && selectedConversations != 0 + findItem(R.id.read)?.isVisible = ( markRead && selectedConversations != 0 ) || + selectedConversations > 1 + findItem(R.id.unread)?.isVisible = ( !markRead && selectedConversations != 0 ) || + selectedConversations > 1 findItem(R.id.block)?.isVisible = selectedConversations != 0 findItem(R.id.rename)?.isVisible = selectedConversations == 1 } @@ -440,10 +442,14 @@ class MainActivity : QkThemedActivity(), MainView { override fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) = changelogDialog.show(changelog) - override fun showArchivedSnackbar(countConversationsArchived: Int) = + override fun showArchivedSnackbar(countConversationsArchived: Int, isArchiving: Boolean) = Snackbar.make( drawerLayout, - resources.getQuantityString(R.plurals.toast_archived, countConversationsArchived, countConversationsArchived), + if (isArchiving) { + resources.getQuantityString(R.plurals.toast_archived, countConversationsArchived, countConversationsArchived) + } else { + resources.getQuantityString(R.plurals.toast_unarchived, countConversationsArchived, countConversationsArchived) + }, if (countConversationsArchived < 10) Snackbar.LENGTH_LONG else Snackbar.LENGTH_INDEFINITE ).let { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt index 41e8358a..b877251b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt @@ -19,11 +19,11 @@ package dev.octoshrimpy.quik.feature.main import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey -import dev.octoshrimpy.quik.injection.scope.ActivityScope import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey +import dev.octoshrimpy.quik.injection.scope.ActivityScope import io.reactivex.disposables.CompositeDisposable @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt index e33ca5b5..f489d7a2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt @@ -54,7 +54,7 @@ interface MainView : QkView { fun showDeleteDialog(conversations: List) fun showRenameDialog(conversationName: String) fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) - fun showArchivedSnackbar(countConversationsArchived: Int) + fun showArchivedSnackbar(countConversationsArchived: Int, isArchiving: Boolean) fun drawerToggled(opened: Boolean) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index fb4c108f..cdfe7194 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.main import androidx.recyclerview.widget.ItemTouchHelper +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel @@ -32,6 +34,7 @@ import dev.octoshrimpy.quik.interactor.MarkUnarchived import dev.octoshrimpy.quik.interactor.MarkUnpinned import dev.octoshrimpy.quik.interactor.MarkUnread import dev.octoshrimpy.quik.interactor.MigratePreferences +import dev.octoshrimpy.quik.interactor.SpeakThreads import dev.octoshrimpy.quik.interactor.SyncContacts import dev.octoshrimpy.quik.interactor.SyncMessages import dev.octoshrimpy.quik.listener.ContactAddedListener @@ -39,23 +42,21 @@ import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.ChangelogManager import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.manager.RatingManager +import dev.octoshrimpy.quik.model.EmojiSyncNeeded import dev.octoshrimpy.quik.model.SyncLog import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.EmojiReactionRepository +import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dev.octoshrimpy.quik.interactor.SpeakThreads -import dev.octoshrimpy.quik.repository.MessageRepository import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import io.realm.Realm import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import java.util.* +import java.util.Locale import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -80,6 +81,7 @@ class MainViewModel @Inject constructor( private val permissionManager: PermissionManager, private val prefs: Preferences, private val ratingManager: RatingManager, + private val reactions: EmojiReactionRepository, private val syncContacts: SyncContacts, private val syncMessages: SyncMessages ) : QkViewModel( @@ -122,6 +124,15 @@ class MainViewModel @Inject constructor( syncMessages.execute(Unit) } + // This is only used when we update to a version that newly supports emoji reactions + Realm.getDefaultInstance().executeTransactionAsync { realm -> + val emojiSyncNeeded = realm.where(EmojiSyncNeeded::class.java).findFirst() + if (emojiSyncNeeded != null) { + reactions.deleteAndReparseAllEmojiReactions(realm) + emojiSyncNeeded.deleteFromRealm() + } + } + // Sync contacts when we detect a change if (permissionManager.hasContacts()) { disposables += contactAddedListener.listen() @@ -318,7 +329,7 @@ class MainViewModel @Inject constructor( else -> newState { copy(hasError = true) } } NavItem.BACKUP -> navigator.showBackup() - NavItem.SCHEDULED -> navigator.showScheduled() + NavItem.SCHEDULED -> navigator.showScheduled(null) NavItem.BLOCKING -> navigator.showBlockedConversations() NavItem.SETTINGS -> navigator.showSettings() // NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu") @@ -349,7 +360,7 @@ class MainViewModel @Inject constructor( .withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> markArchived.execute(conversations) lastArchivedThreadIds = conversations.toList() - view.showArchivedSnackbar(lastArchivedThreadIds.count()) + view.showArchivedSnackbar(lastArchivedThreadIds.count(), true) view.clearSelection() } .autoDisposable(view.scope()) @@ -359,7 +370,7 @@ class MainViewModel @Inject constructor( .filter { itemId -> itemId == R.id.unarchive } .withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> markUnarchived.execute(conversations.toList()) - view.showArchivedSnackbar(conversations.count()) + view.showArchivedSnackbar(conversations.count(), false) view.clearSelection() } .autoDisposable(view.scope()) @@ -468,7 +479,11 @@ class MainViewModel @Inject constructor( ?.recipients?.first() ?.takeIf { recipient -> recipient.contact == null } != null val pin = conversations.sumBy { if (it.pinned) -1 else 1 } >= 0 - val read = conversations.sumBy { if (!it.unread) -1 else 1 } >= 0 + val read = when (conversations.size) { + 0 -> false + 1 -> conversations[0].unread + else -> true + } val selected = selection.size when (state.page) { @@ -524,7 +539,7 @@ class MainViewModel @Inject constructor( Preferences.SWIPE_ACTION_ARCHIVE -> markArchived.execute(listOf(threadId)) { lastArchivedThreadIds = listOf(threadId) - view.showArchivedSnackbar(1) + view.showArchivedSnackbar(1, true) } Preferences.SWIPE_ACTION_DELETE -> view.showDeleteDialog(listOf(threadId)) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt index 6e7a6fd9..437bcbf6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt @@ -27,13 +27,13 @@ import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.extensions.removeAccents import dev.octoshrimpy.quik.model.SearchResult -import kotlinx.android.synthetic.main.search_list_item.* +import dev.octoshrimpy.quik.databinding.SearchListItemBinding import javax.inject.Inject class SearchAdapter @Inject constructor( @@ -41,26 +41,25 @@ class SearchAdapter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter, private val navigator: Navigator -) : QkAdapter() { +) : QkAdapter>() { private val highlightColor: Int by lazy { colors.theme().highlight } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val layoutInflater = LayoutInflater.from(parent.context) - val view = layoutInflater.inflate(R.layout.search_list_item, parent, false) - return QkViewHolder(view).apply { - view.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = SearchListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + itemView.setOnClickListener { val result = getItem(adapterPosition) navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 }) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val previous = data.getOrNull(position - 1) val result = getItem(position) - holder.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0) + holder.binding.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0) val query = result.query val title = SpannableString(result.conversation.getTitle()) @@ -70,23 +69,23 @@ class SearchAdapter @Inject constructor( title.setSpan(BackgroundColorSpan(highlightColor), index, index + query.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) index = title.indexOf(query, index + query.length, true) } - holder.title.text = title + holder.binding.title.text = title - holder.avatars.recipients = result.conversation.recipients + holder.binding.avatars.recipients = result.conversation.recipients when (result.messages == 0) { true -> { - holder.date.setVisible(true) - holder.date.text = dateFormatter.getConversationTimestamp(result.conversation.date) - holder.snippet.text = when (result.conversation.me) { + holder.binding.date.setVisible(true) + holder.binding.date.text = dateFormatter.getConversationTimestamp(result.conversation.date) + holder.binding.snippet.text = when (result.conversation.me) { true -> context.getString(R.string.main_sender_you, result.conversation.snippet) false -> result.conversation.snippet } } false -> { - holder.date.setVisible(false) - holder.snippet.text = context.getString(R.string.main_message_results, result.messages) + holder.binding.date.setVisible(false) + holder.binding.snippet.text = context.getString(R.string.main_message_results, result.messages) } } } @@ -100,4 +99,4 @@ class SearchAdapter @Inject constructor( old.conversation.id == new.conversation.id // Conversation id is the same && old.messages == new.messages // Result count is the same } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt index 37ecdbf5..0d5cac73 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt @@ -28,15 +28,15 @@ import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.QkDialog import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.widget.PreferenceView -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt index fe5d93e3..ce1873d1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.notificationprefs import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt index 44b7a3e3..56707b9b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -21,17 +21,16 @@ package dev.octoshrimpy.quik.feature.notificationprefs import android.content.Context import android.media.RingtoneManager import android.net.Uri +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import javax.inject.Inject import javax.inject.Named diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index 4434362e..0a606f49 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -24,7 +24,7 @@ import androidx.core.view.children import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks -import dev.octoshrimpy.quik.BuildConfig +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.FontProvider @@ -36,10 +36,7 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.widget.PreferenceView import dev.octoshrimpy.quik.feature.plus.experiment.UpgradeButtonExperiment import dev.octoshrimpy.quik.manager.BillingManager -import dagger.android.AndroidInjection -import kotlinx.android.synthetic.main.collapsing_toolbar.* -import kotlinx.android.synthetic.main.preference_view.view.* -import kotlinx.android.synthetic.main.qksms_plus_activity.* +import dev.octoshrimpy.quik.databinding.QksmsPlusActivityBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch @@ -53,66 +50,68 @@ class PlusActivity : QkThemedActivity(), PlusView { @Inject lateinit var viewModelFactory: ViewModelProvider.Factory private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] } + private lateinit var binding: QksmsPlusActivityBinding - override val upgradeIntent by lazy { upgrade.clicks() } - override val upgradeDonateIntent by lazy { upgradeDonate.clicks() } - override val donateIntent by lazy { donate.clicks() } - override val themeClicks by lazy { themes.clicks() } - override val scheduleClicks by lazy { schedule.clicks() } - override val backupClicks by lazy { backup.clicks() } - override val delayedClicks by lazy { delayed.clicks() } - override val nightClicks by lazy { night.clicks() } + override val upgradeIntent get() = binding.upgrade.clicks() + override val upgradeDonateIntent get() = binding.upgradeDonate.clicks() + override val donateIntent get() = binding.donate.clicks() + override val themeClicks get() = binding.themes.clicks() + override val scheduleClicks get() = binding.schedule.clicks() + override val backupClicks get() = binding.backup.clicks() + override val delayedClicks get() = binding.delayed.clicks() + override val nightClicks get() = binding.night.clicks() override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.qksms_plus_activity) + binding = QksmsPlusActivityBinding.inflate(layoutInflater) + setContentView(binding.root) setTitle(R.string.title_qksms_plus) showBackButton(true) viewModel.bindView(this) - free.setVisible(false) + binding.free.setVisible(false) if (!prefs.systemFont.get()) { fontProvider.getLato { lato -> val typeface = Typeface.create(lato, Typeface.BOLD) - collapsingToolbar.setCollapsedTitleTypeface(typeface) - collapsingToolbar.setExpandedTitleTypeface(typeface) + binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTypeface(typeface) + binding.toolbarLayout.collapsingToolbar.setExpandedTitleTypeface(typeface) } } // Make the list titles bold - linearLayout.children - .mapNotNull { it as? PreferenceView } - .map { it.titleView } - .forEach { it.setTypeface(it.typeface, Typeface.BOLD) } + binding.linearLayout.children + .mapNotNull { it as? PreferenceView } + .map { it.titleTextView } + .forEach { it.setTypeface(it.typeface, Typeface.BOLD) } val textPrimary = resolveThemeColor(android.R.attr.textColorPrimary) - collapsingToolbar.setCollapsedTitleTextColor(textPrimary) - collapsingToolbar.setExpandedTitleColor(textPrimary) + binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTextColor(textPrimary) + binding.toolbarLayout.collapsingToolbar.setExpandedTitleColor(textPrimary) val theme = colors.theme().theme - donate.setBackgroundTint(theme) - upgrade.setBackgroundTint(theme) - thanksIcon.setTint(theme) + binding.donate.setBackgroundTint(theme) + binding.upgrade.setBackgroundTint(theme) + binding.thanksIcon.setTint(theme) } override fun render(state: PlusState) { - description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice) - upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency) - upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency) + binding.description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice) + binding.upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency) + binding.upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency) - val fdroid = BuildConfig.FLAVOR == "noAnalytics" + val fdroid = true - free.setVisible(fdroid) - toUpgrade.setVisible(!fdroid && !state.upgraded) - upgraded.setVisible(!fdroid && state.upgraded) + binding.free.setVisible(fdroid) + binding.toUpgrade.setVisible(!fdroid && !state.upgraded) + binding.upgraded.setVisible(!fdroid && state.upgraded) - themes.isEnabled = state.upgraded - schedule.isEnabled = state.upgraded - backup.isEnabled = state.upgraded - delayed.isEnabled = state.upgraded - night.isEnabled = state.upgraded + binding.themes.isEnabled = state.upgraded + binding.schedule.isEnabled = state.upgraded + binding.backup.isEnabled = state.upgraded + binding.delayed.isEnabled = state.upgraded + binding.night.isEnabled = state.upgraded } override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) { @@ -126,4 +125,4 @@ class PlusActivity : QkThemedActivity(), PlusView { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt index b0b1f814..b1ec4d7b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.plus import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey @Module class PlusActivityModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index 8b18658f..8f84e6cc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt @@ -18,18 +18,16 @@ */ package dev.octoshrimpy.quik.feature.plus -import dev.octoshrimpy.quik.common.Navigator -import dev.octoshrimpy.quik.common.base.QkViewModel -import dev.octoshrimpy.quik.manager.AnalyticsManager -import dev.octoshrimpy.quik.manager.BillingManager import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable +import dev.octoshrimpy.quik.common.Navigator +import dev.octoshrimpy.quik.common.base.QkViewModel +import dev.octoshrimpy.quik.manager.BillingManager import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject class PlusViewModel @Inject constructor( - private val analyticsManager: AnalyticsManager, private val billingManager: BillingManager, private val navigator: Navigator ) : QkViewModel(PlusState()) { @@ -55,7 +53,6 @@ class PlusViewModel @Inject constructor( Observable.merge( view.upgradeIntent.map { BillingManager.SKU_PLUS }, view.upgradeDonateIntent.map { BillingManager.SKU_PLUS_DONATE }) -// .doOnNext { sku -> analyticsManager.track("Clicked Upgrade", Pair("sku", sku)) } .autoDisposable(view.scope()) .subscribe { sku -> view.initiatePurchaseFlow(billingManager, sku) } @@ -69,7 +66,7 @@ class PlusViewModel @Inject constructor( view.scheduleClicks .autoDisposable(view.scope()) - .subscribe { navigator.showScheduled() } + .subscribe { navigator.showScheduled(null) } view.backupClicks .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt index 1d38c371..eee7cc1b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt @@ -22,13 +22,11 @@ import android.content.Context import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.experiment.Experiment import dev.octoshrimpy.quik.experiment.Variant -import dev.octoshrimpy.quik.manager.AnalyticsManager import javax.inject.Inject class UpgradeButtonExperiment @Inject constructor( context: Context, - analytics: AnalyticsManager -) : Experiment(context, analytics) { +) : Experiment(context) { override val key: String = "Upgrade Button" diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt index ab20b9b4..9362fc76 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt @@ -38,14 +38,14 @@ import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.autoScrollToStart import dev.octoshrimpy.quik.common.util.extensions.setVisible -import dev.octoshrimpy.quik.feature.compose.MessagesAdapter -import dagger.android.AndroidInjection import dev.octoshrimpy.quik.common.util.extensions.showKeyboard import dev.octoshrimpy.quik.common.widget.QkEditText +import dev.octoshrimpy.quik.feature.compose.MessagesAdapter import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.message diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt index 0f5639d9..3dcb5785 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.qkreply import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt index b37674f1..7c49ede9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.qkreply import android.telephony.SmsMessage +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel @@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index 2a2bc890..10b90752 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -21,15 +21,16 @@ package dev.octoshrimpy.quik.feature.scheduled import android.os.Bundle import android.view.Menu import android.view.MenuItem +import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint -import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.main_activity.toolbar @@ -51,7 +52,9 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override val editScheduledMessage: Subject = PublishSubject.create() override val backPressedIntent: Subject = PublishSubject.create() - private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] } + private val viewModel by lazy { + ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] + } override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) @@ -97,7 +100,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { ((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages == 1)) // show compose button - compose.isVisible = state.upgraded + compose.isVisible = state.upgraded && (state.conversationId == null) upgrade.isVisible = !state.upgraded } @@ -109,7 +112,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override fun showDeleteDialog(messages: List) { val count = messages.size - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.dialog_delete_title) .setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count)) .setPositiveButton(R.string.button_delete) { _, _ -> deleteScheduledMessages.onNext(messages) } @@ -119,7 +122,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override fun showSendNowDialog(messages: List) { val count = messages.size - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.main_menu_send_now) .setMessage(resources.getQuantityString(R.plurals.dialog_send_now, count, count)) .setPositiveButton(R.string.main_menu_send_now) { _, _ -> sendScheduledMessages.onNext(messages) } @@ -128,7 +131,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { } override fun showEditMessageDialog(message: Long) { - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.dialog_edit_scheduled_message_title) .setMessage(R.string.dialog_edit_scheduled_message) .setPositiveButton(R.string.dialog_edit_scheduled_message_positive_button) { _, _ -> @@ -152,4 +155,4 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { finish() } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt index 7938364e..333040b1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt @@ -19,10 +19,11 @@ package dev.octoshrimpy.quik.feature.scheduled import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey +import javax.inject.Named @Module class ScheduledActivityModule { @@ -32,4 +33,9 @@ class ScheduledActivityModule { @ViewModelKey(ScheduledViewModel::class) fun provideScheduledViewModel(viewModel: ScheduledViewModel): ViewModel = viewModel -} \ No newline at end of file + @Provides + @Named("conversationId") + fun getConversationId(activity: ScheduledActivity): + Long? = activity.intent.extras?.getLong("conversationId") + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt index f42f6a66..991c1ab0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt @@ -26,7 +26,8 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.databinding.ScheduledMessageListItemBinding import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.model.Contact import dev.octoshrimpy.quik.model.Recipient @@ -35,8 +36,6 @@ import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.scheduled_message_list_item.* -import kotlinx.android.synthetic.main.scheduled_message_list_item.view.* import javax.inject.Inject class ScheduledMessageAdapter @Inject constructor( @@ -44,7 +43,7 @@ class ScheduledMessageAdapter @Inject constructor( private val contactRepo: ContactRepository, private val dateFormatter: DateFormatter, private val phoneNumberUtils: PhoneNumberUtils -) : QkRealmAdapter() { +) : QkRealmAdapter>() { private val contacts by lazy { contactRepo.getContacts() } private val contactCache = ContactCache() @@ -52,45 +51,48 @@ class ScheduledMessageAdapter @Inject constructor( val clicks: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ScheduledMessageListItemBinding.inflate( + LayoutInflater.from(parent.context), parent, false + ) - view.attachments.adapter = ScheduledMessageAttachmentAdapter(context) - view.attachments.setRecycledViewPool(imagesViewPool) + binding.attachments.adapter = ScheduledMessageAttachmentAdapter(context) + binding.attachments.setRecycledViewPool(imagesViewPool) - return QkViewHolder(view).apply { - view.setOnClickListener { + return QkBindingViewHolder(binding).apply { + binding.root.setOnClickListener { val message = getItem(adapterPosition) ?: return@setOnClickListener if (toggleSelection(message.id, false)) - view.isActivated = isSelected(message.id) + binding.root.isActivated = isSelected(message.id) } - view.setOnClickListener { + binding.root.setOnClickListener { val message = getItem(adapterPosition) ?: return@setOnClickListener toggleSelection(message.id) - view.isActivated = isSelected(message.id) + binding.root.isActivated = isSelected(message.id) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val message = getItem(position) ?: return // GroupAvatarView only accepts recipients, so map the phone numbers to recipients - holder.avatars.recipients = message.recipients.map { address -> Recipient(address = address) } + holder.binding.avatars.recipients = + message.recipients.map { address -> Recipient(address = address) } - holder.recipients.text = message.recipients.joinToString(",") { address -> + holder.binding.recipients.text = message.recipients.joinToString(",") { address -> contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address } - holder.date.text = dateFormatter.getScheduledTimestamp(message.date) - holder.body.text = message.body + holder.binding.date.text = dateFormatter.getScheduledTimestamp(message.date) + holder.binding.body.text = message.body // update the selected/highlighted state - holder.containerView.isActivated = isSelected(message.id) || highlight == message.id + holder.binding.root.isActivated = isSelected(message.id) || highlight == message.id - val adapter = holder.attachments.adapter as ScheduledMessageAttachmentAdapter + val adapter = holder.binding.attachments.adapter as ScheduledMessageAttachmentAdapter adapter.data = message.attachments.map(Uri::parse) - holder.attachments.isVisible = message.attachments.isNotEmpty() + holder.binding.attachments.isVisible = message.attachments.isNotEmpty() } override fun getItemId(position: Int): Long { @@ -111,10 +113,7 @@ class ScheduledMessageAdapter @Inject constructor( } }) } - return super.get(key)?.takeIf { it.isValid } } - } - } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt index 4e181c98..ae01c494 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt @@ -25,45 +25,40 @@ import android.view.View import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.extensions.getName import dev.octoshrimpy.quik.feature.extensions.LoadBestIconIntoImageView import dev.octoshrimpy.quik.feature.extensions.loadBestIconIntoImageView -import kotlinx.android.synthetic.main.scheduled_message_image_list_item.fileName -import kotlinx.android.synthetic.main.scheduled_message_image_list_item.thumbnail +import dev.octoshrimpy.quik.databinding.ScheduledMessageImageListItemBinding import javax.inject.Inject class ScheduledMessageAttachmentAdapter @Inject constructor( private val context: Context -) : QkAdapter() { +) : QkAdapter>() { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - return QkViewHolder( - LayoutInflater - .from(parent.context) - .inflate(R.layout.scheduled_message_image_list_item, parent, false) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder = + QkBindingViewHolder( + ScheduledMessageImageListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) ) - } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val uri = getItem(position) // set best image and text to use for icon - when (getItem(position).loadBestIconIntoImageView(context, holder.thumbnail)) { + when (getItem(position).loadBestIconIntoImageView(context, holder.binding.thumbnail)) { LoadBestIconIntoImageView.Missing -> { - holder.fileName.text = context.getString(R.string.attachment_missing) - holder.fileName.visibility = View.VISIBLE + holder.binding.fileName.text = context.getString(R.string.attachment_missing) + holder.binding.fileName.visibility = View.VISIBLE } LoadBestIconIntoImageView.ActivityIcon, LoadBestIconIntoImageView.DefaultAudioIcon, LoadBestIconIntoImageView.GenericIcon -> { // generic style icon used, also show name - holder.fileName.text = uri.getName(context) - holder.fileName.visibility = View.VISIBLE + holder.binding.fileName.text = uri.getName(context) + holder.binding.fileName.visibility = View.VISIBLE } - else -> holder.fileName.visibility = View.GONE + else -> holder.binding.fileName.visibility = View.GONE } } - } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt index 92d42439..25b790e7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt @@ -25,4 +25,5 @@ data class ScheduledState( val scheduledMessages: RealmResults? = null, val upgraded: Boolean = true, val selectedMessages: Int = 0, + val conversationId: Long? = null, ) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index 62e8a7a9..3a8d627e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -1,23 +1,24 @@ package dev.octoshrimpy.quik.feature.scheduled import android.content.Context +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel +import dev.octoshrimpy.quik.common.util.ClipboardUtils +import dev.octoshrimpy.quik.interactor.DeleteScheduledMessages import dev.octoshrimpy.quik.interactor.SendScheduledMessage import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.repository.ScheduledMessageRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dev.octoshrimpy.quik.common.util.ClipboardUtils -import dev.octoshrimpy.quik.interactor.DeleteScheduledMessages import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import javax.inject.Inject +import javax.inject.Named class ScheduledViewModel @Inject constructor( + @Named("conversationId") private val conversationId: Long?, billingManager: BillingManager, private val context: Context, private val navigator: Navigator, @@ -25,10 +26,12 @@ class ScheduledViewModel @Inject constructor( private val sendScheduledMessageInteractor: SendScheduledMessage, private val deleteScheduledMessagesInteractor: DeleteScheduledMessages, ) : QkViewModel(ScheduledState( - scheduledMessages = scheduledMessageRepo.getScheduledMessages() + scheduledMessages = scheduledMessageRepo.getScheduledMessages(), + conversationId = conversationId )) { init { + loadMessages(conversationId) disposables += billingManager.upgradeStatus .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } } @@ -52,10 +55,14 @@ class ScheduledViewModel @Inject constructor( view.optionsItemIntent .filter { it == R.id.delete } .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> - view.showDeleteDialog(selectedMessages) - } + selectedMessages } .autoDisposable(view.scope()) - .subscribe() + .subscribe { it -> + val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage) + .map { it.id } + view.showDeleteDialog(ids) + } + // copy the selected message text to the clipboard view.optionsItemIntent @@ -157,4 +164,12 @@ class ScheduledViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { navigator.showQksmsPlusActivity("schedule_fab") } } + + private fun loadMessages(conversationId: Long?) { + val results = if (conversationId != null) + scheduledMessageRepo.getScheduledMessagesForConversation(conversationId) + else + scheduledMessageRepo.getScheduledMessages() + newState { copy(scheduledMessages = results) } + } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt index 8af3e12e..c41ce9d6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt @@ -22,9 +22,9 @@ import android.os.Bundle import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.container_activity.* class SettingsActivity : QkThemedActivity() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index 5dc76e5a..579e1d57 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -30,6 +30,8 @@ import com.bluelinelabs.conductor.RouterTransaction import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.view.longClicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.BuildConfig import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.MenuItem @@ -49,18 +51,16 @@ import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.suspendCancellableCoroutine -import kotlinx.coroutines.withContext import kotlinx.android.synthetic.main.settings_controller.* import kotlinx.android.synthetic.main.settings_controller.view.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* import kotlinx.android.synthetic.main.settings_theme_widget.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withContext import javax.inject.Inject import kotlin.coroutines.resume diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index 22bb75c9..0ce4ae60 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.settings import android.content.Context +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter @@ -27,28 +29,23 @@ import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.makeToast import dev.octoshrimpy.quik.interactor.DeleteOldMessages import dev.octoshrimpy.quik.interactor.SyncMessages -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.service.AutoDeleteService import dev.octoshrimpy.quik.util.NightModeManager import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.runBlocking import timber.log.Timber -import java.util.* +import java.util.Calendar import java.util.concurrent.TimeUnit import javax.inject.Inject class SettingsPresenter @Inject constructor( colors: Colors, syncRepo: SyncRepository, - private val analytics: AnalyticsManager, private val context: Context, private val billingManager: BillingManager, private val dateFormatter: DateFormatter, @@ -206,7 +203,6 @@ class SettingsPresenter @Inject constructor( R.id.textSize -> view.showTextSizePicker() R.id.autoColor -> { - analytics.setUserProperty("Preference: Auto Color", !prefs.autoColor.get()) prefs.autoColor.set(!prefs.autoColor.get()) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt index 70a9a358..6e0716d6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt @@ -18,11 +18,11 @@ */ package dev.octoshrimpy.quik.feature.settings.about +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import javax.inject.Inject class AboutPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt index cab56d77..e2377577 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt @@ -23,14 +23,14 @@ import android.content.DialogInterface import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.R -import kotlinx.android.synthetic.main.settings_auto_delete_dialog.view.* +import dev.octoshrimpy.quik.databinding.SettingsAutoDeleteDialogBinding class AutoDeleteDialog(context: Activity, listener: (Int) -> Unit) : AlertDialog(context) { - private val layout = LayoutInflater.from(context).inflate(R.layout.settings_auto_delete_dialog, null) + private val layout = SettingsAutoDeleteDialogBinding.inflate(LayoutInflater.from(context)) init { - setView(layout) + setView(layout.root) setTitle(R.string.settings_auto_delete) setMessage(context.getString(R.string.settings_auto_delete_dialog_message)) setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt index 04d0d2a2..b8ac743d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt @@ -21,6 +21,8 @@ package dev.octoshrimpy.quik.feature.settings.swipe import android.view.View import androidx.core.view.isVisible import com.jakewharton.rxbinding2.view.clicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.QkDialog import dev.octoshrimpy.quik.common.base.QkController @@ -29,8 +31,6 @@ import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint import dev.octoshrimpy.quik.injection.appComponent -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt index 704c351a..6d4e729a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt @@ -20,13 +20,12 @@ package dev.octoshrimpy.quik.feature.settings.swipe import android.content.Context import androidx.annotation.DrawableRes +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject class SwipeActionsPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt index f0b417ac..7c7ab313 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt @@ -19,16 +19,15 @@ package dev.octoshrimpy.quik.feature.themepicker import com.f2prateek.rx.preferences2.Preference +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.WidgetManager import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.Observables -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject import javax.inject.Named diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt index 3dc5dc81..43efb701 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt @@ -18,9 +18,9 @@ */ package dev.octoshrimpy.quik.feature.themepicker.injection +import dagger.Subcomponent import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.scope.ControllerScope -import dagger.Subcomponent @ControllerScope @Subcomponent(modules = [ThemePickerModule::class]) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt index baccefcf..9336025e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt @@ -18,10 +18,10 @@ */ package dev.octoshrimpy.quik.feature.themepicker.injection -import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController -import dev.octoshrimpy.quik.injection.scope.ControllerScope import dagger.Module import dagger.Provides +import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController +import dev.octoshrimpy.quik.injection.scope.ControllerScope import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt index 1dc4110d..f08f2bdb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt @@ -27,7 +27,6 @@ import android.widget.RemoteViews import android.widget.RemoteViewsService import androidx.core.text.bold import androidx.core.text.buildSpannedString -import androidx.core.text.color import androidx.core.text.italic import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt index c1fc0110..120b14f8 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt @@ -25,7 +25,7 @@ import android.appwidget.AppWidgetProvider import android.content.ComponentName import android.content.Context import android.content.Intent -import android.net.Uri +import android.content.res.Configuration import android.os.Bundle import android.widget.RemoteViews import dagger.android.AndroidInjection @@ -39,6 +39,7 @@ import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver import dev.octoshrimpy.quik.util.Preferences import timber.log.Timber import javax.inject.Inject +import androidx.core.net.toUri class WidgetProvider : AppWidgetProvider() { @@ -109,8 +110,11 @@ class WidgetProvider : AppWidgetProvider() { Timber.v("updateWidget appWidgetId: $appWidgetId") val remoteViews = RemoteViews(context.packageName, R.layout.widget) + val nightModeFlags = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK + val isNightMode = nightModeFlags == Configuration.UI_MODE_NIGHT_YES + // Apply colors from theme - val night = prefs.night.get() + val night = prefs.night.get() || isNightMode val black = prefs.black.get() remoteViews.setInt(R.id.background, "setColorFilter", context.getColorCompat(when { @@ -134,7 +138,7 @@ class WidgetProvider : AppWidgetProvider() { val intent = Intent(context, WidgetService::class.java) .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) .putExtra("small_widget", smallWidget) - intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)) + intent.data = intent.toUri(Intent.URI_INTENT_SCHEME).toUri() remoteViews.setRemoteAdapter(R.id.conversations, intent) // compose new message image color and on click intent diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index b5596cab..6c96873b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection +import dagger.Component +import dagger.android.support.AndroidSupportInjectionModule import dev.octoshrimpy.quik.common.QKApplication import dev.octoshrimpy.quik.common.QkDialog import dev.octoshrimpy.quik.common.util.QkChooserTargetService @@ -30,6 +32,7 @@ import dev.octoshrimpy.quik.common.widget.QkTextView import dev.octoshrimpy.quik.common.widget.RadioPreferenceView import dev.octoshrimpy.quik.feature.backup.BackupController import dev.octoshrimpy.quik.feature.blocking.BlockingController +import dev.octoshrimpy.quik.feature.blocking.filters.MessageContentFiltersController import dev.octoshrimpy.quik.feature.blocking.manager.BlockingManagerController import dev.octoshrimpy.quik.feature.blocking.messages.BlockedMessagesController import dev.octoshrimpy.quik.feature.blocking.numbers.BlockedNumbersController @@ -43,8 +46,6 @@ import dev.octoshrimpy.quik.feature.widget.WidgetAdapter import dev.octoshrimpy.quik.injection.android.ActivityBuilderModule import dev.octoshrimpy.quik.injection.android.BroadcastReceiverBuilderModule import dev.octoshrimpy.quik.injection.android.ServiceBuilderModule -import dagger.Component -import dagger.android.support.AndroidSupportInjectionModule import javax.inject.Singleton @Singleton @@ -65,6 +66,7 @@ interface AppComponent { fun inject(controller: BackupController) fun inject(controller: BlockedMessagesController) fun inject(controller: BlockedNumbersController) + fun inject(controller: MessageContentFiltersController) fun inject(controller: BlockingController) fun inject(controller: BlockingManagerController) fun inject(controller: SettingsController) diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index a37cf052..8d52fe2f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -26,6 +26,10 @@ import android.preference.PreferenceManager import androidx.lifecycle.ViewModelProvider import androidx.work.WorkerFactory import com.f2prateek.rx.preferences2.RxSharedPreferences +import com.squareup.moshi.Moshi +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import dagger.Module +import dagger.Provides import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.blocking.BlockingManager import dev.octoshrimpy.quik.common.ViewModelFactory @@ -40,8 +44,6 @@ import dev.octoshrimpy.quik.manager.ActiveConversationManager import dev.octoshrimpy.quik.manager.ActiveConversationManagerImpl import dev.octoshrimpy.quik.manager.AlarmManager import dev.octoshrimpy.quik.manager.AlarmManagerImpl -import dev.octoshrimpy.quik.manager.AnalyticsManager -import dev.octoshrimpy.quik.manager.AnalyticsManagerImpl import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.ChangelogManager import dev.octoshrimpy.quik.manager.ChangelogManagerImpl @@ -79,16 +81,16 @@ import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ContactRepositoryImpl import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.ConversationRepositoryImpl +import dev.octoshrimpy.quik.repository.EmojiReactionRepository +import dev.octoshrimpy.quik.repository.EmojiReactionRepositoryImpl +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository +import dev.octoshrimpy.quik.repository.MessageContentFilterRepositoryImpl import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.MessageRepositoryImpl import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import dev.octoshrimpy.quik.repository.ScheduledMessageRepositoryImpl import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.repository.SyncRepositoryImpl -import com.squareup.moshi.Moshi -import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import dagger.Module -import dagger.Provides import dev.octoshrimpy.quik.worker.InjectionWorkerFactory import javax.inject.Singleton @@ -143,9 +145,6 @@ class AppModule(private var application: Application) { @Provides fun provideAlarmManager(manager: AlarmManagerImpl): AlarmManager = manager - @Provides - fun provideAnalyticsManager(manager: AnalyticsManagerImpl): AnalyticsManager = manager - @Provides fun blockingClient(manager: BlockingManager): BlockingClient = manager @@ -204,6 +203,9 @@ class AppModule(private var application: Application) { @Provides fun provideBlockingRepository(repository: BlockingRepositoryImpl): BlockingRepository = repository + @Provides + fun provideMessageContentFilterRepository(repository: MessageContentFilterRepositoryImpl): MessageContentFilterRepository = repository + @Provides fun provideContactRepository(repository: ContactRepositoryImpl): ContactRepository = repository @@ -219,6 +221,9 @@ class AppModule(private var application: Application) { @Provides fun provideSyncRepository(repository: SyncRepositoryImpl): SyncRepository = repository + @Provides + fun provideEmojiReactionRepository(repository: EmojiReactionRepositoryImpl): EmojiReactionRepository = repository + // worker factory @Provides fun provideWorkerFactory(workerFactory: InjectionWorkerFactory): WorkerFactory = workerFactory diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt index 516372d4..69eda914 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection.android +import dagger.Module +import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.feature.backup.BackupActivity import dev.octoshrimpy.quik.feature.blocking.BlockingActivity import dev.octoshrimpy.quik.feature.compose.ComposeActivity @@ -39,8 +41,6 @@ import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivityModule import dev.octoshrimpy.quik.feature.settings.SettingsActivity import dev.octoshrimpy.quik.injection.scope.ActivityScope -import dagger.Module -import dagger.android.ContributesAndroidInjector @Module abstract class ActivityBuilderModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt index 25a7270b..c9ae360c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection.android +import dagger.Module +import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.feature.widget.WidgetProvider import dev.octoshrimpy.quik.injection.scope.ActivityScope import dev.octoshrimpy.quik.receiver.BlockThreadReceiver @@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.receiver.SendScheduledMessageReceiver import dev.octoshrimpy.quik.receiver.MessageDeliveredReceiver import dev.octoshrimpy.quik.receiver.SmsProviderChangedReceiver import dev.octoshrimpy.quik.receiver.SmsReceivedReceiver -import dagger.Module -import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.receiver.MessageMarkReceiver import dev.octoshrimpy.quik.receiver.MessageSentReceiver import dev.octoshrimpy.quik.receiver.SendDelayedMessageReceiver diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt index 31260897..820ad751 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt @@ -18,12 +18,12 @@ */ package dev.octoshrimpy.quik.injection.android +import dagger.Module +import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.feature.backup.RestoreBackupService import dev.octoshrimpy.quik.injection.scope.ActivityScope import dev.octoshrimpy.quik.service.HeadlessSmsSendService import dev.octoshrimpy.quik.service.AutoDeleteService -import dagger.Module -import dagger.android.ContributesAndroidInjector @Module abstract class ServiceBuilderModule { diff --git a/presentation/src/main/res/drawable/ic_speech_to_text_black.xml b/presentation/src/main/res/drawable/ic_speech_to_text_black.xml index 9101ad8d..2339d38d 100644 --- a/presentation/src/main/res/drawable/ic_speech_to_text_black.xml +++ b/presentation/src/main/res/drawable/ic_speech_to_text_black.xml @@ -1,6 +1,5 @@ - + + + + + + @@ -80,9 +80,23 @@ android:layout_height="16dp" android:layout_marginTop="2dp" android:paddingStart="4dp" + android:paddingTop="2dp" android:src="@drawable/ic_baseline_push_pin_24" app:tint="?android:attr/textColorTertiary" android:visibility="gone" + app:layout_constraintEnd_toStartOf="@id/scheduled" + app:layout_constraintTop_toTopOf="@id/snippet" + tools:visibility="visible" /> + + diff --git a/presentation/src/main/res/layout/message_content_filter_list_item.xml b/presentation/src/main/res/layout/message_content_filter_list_item.xml new file mode 100644 index 00000000..9747d09c --- /dev/null +++ b/presentation/src/main/res/layout/message_content_filter_list_item.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/message_content_filters_add_dialog.xml b/presentation/src/main/res/layout/message_content_filters_add_dialog.xml new file mode 100644 index 00000000..90394f2e --- /dev/null +++ b/presentation/src/main/res/layout/message_content_filters_add_dialog.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/layout/message_content_filters_controller.xml b/presentation/src/main/res/layout/message_content_filters_controller.xml new file mode 100644 index 00000000..e294eb09 --- /dev/null +++ b/presentation/src/main/res/layout/message_content_filters_controller.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index dc58afd8..792727ef 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -79,7 +79,9 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent"> + app:layout_constraintBottom_toBottomOf="parent" + android:clipToPadding="false" + android:clipChildren="false"> - + android:clipToPadding="false" + android:clipChildren="false" + android:paddingEnd="4dp" + android:paddingStart="4dp"> - + + + + + + + + @@ -139,4 +179,4 @@ - \ No newline at end of file + diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index d3c79871..16cc8886 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -92,7 +92,8 @@ + android:layout_height="wrap_content" + android:clipToPadding="false"> + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false"> - + android:paddingStart="18dp" + android:clipToPadding="false" + android:clipChildren="false"> + + + + + + + + + + - \ No newline at end of file + diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index 5ffa1f48..05e885b2 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -23,7 +23,9 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - \ No newline at end of file + diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index 87ff23a5..c88f5315 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -34,6 +34,13 @@ android:visible="false" app:showAsAction="always" /> + + حظر مزامنة الرسائل… أنت: %s - مسودة النتائج في الرسائل %d رسائل ستظهر المحادثات الخاصة بك هنا @@ -374,7 +373,6 @@ تعيين تراجع تم النسخ - تم حفظ المحادثة استخدام هذه الميزة يتطلب فتح QUIK+ لا رسائل جديدة diff --git a/presentation/src/main/res/values-bn/strings.xml b/presentation/src/main/res/values-bn/strings.xml index 8367d042..7d739c3b 100644 --- a/presentation/src/main/res/values-bn/strings.xml +++ b/presentation/src/main/res/values-bn/strings.xml @@ -48,7 +48,6 @@ অবরুদ্ধ বার্তাগুলি সিঙ্ক হচ্ছে… তুমি: %s - খসড়া বার্তার ভিতর পাওয়া গেছে %dটি বার্তা তোমার আলাপ এখানে দেখা যাবে @@ -357,7 +356,6 @@ সেট করুন বাতিল করো অনুলিপি করা হয়েছে - আর্কাইভ করা আলাপ এই ব্যবহার করতে আপনাকে অবশ্যই QUIK + আনলক করতে হবে নতুন বার্তা diff --git a/presentation/src/main/res/values-cs/strings.xml b/presentation/src/main/res/values-cs/strings.xml index 12f17a43..4b69f30b 100644 --- a/presentation/src/main/res/values-cs/strings.xml +++ b/presentation/src/main/res/values-cs/strings.xml @@ -48,7 +48,6 @@ Blokovat Synchronizace zpráv… Vy: %s - Koncept Výsledky ve zprávách %d zpráv Zde se objeví vaše konverzace @@ -365,7 +364,6 @@ Nastavit Zpět Zkopírováno - Archivované konverzace Pro použití musíte odemknout verzi QUIK + Nová zpráva diff --git a/presentation/src/main/res/values-da/strings.xml b/presentation/src/main/res/values-da/strings.xml index 5a87553f..f0b8190e 100644 --- a/presentation/src/main/res/values-da/strings.xml +++ b/presentation/src/main/res/values-da/strings.xml @@ -48,7 +48,6 @@ Blokér Synkroniserer beskeder… Dig: %s - Udkast Resultater i beskeder %d beskeder Dine samtaler vil fremgå her @@ -357,7 +356,6 @@ Indstil Fortryd Kopieret - Arkiveret samtale Dette kræver oplåsning af QUIK+ Ny besked diff --git a/presentation/src/main/res/values-de/strings.xml b/presentation/src/main/res/values-de/strings.xml index 18d9819a..3cf4599b 100644 --- a/presentation/src/main/res/values-de/strings.xml +++ b/presentation/src/main/res/values-de/strings.xml @@ -48,7 +48,6 @@ Blockieren Synchronisiere Nachrichten… Du: %s - Entwurf Ergebnisse in Nachrichten %d Nachrichten Deine Unterhaltungen werden hier angezeigt @@ -357,7 +356,6 @@ OK Rückgängig Kopiert - Archivierte Unterhaltung Für diese Funktion muss QUIK+ freigeschalten werden Neue Nachricht diff --git a/presentation/src/main/res/values-el/strings.xml b/presentation/src/main/res/values-el/strings.xml index 5fcc2488..6d98459a 100644 --- a/presentation/src/main/res/values-el/strings.xml +++ b/presentation/src/main/res/values-el/strings.xml @@ -48,7 +48,6 @@ Φραγή Συγχρονισμός μηνυμάτων… Εσείς: %s - Πρόχειρο Αποτελέσματα στα μηνύματα Μηνύματα: %d Οι συζητήσεις σας θα εμφανίζονται εδώ @@ -357,7 +356,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-es/strings.xml b/presentation/src/main/res/values-es/strings.xml index b7a870eb..186c59bb 100644 --- a/presentation/src/main/res/values-es/strings.xml +++ b/presentation/src/main/res/values-es/strings.xml @@ -48,7 +48,6 @@ Bloquear Sincronización de mensajes... Tú: %s - Borrador Resultados en los mensajes %d mensajes Sus conversaciones aparecerán aquí @@ -357,7 +356,6 @@ Establecer Deshacer Copiado - Conversación archivada Debe desbloquear QUIK+ para utilizarlo Nuevo mensaje diff --git a/presentation/src/main/res/values-fa/strings.xml b/presentation/src/main/res/values-fa/strings.xml index f197bdb2..edd9cd33 100644 --- a/presentation/src/main/res/values-fa/strings.xml +++ b/presentation/src/main/res/values-fa/strings.xml @@ -48,7 +48,6 @@ مسدود کردن در حال همگام‌سازی پیام‌ها… شما: %s - پیش‌نویس نتایج در پیام‌ها %d پیام گفتگوهایتان اینجا نمایش داده می‌شود @@ -357,7 +356,6 @@ تنظیم برگرده کپی شد - گفتگوی بایگانی شده باید نسخه پیشرفته را فعال کنید پیام جدید diff --git a/presentation/src/main/res/values-fi/strings.xml b/presentation/src/main/res/values-fi/strings.xml index af3ade75..fdae78c5 100644 --- a/presentation/src/main/res/values-fi/strings.xml +++ b/presentation/src/main/res/values-fi/strings.xml @@ -48,7 +48,6 @@ Estä Synkronoidaan viestejä… Sinä: %s - Luonnos: %s Tuloksia viesteissä %d viestiä Keskustelusi näkyvät tässä @@ -357,7 +356,6 @@ Aseta Kumoa Kopioitu - Arkistoidut keskustelut Sinun pitää avata QUIK+ käyttääksesi tätä Uusi viesti diff --git a/presentation/src/main/res/values-fr/strings.xml b/presentation/src/main/res/values-fr/strings.xml index ccdc2aca..d34e643a 100644 --- a/presentation/src/main/res/values-fr/strings.xml +++ b/presentation/src/main/res/values-fr/strings.xml @@ -62,7 +62,6 @@ Renommer la conversation Synchronisation des messages… Vous : %s - Brouillons Résultats dans les messages %d messages Vos conversations apparaîtront ici diff --git a/presentation/src/main/res/values-gd/strings.xml b/presentation/src/main/res/values-gd/strings.xml index d58f3380..df20ce04 100644 --- a/presentation/src/main/res/values-gd/strings.xml +++ b/presentation/src/main/res/values-gd/strings.xml @@ -48,7 +48,6 @@ Block Syncing messages… You: %s - Draft Results in messages %d messages Your conversations will appear here @@ -365,7 +364,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-hi/strings.xml b/presentation/src/main/res/values-hi/strings.xml index 03b64188..f9096625 100644 --- a/presentation/src/main/res/values-hi/strings.xml +++ b/presentation/src/main/res/values-hi/strings.xml @@ -48,7 +48,6 @@ ब्लॉक संदेशों को सिंक्रनाइज़ कर रहा है.. । आप: %s - प्रारूप संदेशों में परिणाम %d संदेश आपकी बातचीत यहां दिखाई देगी @@ -357,7 +356,6 @@ सेट करें पूर्ववत करें प्रतिलिपि बनाई गई हैं। - संग्रहीत बातचीत इसका उपयोग करने के लिए आपको QUIK+ को अनलॉक करना होगा नई संदेश diff --git a/presentation/src/main/res/values-hr/strings.xml b/presentation/src/main/res/values-hr/strings.xml index 4cf3fc3f..e1e75c9e 100644 --- a/presentation/src/main/res/values-hr/strings.xml +++ b/presentation/src/main/res/values-hr/strings.xml @@ -48,7 +48,6 @@ Blokiraj Sinkronizacija poruka… Vi: %s - Skica Rezultati u porukama %d poruka Vaši razgovori pojavit će se ovdje @@ -361,7 +360,6 @@ Postavi Poništi Kopirano - Razgovor je arhiviran Morate otključati QUIK+ za korištenje ovog Nova poruka diff --git a/presentation/src/main/res/values-hu/strings.xml b/presentation/src/main/res/values-hu/strings.xml index 7fa5413a..0eb8cb3b 100644 --- a/presentation/src/main/res/values-hu/strings.xml +++ b/presentation/src/main/res/values-hu/strings.xml @@ -48,7 +48,6 @@ Tiltás Üzenetek szinkronizálása… Te: %s - Vázlat Eredmények az üzenetek szövegében %d üzenet A beszélgetéseid itt jelennek meg @@ -272,7 +271,7 @@ Tiltott számok A tiltott számok itt fognak megjelenni Új szám tiltása - Üzenetek tiltása: + Üzenetek tiltása Telefonszám Blokkolás Tiltott üzenetek @@ -357,7 +356,6 @@ Beállítás Visszavonás Átmásolva - Archivált beszélgetés Ehhez ki kell nyitnod a QUIK+-t Új üzenet diff --git a/presentation/src/main/res/values-in/strings.xml b/presentation/src/main/res/values-in/strings.xml index fa868c8d..9aed0134 100644 --- a/presentation/src/main/res/values-in/strings.xml +++ b/presentation/src/main/res/values-in/strings.xml @@ -48,7 +48,6 @@ Blokir Menyinkronkan pesan… Anda: %s - Draf Hasil dalam pesan %d pesan Percakapan anda akan ditampilkan di sini @@ -353,7 +352,6 @@ Set Urungkan Disalin - Percakapan diarsipkan Anda harus membuka akses QUIK+ untuk menggunakan ini %s pesan baru diff --git a/presentation/src/main/res/values-it/strings.xml b/presentation/src/main/res/values-it/strings.xml index 2d967a7b..e12454c0 100644 --- a/presentation/src/main/res/values-it/strings.xml +++ b/presentation/src/main/res/values-it/strings.xml @@ -48,7 +48,6 @@ Sposta negli indesiderati La sincronizzazione dei messaggi… Tu: %s - Bozza Risultati nei messaggi %d messaggi Le tue conversazioni vengono visualizzate qui @@ -357,7 +356,6 @@ Set Annulla Copiato - Conversazione archiviata È necessario sbloccare QUIK+ per utilizzare questo Nuovo messaggio diff --git a/presentation/src/main/res/values-iw/strings.xml b/presentation/src/main/res/values-iw/strings.xml index 5a9355f5..0ff878d0 100644 --- a/presentation/src/main/res/values-iw/strings.xml +++ b/presentation/src/main/res/values-iw/strings.xml @@ -48,7 +48,6 @@ חסום מסנכרן הודעות… אתה: %s - טיוטה תוצאות בהודעות %d הודעות ההתכתבויות שלך תופענה כאן @@ -365,7 +364,6 @@ הגדרה ביטול הועתק - התכתבות בארכיון עליך לשחרר את QUIK+‎ כדי להשתמש בזה הודעה חדשה diff --git a/presentation/src/main/res/values-ja/strings.xml b/presentation/src/main/res/values-ja/strings.xml index f90fcd1f..678db166 100644 --- a/presentation/src/main/res/values-ja/strings.xml +++ b/presentation/src/main/res/values-ja/strings.xml @@ -48,7 +48,6 @@ ブロック メッセージを同期しています... あなた: %s - 下書き メッセージ内の検索結果 %d 件のメッセージ 会話がここに表示されます @@ -353,7 +352,6 @@ 設定 元に戻す コピーしました - 会話をアーカイブしました 使用するには QUIK+ のロックを解除する必要があります %s 件の新着メッセージ diff --git a/presentation/src/main/res/values-ko/strings.xml b/presentation/src/main/res/values-ko/strings.xml index 3e20b3a0..e1e2fec2 100644 --- a/presentation/src/main/res/values-ko/strings.xml +++ b/presentation/src/main/res/values-ko/strings.xml @@ -48,7 +48,6 @@ 차단 메시지 동기화 하기 나: %s - 임시 메시지 메시지 검색 결과 %d 개의 새로운 메시지 대화가 여기에 나타납니다 @@ -353,7 +352,6 @@ 설정 되돌리기 복사됨 - 보관된 대화 이 기능을 사용하려면 QUIK+ 를 잠금 해제해야 합니다. 새로운 메세지 diff --git a/presentation/src/main/res/values-lt/strings.xml b/presentation/src/main/res/values-lt/strings.xml index 8c7bb1db..e5f65bd9 100644 --- a/presentation/src/main/res/values-lt/strings.xml +++ b/presentation/src/main/res/values-lt/strings.xml @@ -48,7 +48,6 @@ Blokuoti Syncing messages… Tu: %s - Draft Results in messages %d messages Tavo žinutės buvo matomos čia @@ -365,7 +364,6 @@ Padaryti Anuliuoti Nukopijuota - Archyvuotas pokalbis Reikia turėti QUIK+ funkcijos naudojomui Naujas pranešimas diff --git a/presentation/src/main/res/values-nb/strings.xml b/presentation/src/main/res/values-nb/strings.xml index 2db0f9c1..9ab68f19 100644 --- a/presentation/src/main/res/values-nb/strings.xml +++ b/presentation/src/main/res/values-nb/strings.xml @@ -48,7 +48,6 @@ Blokker Synkroniserer meldinger… Du: %s - Draft Resultater i meldinger %d meldinger Samtalene dine vises her @@ -357,7 +356,6 @@ Angi Angre Kopiert - Arkiverte samtaler Du må aktivere QUIK+ for å bruke dette Ny melding diff --git a/presentation/src/main/res/values-ne/strings.xml b/presentation/src/main/res/values-ne/strings.xml index 64fc5df4..f2237c64 100644 --- a/presentation/src/main/res/values-ne/strings.xml +++ b/presentation/src/main/res/values-ne/strings.xml @@ -48,7 +48,6 @@ Block Syncing messages… You: %s - Draft Results in messages %d messages Your conversations will appear here @@ -357,7 +356,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-nl/strings.xml b/presentation/src/main/res/values-nl/strings.xml index a6f5200d..c6038b9f 100644 --- a/presentation/src/main/res/values-nl/strings.xml +++ b/presentation/src/main/res/values-nl/strings.xml @@ -48,7 +48,6 @@ Blokkeren Berichten synchroniseren… Jij: %s - Concept Resultaten in berichten %d berichten Je conversaties verschijnen hier @@ -357,7 +356,6 @@ Instellen Ongedaan maken Gekopieerd - Conversatie gearchiveerd Je dient QUIK+ te ontgrendelen om dit te gebruiken Nieuw bericht diff --git a/presentation/src/main/res/values-pl/strings.xml b/presentation/src/main/res/values-pl/strings.xml index b328f5d3..559f135e 100644 --- a/presentation/src/main/res/values-pl/strings.xml +++ b/presentation/src/main/res/values-pl/strings.xml @@ -58,7 +58,6 @@ Zmień nazwę rozmowy Synchronizowanie wiadomości… Ty: %s - Szkic Wyniki w wiadomościach %d wiadomości Miejsce dla twoich bieżących rozmów diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml index 253ab69a..98ce5d5b 100644 --- a/presentation/src/main/res/values-pt-rBR/strings.xml +++ b/presentation/src/main/res/values-pt-rBR/strings.xml @@ -48,7 +48,6 @@ Bloquear Sincronizando mensagens… Você: %s - Rascunho Resultados nas mensagens %d mensagem(s) Suas conversas aparecerão aqui @@ -357,7 +356,6 @@ Definir Desfazer Copiada - Conversa arquivada Você deve desbloquear o QUIK+ para isso Nova mensagem diff --git a/presentation/src/main/res/values-pt/strings.xml b/presentation/src/main/res/values-pt/strings.xml index f49bb718..435bba94 100644 --- a/presentation/src/main/res/values-pt/strings.xml +++ b/presentation/src/main/res/values-pt/strings.xml @@ -48,7 +48,6 @@ Bloquear Sincronização de mensagens… Você: %s - Rascunho Resultados nas mensagens %d mensagens As suas conversas aparecerão aqui @@ -357,7 +356,6 @@ Definir Anular Copiada - Conversa arquivada Tem que ter o QUIK+ para esta função 1 nova mensagem diff --git a/presentation/src/main/res/values-ro/strings.xml b/presentation/src/main/res/values-ro/strings.xml index cff1b14e..77d51a79 100644 --- a/presentation/src/main/res/values-ro/strings.xml +++ b/presentation/src/main/res/values-ro/strings.xml @@ -54,7 +54,6 @@ Redenumește conversația Se sincronizează mesajele… Tu: %s - Schițe Rezultate în mesaje %d mesaje Conversațiile tale vor apărea aici diff --git a/presentation/src/main/res/values-ru/strings.xml b/presentation/src/main/res/values-ru/strings.xml index d0afcc5c..7ffe682c 100644 --- a/presentation/src/main/res/values-ru/strings.xml +++ b/presentation/src/main/res/values-ru/strings.xml @@ -48,7 +48,6 @@ Блокировать Синхронизация сообщений… Вы: %s - Черновик Результаты в сообщениях %d сообщений Беседы будут появляться здесь @@ -365,7 +364,6 @@ Задать Отмена Скопировано - Архивированная беседа Вы должны разблокировать QUIK+, чтобы использовать Новое сообщение diff --git a/presentation/src/main/res/values-sk/strings.xml b/presentation/src/main/res/values-sk/strings.xml index 636c6a00..e0602809 100644 --- a/presentation/src/main/res/values-sk/strings.xml +++ b/presentation/src/main/res/values-sk/strings.xml @@ -48,7 +48,6 @@ Zablokovať Synchronizácia správ… Vy: %s - Koncept Výsledky v správach %d správ Tu sa zobrazia vaše konverzácie @@ -365,7 +364,6 @@ Nastaviť Vrátiť späť Skopírované - Archivované konverzácie Pre použitie aktivujte QUIK+ Nová správa diff --git a/presentation/src/main/res/values-sl/strings.xml b/presentation/src/main/res/values-sl/strings.xml index 4b6cecac..58feb536 100644 --- a/presentation/src/main/res/values-sl/strings.xml +++ b/presentation/src/main/res/values-sl/strings.xml @@ -48,7 +48,6 @@ Blokiraj Sinhroniziranje sporočil… Vi: %s - Osnutek Rezultati v sporočilih %d sporočil Vaši pogovori se bodo pojavili tukaj @@ -365,7 +364,6 @@ Nastavi Razveljavi Kopirano - Arhivirani pogovori Da uporabiš to, moraš odkleniti QUIK+ Novo sporočilo diff --git a/presentation/src/main/res/values-sr/strings.xml b/presentation/src/main/res/values-sr/strings.xml index b47b5f12..0489238c 100644 --- a/presentation/src/main/res/values-sr/strings.xml +++ b/presentation/src/main/res/values-sr/strings.xml @@ -48,7 +48,6 @@ Блокирај Синхронизујем поруке… Ја: %s - Нацрт Пронађено у порукама %d поруке Овде ће се појавити твоји разговори @@ -361,7 +360,6 @@ Постави Опозови Копирано - Сачувани разговори Откључај QUIK+ за приступ овој опцији Нова порука diff --git a/presentation/src/main/res/values-sv/strings.xml b/presentation/src/main/res/values-sv/strings.xml index c58d43a8..5b26f854 100644 --- a/presentation/src/main/res/values-sv/strings.xml +++ b/presentation/src/main/res/values-sv/strings.xml @@ -48,7 +48,6 @@ Blockera Synkroniserar meddelanden… Du: %s - Utkast Resultat i meddelanden %d meddelanden Dina konversationer kommer att dyka upp här @@ -357,7 +356,6 @@ Ställ in Ångra Kopierad - Arkiverade konversationer Du måste låsa upp QUIK+ för att använda det här Nytt meddelande diff --git a/presentation/src/main/res/values-ta/strings.xml b/presentation/src/main/res/values-ta/strings.xml index 091f8279..1c1f94bc 100644 --- a/presentation/src/main/res/values-ta/strings.xml +++ b/presentation/src/main/res/values-ta/strings.xml @@ -48,7 +48,6 @@ தடு செய்திகள் ஒத்திசைக்கப்படுகின்றன… நீங்கள்: %s - வரைவு தகவல்களிலுள்ள முடிவுகள் %d செய்திகள் உங்கள் உரையாடல்கள் இங்கே தோன்றும் @@ -357,7 +356,6 @@ அமை செயல்தவிர் நகலெடுக்கப்பட்டது - காப்பகப்படுத்திய உரையாடல் இதைப் பயன்படுத்த கட்டாயம் QUIK+ ஐப் பூட்டவிழ்க்க வேண்டும் புது தகவல் diff --git a/presentation/src/main/res/values-th/strings.xml b/presentation/src/main/res/values-th/strings.xml index 2292854d..d9b8df73 100644 --- a/presentation/src/main/res/values-th/strings.xml +++ b/presentation/src/main/res/values-th/strings.xml @@ -48,7 +48,6 @@ ปิดกั้น กำลังปรับแต่งเพิ่มประสิทธิภาพฐานข้อมูล อาจใช้เวลาสักครู่… คุณ: %s - Draft ผลลัพธ์ในข้อความ %d ข้อความ บทสนทนาของคุณจะปรากฏที่นี่ @@ -353,7 +352,6 @@ ตั้งค่า ย้อนกลับ คัดลอกแล้ว - จัดเก็บการสนทนาแล้ว คุณต้องปลดล็อก QUIK+ เพื่อใช้งานคุณสมบัตินี้ มี %s ข้อความใหม่ diff --git a/presentation/src/main/res/values-tl/strings.xml b/presentation/src/main/res/values-tl/strings.xml index 25f92882..f4b5abaf 100644 --- a/presentation/src/main/res/values-tl/strings.xml +++ b/presentation/src/main/res/values-tl/strings.xml @@ -48,7 +48,6 @@ Block Syncing messages… Ikaw: %s - Draft Resulta sa mga messages %d mga messages Ang iyong mga pakikipag-usap ay makikita rito @@ -357,7 +356,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml index 5fdaed1c..4a7426c5 100644 --- a/presentation/src/main/res/values-tr/strings.xml +++ b/presentation/src/main/res/values-tr/strings.xml @@ -48,7 +48,6 @@ Engelle İletiler eşitleniyor.. Sen: %s - Taslak Mesajlardaki sonuçlar %d mesaj Konuşmalarınız burada görünür @@ -359,7 +358,6 @@ BAĞLAM İSTEĞİ Ayarla Geri al Kopyalandı. - Arşivlenmiş konuşmalar Bunu kullanmak için QUIK+ kilidi gerekir Yeni mesaj diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml index 5cb6e66b..141935f3 100644 --- a/presentation/src/main/res/values-uk/strings.xml +++ b/presentation/src/main/res/values-uk/strings.xml @@ -48,7 +48,6 @@ Блокувати Синхронізація повідомлень… Ви: %s - Чернетка Результати в повідомленнях Повідомлень: %d Ваші бесіди з\'являтимуться тут @@ -365,7 +364,6 @@ Задати Скасувати Скопійовано - Бесіду заархівовано Для використання ви повинні розблокувати QUIK+ Нове повідомлення diff --git a/presentation/src/main/res/values-ur/strings.xml b/presentation/src/main/res/values-ur/strings.xml index a1194b43..16938f5b 100644 --- a/presentation/src/main/res/values-ur/strings.xml +++ b/presentation/src/main/res/values-ur/strings.xml @@ -48,7 +48,6 @@ Block Syncing messages… You: %s - Draft Results in messages %d messages Your conversations will appear here @@ -357,7 +356,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-vi/strings.xml b/presentation/src/main/res/values-vi/strings.xml index d9e04ecd..e8cc0437 100644 --- a/presentation/src/main/res/values-vi/strings.xml +++ b/presentation/src/main/res/values-vi/strings.xml @@ -48,7 +48,6 @@ Chặn liên hệ Đang đồng bộ tin nhắn… Bạn: %s - Bản nháp Kết quả trong tin nhắn %d tin nhắn Các cuộc trò chuyện của bạn sẽ xuất hiện ở đây @@ -353,7 +352,6 @@ Chọn Undo Đã sao chép - Cuộc trò chuyện đã được lưu trữ Bạn phải mở khóa QUIK+ để sử dụng chức năng này %s tin nhắn mới diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml index ca5dcfb0..50770bd7 100644 --- a/presentation/src/main/res/values-zh-rCN/strings.xml +++ b/presentation/src/main/res/values-zh-rCN/strings.xml @@ -48,7 +48,6 @@ 拦截 正在同步信息… 你:%s - 草稿 信息中的结果 %d 条信息 对话会在这里显示 @@ -353,7 +352,6 @@ 设置 撤销 已复制 - 已存档的对话 您必须解锁 QUIK+ 才能使用此功能 %s条新信息 diff --git a/presentation/src/main/res/values-zh-rHK/strings.xml b/presentation/src/main/res/values-zh-rHK/strings.xml index c6061066..257393d3 100644 --- a/presentation/src/main/res/values-zh-rHK/strings.xml +++ b/presentation/src/main/res/values-zh-rHK/strings.xml @@ -48,7 +48,6 @@ 攔截 正在同步… 您:%s - 草稿 信息中的結果 %d 條信息 對話會在這裡顯示 @@ -353,7 +352,6 @@ 設置 復原 已複製 - 存檔的對話 您必須解鎖QUIK+才能使用此功能 %s條新訊息 diff --git a/presentation/src/main/res/values-zh-rTW/strings.xml b/presentation/src/main/res/values-zh-rTW/strings.xml index 6ce36a82..a6f1e4fb 100644 --- a/presentation/src/main/res/values-zh-rTW/strings.xml +++ b/presentation/src/main/res/values-zh-rTW/strings.xml @@ -48,7 +48,6 @@ 封鎖 正在同步訊息… 您:%s - 草稿 訊息中的結果 %d 條訊息 對話會在這裡顯示 @@ -355,7 +354,6 @@ 設定 復原 已複製 - 封存的對話 您必須解鎖 QUIK+ 才能使用此功能 新訊息 diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 85aa5f15..554c5576 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -136,10 +136,11 @@ Messages will be sent separately to all recipients This is the start of your conversation. Say something nice! Contact card - Scheduled for + Scheduled time: Selected time must be in the future! You must unlock QUIK+ to use scheduled messaging Added to scheduled messages + Scheduled messages for this conversation Write a message… Can\'t send to other participants Copy text @@ -251,6 +252,7 @@ Sending on December 23rd  Schedule a message + Schedule this message Scheduled message Missing @@ -361,6 +363,16 @@ Phone number Block + Message content filters + Your message content filters will appear here + Create a new filter + Drop messages matching + Word, phrase or regular expression + Case sensitive + Regular expression + Include contacts + Create + Blocked messages Your blocked messages will appear here @@ -422,6 +434,7 @@ Loading… View more conversations + All Conversations Mark read Call @@ -478,6 +491,10 @@ Archived conversation Archived %d conversations + + Unarchived conversation + Unarchived %d conversations + You must unlock QUIK+ to use this @@ -488,6 +505,7 @@ Message not sent The message to %s failed to send Receiving message + Resend System diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt deleted file mode 100644 index d3f7d68f..00000000 --- a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2020 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.common.util - -import android.app.Activity -import dev.octoshrimpy.quik.manager.BillingManager -import io.reactivex.Observable -import io.reactivex.subjects.BehaviorSubject -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -class BillingManagerImpl @Inject constructor( -): BillingManager { - - override val products: Observable> = BehaviorSubject.createDefault(listOf()) - override val upgradeStatus: Observable = BehaviorSubject.createDefault(true) - - override suspend fun checkForPurchases() = Unit - override suspend fun queryProducts() = Unit - override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = Unit - -} diff --git a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt deleted file mode 100644 index 35512d53..00000000 --- a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (C) 2020 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ - -package dev.octoshrimpy.quik.common.util - -import android.app.Activity -import android.content.Context -import com.android.billingclient.api.AcknowledgePurchaseParams -import com.android.billingclient.api.BillingClient -import com.android.billingclient.api.BillingClientStateListener -import com.android.billingclient.api.BillingFlowParams -import com.android.billingclient.api.BillingResult -import com.android.billingclient.api.ProductDetails -import com.android.billingclient.api.Purchase -import com.android.billingclient.api.Purchase.PurchaseState -import com.android.billingclient.api.PurchasesUpdatedListener -import com.android.billingclient.api.QueryProductDetailsParams -import com.android.billingclient.api.QueryPurchaseHistoryParams -import com.android.billingclient.api.QueryPurchasesParams -import com.android.billingclient.api.acknowledgePurchase -import com.android.billingclient.api.queryProductDetails -import com.android.billingclient.api.queryPurchaseHistory -import com.android.billingclient.api.queryPurchasesAsync -import dev.octoshrimpy.quik.manager.AnalyticsManager -import dev.octoshrimpy.quik.manager.BillingManager -import io.reactivex.Observable -import io.reactivex.subjects.BehaviorSubject -import io.reactivex.subjects.Subject -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.channels.BufferOverflow -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.first -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import timber.log.Timber -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -class BillingManagerImpl @Inject constructor( - context: Context, - private val analyticsManager: AnalyticsManager -) : BillingManager, BillingClientStateListener, PurchasesUpdatedListener { - - private val productsSubject: Subject> = BehaviorSubject.create() - override val products: Observable> = productsSubject - .map { productDetailsList -> - productDetailsList.map { productDetails -> - BillingManager.Product( - sku = productDetails.productId, - price = productDetails.oneTimePurchaseOfferDetails!!.formattedPrice, - priceCurrencyCode = productDetails.oneTimePurchaseOfferDetails!!.priceCurrencyCode - ) - } - } - - private val purchaseListSubject = BehaviorSubject.create>() - override val upgradeStatus: Observable = purchaseListSubject - .map { purchases -> - purchases - .filter { it.purchaseState == Purchase.PurchaseState.PURCHASED } - .flatMap { it.products } - .any { it in skus } - } - .distinctUntilChanged() - .doOnNext { upgraded -> analyticsManager.setUserProperty("Upgraded", upgraded) } - - private val skus = listOf(BillingManager.SKU_PLUS, BillingManager.SKU_PLUS_DONATE) - private val billingClient: BillingClient = BillingClient.newBuilder(context) - .setListener(this) - .enablePendingPurchases() - .build() - - private val billingClientState = MutableSharedFlow( - replay = 1, - onBufferOverflow = BufferOverflow.DROP_OLDEST - ) - - init { - billingClientState.tryEmit(BillingClient.BillingResponseCode.SERVICE_DISCONNECTED) - } - - override suspend fun checkForPurchases() = executeServiceRequest { - // Query from the local cache first - queryPurchases() - - // Update the cache, then read from it again - queryPurchaseHistory() - queryPurchases() - } - - override suspend fun queryProducts() = executeServiceRequest { - val productList = skus.map { sku -> - QueryProductDetailsParams.Product.newBuilder() - .setProductId(sku) - .setProductType(BillingClient.ProductType.INAPP) - .build() - } - val params = QueryProductDetailsParams.newBuilder() - .setProductList(productList) - - val result = billingClient.queryProductDetails(params.build()) - if (result.billingResult.responseCode == BillingClient.BillingResponseCode.OK) { - productsSubject.onNext(result.productDetailsList.orEmpty()) - } else { - Timber.w("Error querying products", result.billingResult) - } - } - - override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = executeServiceRequest { - val queryProductDetailsParams = QueryProductDetailsParams.newBuilder() - .setProductList(listOf( - QueryProductDetailsParams.Product.newBuilder() - .setProductId(sku) - .setProductType(BillingClient.ProductType.INAPP) - .build() - )) - .build() - - val productDetailsResult = withContext(Dispatchers.IO) { - billingClient.queryProductDetails(queryProductDetailsParams) - } - - if (productDetailsResult.billingResult.responseCode != BillingClient.BillingResponseCode.OK) { - Timber.w("Error querying product details", productDetailsResult.billingResult) - return@executeServiceRequest - } - - val productDetailsParams = BillingFlowParams.ProductDetailsParams.newBuilder() - .setProductDetails(productDetailsResult.productDetailsList!!.first()) - .build() - - val billingFlowParams = BillingFlowParams.newBuilder() - .setProductDetailsParamsList(listOf(productDetailsParams)) - .build() - - billingClient.launchBillingFlow(activity, billingFlowParams) - } - - override fun onPurchasesUpdated(result: BillingResult, purchases: List?) { - if (result.responseCode == BillingClient.BillingResponseCode.OK) { - GlobalScope.launch(Dispatchers.IO) { - handlePurchases(purchases.orEmpty()) - } - } else { - Timber.w("Error purchasing", result) - } - } - - /** - * Queries the local purchases saved in Google Play's cache - */ - private suspend fun queryPurchases() { - val params = QueryPurchasesParams.newBuilder() - .setProductType(BillingClient.ProductType.INAPP) - .build() - - val result = billingClient.queryPurchasesAsync(params) - if (result.billingResult.responseCode == BillingClient.BillingResponseCode.OK) { - handlePurchases(result.purchasesList) - } else { - Timber.w("Error checking for purchases", result.billingResult) - } - } - - /** - * Fetches the list of purchases and updates the local cache - */ - private suspend fun queryPurchaseHistory() { - val params = QueryPurchaseHistoryParams.newBuilder() - .setProductType(BillingClient.ProductType.INAPP) - .build() - - val result = billingClient.queryPurchaseHistory(params) - if (result.billingResult.responseCode != BillingClient.BillingResponseCode.OK) { - Timber.w("Error querying purchase history", result.billingResult) - return - } - } - - private suspend fun handlePurchases(purchases: List) = executeServiceRequest { - purchases.forEach { purchase -> - if (!purchase.isAcknowledged && purchase.purchaseState == PurchaseState.PURCHASED) { - val params = AcknowledgePurchaseParams.newBuilder() - .setPurchaseToken(purchase.purchaseToken) - .build() - - Timber.i("Acknowledging purchase ${purchase.orderId}") - val result = billingClient.acknowledgePurchase(params) - Timber.i("Acknowledgement result: ${result.responseCode}, ${result.debugMessage}") - } - } - - purchaseListSubject.onNext(purchases) - } - - private suspend fun executeServiceRequest(runnable: suspend () -> Unit) { - if (billingClientState.first() != BillingClient.BillingResponseCode.OK) { - Timber.i("Starting billing service") - billingClient.startConnection(this) - } - - billingClientState.first { state -> state == BillingClient.BillingResponseCode.OK } - runnable() - } - - override fun onBillingSetupFinished(result: BillingResult) { - Timber.i("Billing response: ${result.responseCode}") - billingClientState.tryEmit(result.responseCode) - } - - override fun onBillingServiceDisconnected() { - Timber.i("Billing service disconnected") - billingClientState.tryEmit(BillingClient.BillingResponseCode.SERVICE_DISCONNECTED) - } - -} diff --git a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt deleted file mode 100644 index b87e93f5..00000000 --- a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.common.util - -import android.util.Log -import com.google.firebase.crashlytics.FirebaseCrashlytics -import timber.log.Timber - -class CrashlyticsTree : Timber.Tree() { - - override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { - val crashlytics = FirebaseCrashlytics.getInstance() - val priorityString = when (priority) { - Log.VERBOSE -> "V" - Log.DEBUG -> "D" - Log.INFO -> "I" - Log.WARN -> "W" - Log.ERROR -> "E" - else -> "WTF" - } - - crashlytics.log("$priorityString/$tag: $message") - throwable?.run(crashlytics::recordException) - } - -} diff --git a/repo/entry.jar b/repo/entry.jar new file mode 100644 index 00000000..9e978357 Binary files /dev/null and b/repo/entry.jar differ diff --git a/repo/entry.json b/repo/entry.json new file mode 100644 index 00000000..8b134780 --- /dev/null +++ b/repo/entry.json @@ -0,0 +1 @@ +{"timestamp": 1751138712000, "version": 20002, "index": {"name": "/index-v2.json", "sha256": "368eb849f97f8bd5ca4849e5e4b0498ecea417845bbee7cc7a1854f259761c14", "size": 620, "numPackages": 0}, "diffs": {}} \ No newline at end of file diff --git a/repo/icons/icon.png b/repo/icons/icon.png new file mode 100644 index 00000000..689d040b Binary files /dev/null and b/repo/icons/icon.png differ diff --git a/repo/icons/metadata/en-US/images/icon.png b/repo/icons/metadata/en-US/images/icon.png new file mode 100644 index 00000000..689d040b Binary files /dev/null and b/repo/icons/metadata/en-US/images/icon.png differ diff --git a/repo/index-v1.jar b/repo/index-v1.jar new file mode 100644 index 00000000..21e9e90f Binary files /dev/null and b/repo/index-v1.jar differ diff --git a/repo/index-v1.json b/repo/index-v1.json new file mode 100644 index 00000000..13e9536a --- /dev/null +++ b/repo/index-v1.json @@ -0,0 +1 @@ +{"repo": {"timestamp": 1751138712000, "version": 20002, "name": "My First F-Droid Repo Demo", "icon": "metadata/en-US/images/icon.png", "address": "https://MyFirstFDroidRepo.org/fdroid/repo", "description": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."}, "requests": {"install": [], "uninstall": []}, "apps": [], "packages": {}} \ No newline at end of file diff --git a/repo/index-v2.json b/repo/index-v2.json new file mode 100644 index 00000000..7909e19b --- /dev/null +++ b/repo/index-v2.json @@ -0,0 +1 @@ +{"repo": {"name": {"en-US": "My First F-Droid Repo Demo"}, "description": {"en-US": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."}, "icon": {"en-US": {"name": "/icons/metadata/en-US/images/icon.png", "sha256": "f1b335114755dc09db369aa13ddf2b98063e0045c4a4c18e900d8b7646201c5d", "size": 72175}}, "address": "https://MyFirstFDroidRepo.org/fdroid/repo", "timestamp": 1751138712000}, "packages": {}} \ No newline at end of file diff --git a/repo/index.css b/repo/index.css new file mode 100644 index 00000000..6255e28a --- /dev/null +++ b/repo/index.css @@ -0,0 +1,228 @@ +/* auto-generated - fdroid index updates will overwrite this file */ +BODY { + font-family : Arial, Helvetica, Sans-Serif; + color : #0000ee; + background-color : #ffffff; +} +p { + text-align : justify; +} +p.center { + text-align : center; +} +TD { + font-family : Arial, Helvetica, Sans-Serif; + color : #0000ee; +} +body,td { + font-size : 14px; +} +TH { + font-family : Arial, Helvetica, Sans-Serif; + color : #0000ee; + background-color : #F5EAD4; +} +a:link { + color : #bb0000; +} +a:visited { + color : #ff0000; +} +.zitat { + margin-left : 1cm; + margin-right : 1cm; + font-style : italic; +} +#intro { + border-spacing : 1em; + border : 1px solid gray; + border-radius : 0.5em; + box-shadow : 10px 10px 5px #888; + margin : 1.5em; + font-size : .9em; + width : 600px; + max-width : 90%; + display : table; + margin-left : auto; + margin-right : auto; + font-size : .8em; + color : #555555; +} +#intro > p { + margin-top : 0; +} +#intro p:last-child { + margin-bottom : 0; +} +.last { + border-bottom : 1px solid black; + padding-bottom : .5em; + text-align : center; +} +table { + border-collapse : collapse; +} +h2 { + text-align : center; +} +.perms { + font-family : monospace; + font-size : .8em; +} +.repoapplist { + display : table; + border-collapse : collapse; + margin-left : auto; + margin-right : auto; + width : 600px; + max-width : 90%; +} +.approw, appdetailrow { + display : table-row; +} +.appdetailrow { + display : flex; + padding : .5em; +} +.appiconbig, .appdetailblock, .appdetailcell { + display : table-cell +} +.appiconbig { + vertical-align : middle; + text-align : center; +} +.appdetailinner { + width : 100%; +} +.applinkcell { + text-align : center; + float : right; + width : 100%; + margin-bottom : .1em; +} +.paddedlink { + margin : 1em; +} +.approw { + border-spacing : 1em; + border : 1px solid gray; + border-radius : 0.5em; + padding : 0.5em; + margin : 1.5em; +} +.appdetailinner .appdetailrow:first-child { + background-color : #d5d5d5; +} +.appdetailinner .appdetailrow:first-child .appdetailcell { + min-width : 33%; + flex : 1 33%; + text-align : center; +} +.appdetailinner .appdetailrow:first-child .appdetailcell:first-child { + text-align : left; +} +.appdetailinner .appdetailrow:first-child .appdetailcell:last-child { + float : none; + text-align : right; +} +.minor-details { + font-size : .8em; + color : #555555; +} +.boldname { + font-weight : bold; +} +#appcount { + text-align : center; + margin-bottom : .5em; +} +kbd { + padding : 0.1em 0.6em; + border : 1px solid #CCC; + background-color : #F7F7F7; + color : #333; + box-shadow : 0px 1px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 2px #FFF inset; + border-radius : 3px; + display : inline-block; + margin : 0px 0.1em; + text-shadow : 0px 1px 0px #FFF; + white-space : nowrap; +} +div.filterline, div.repoline { + display : table; + margin-left : auto; + margin-right : auto; + margin-bottom : 1em; + vertical-align : middle; + display : table; + font-size : .8em; +} +.filterline form { + display : table-row; +} +.filterline .filtercell { + display : table-cell; + vertical-align : middle; +} +fieldset { + float : left; +} +fieldset select, fieldset input, #reposelect select, #reposelect input { + font-size : .9em; +} +.pager { + display : table; + margin-left : auto; + margin-right : auto; + width : 600px; + max-width : 90%; + padding-top : .6em; +} +/* should correspond to .repoapplist */ +.pagerrow { + display : table-row; +} +.pagercell { + display : table-cell; +} +.pagercell.left { + text-align : left; + padding-right : 1em; +} +.pagercell.middle { + text-align : center; + font-size : .9em; + color : #555; +} +.pagercell.right { + text-align : right; + padding-left : 1em; +} +.anti { + color : peru; +} +.antibold { + color : crimson; +} +#footer { + text-align : center; + margin-top : 1em; + font-size : 11px; + color : #555; +} +#footer img { + vertical-align : middle; +} +@media (max-width: 600px) { + .repoapplist { + display : block; + } + .appdetailinner, .appdetailrow { + display : block; + } + .appdetailcell { + display : block; + float : left; + line-height : 1.5em; + } +} \ No newline at end of file diff --git a/repo/index.html b/repo/index.html new file mode 100644 index 00000000..d829f3de --- /dev/null +++ b/repo/index.html @@ -0,0 +1,56 @@ + + + + + + + + My First F-Droid Repo Demo + + + + + + + + + + + + +

+ My First F-Droid Repo Demo +

+
+

+ + + QR: test + + + This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid. +
+
+ Currently it serves + + 0 + + apps. To add it to your F-Droid app, scan the QR code (click it to enlarge) or use this link: +

+

+ + + https://MyFirstFDroidRepo.org/fdroid/repo + + +

+

+ If you would like to manually verify the fingerprint (SHA-256) of the repository signing key, here it is: +
+ + C5 49 A1 FE 45 7A 8D 8A 8B 3B 06 21 D4 80 EA 83 79 72 A0 BB 34 A7 1C 7A 0D E3 67 0F 6F 1A 1E F1 + +

+
+ + diff --git a/repo/index.jar b/repo/index.jar new file mode 100644 index 00000000..bbcd9447 Binary files /dev/null and b/repo/index.jar differ diff --git a/repo/index.png b/repo/index.png new file mode 100644 index 00000000..1dce1567 Binary files /dev/null and b/repo/index.png differ diff --git a/repo/index.xml b/repo/index.xml new file mode 100644 index 00000000..09e5f45c --- /dev/null +++ b/repo/index.xml @@ -0,0 +1 @@ +This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid. \ No newline at end of file diff --git a/repo/status/running.json b/repo/status/running.json new file mode 100644 index 00000000..785cb00a --- /dev/null +++ b/repo/status/running.json @@ -0,0 +1 @@ +{"/etc/issue.net":"Ubuntu 24.04.2 LTS","antiFeatures":{},"apksigner":"/usr/local/lib/android/sdk/build-tools/36.0.0/apksigner","archivePolicy0":[],"commandLine":["/opt/hostedtoolcache/Python/3.13.5/x64/bin/fdroid update"],"disabled":[],"endTimestamp":1751138715589,"failedBuilds":{},"fdroiddata":{"commitId":"ef1a9809ffaa0be861e3b7808031a6c43b6a6bef","isDirty":false,"modifiedFiles":[],"untrackedFiles":["config.yml","keystore.p12","repo/icons/metadata/en-US/images/icon.png"]},"jarsigner":"/usr/bin/jarsigner","keytool":"/usr/bin/keytool","needsUpdate":[],"noPackages":[],"noUpdateCheck":[],"stages":{"delete_disabled_builds":1751138712745,"index.make repo":1751138712749,"prepare_apps repo":1751138712747,"process_apks":1751138712746,"read_added_date_from_all_apks":1751138712747,"remove_apks":1751138712747,"scan_repo_files":1751138712746},"startTimestamp":1751138712000,"subcommand":"update"} \ No newline at end of file diff --git a/repo/status/update.json b/repo/status/update.json new file mode 100644 index 00000000..785cb00a --- /dev/null +++ b/repo/status/update.json @@ -0,0 +1 @@ +{"/etc/issue.net":"Ubuntu 24.04.2 LTS","antiFeatures":{},"apksigner":"/usr/local/lib/android/sdk/build-tools/36.0.0/apksigner","archivePolicy0":[],"commandLine":["/opt/hostedtoolcache/Python/3.13.5/x64/bin/fdroid update"],"disabled":[],"endTimestamp":1751138715589,"failedBuilds":{},"fdroiddata":{"commitId":"ef1a9809ffaa0be861e3b7808031a6c43b6a6bef","isDirty":false,"modifiedFiles":[],"untrackedFiles":["config.yml","keystore.p12","repo/icons/metadata/en-US/images/icon.png"]},"jarsigner":"/usr/bin/jarsigner","keytool":"/usr/bin/keytool","needsUpdate":[],"noPackages":[],"noUpdateCheck":[],"stages":{"delete_disabled_builds":1751138712745,"index.make repo":1751138712749,"prepare_apps repo":1751138712747,"process_apks":1751138712746,"read_added_date_from_all_apks":1751138712747,"remove_apks":1751138712747,"scan_repo_files":1751138712746},"startTimestamp":1751138712000,"subcommand":"update"} \ No newline at end of file diff --git a/tmp/repo_1751138712000.json b/tmp/repo_1751138712000.json new file mode 100644 index 00000000..7909e19b --- /dev/null +++ b/tmp/repo_1751138712000.json @@ -0,0 +1 @@ +{"repo": {"name": {"en-US": "My First F-Droid Repo Demo"}, "description": {"en-US": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."}, "icon": {"en-US": {"name": "/icons/metadata/en-US/images/icon.png", "sha256": "f1b335114755dc09db369aa13ddf2b98063e0045c4a4c18e900d8b7646201c5d", "size": 72175}}, "address": "https://MyFirstFDroidRepo.org/fdroid/repo", "timestamp": 1751138712000}, "packages": {}} \ No newline at end of file