diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a5bb7c2a6c..d8c1bb6c49 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -14,50 +14,6 @@ env: -Porg.gradle.jvmargs=-Xmx4g -Porg.gradle.parallel=false jobs: - # Build Android Tests [Matrix SDK] - build-android-test-matrix-sdk: - name: Matrix SDK - Build Android Tests - runs-on: macos-latest - # No concurrency required, runs every time on a schedule. - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v2 - with: - distribution: 'adopt' - java-version: 11 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Build Android Tests for matrix-sdk-android - run: ./gradlew clean matrix-sdk-android:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace - - # Build Android Tests [Matrix APP] - build-android-test-app: - name: App - Build Android Tests - runs-on: macos-latest - # No concurrency required, runs every time on a schedule. - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v2 - with: - distribution: 'adopt' - java-version: 11 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Build Android Tests for vector - run: ./gradlew clean vector:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace - # Run Android Tests integration-tests: name: Matrix SDK - Running Integration Tests @@ -87,11 +43,11 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Start synapse server - run: | - pip install matrix-synapse - curl https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh -o start.sh - chmod 777 start.sh - ./start.sh --no-rate-limit + uses: michaelkaye/setup-matrix-synapse@v0.3.0 + with: + uploadLogs: true + httpPort: 8080 + disableRateLimiting: true # package: org.matrix.android.sdk.session - name: Run integration tests for Matrix SDK [org.matrix.android.sdk.session] API[${{ matrix.api-level }}] uses: reactivecircus/android-emulator-runner@v2 @@ -274,10 +230,11 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Start synapse server - run: | - pip install matrix-synapse - curl -sL https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh \ - | sed s/127.0.0.1/0.0.0.0/g | sed 's/http:\/\/localhost/http:\/\/10.0.2.2/g' | bash -s -- --no-rate-limit + uses: michaelkaye/setup-matrix-synapse@v0.3.0 + with: + uploadLogs: true + httpPort: 8080 + disableRateLimiting: true - uses: actions/setup-java@v2 with: distribution: 'adopt' @@ -366,9 +323,6 @@ jobs: needs: - integration-tests - ui-tests -# - unit-tests - - build-android-test-matrix-sdk - - build-android-test-app - sonarqube if: always() && github.event_name != 'workflow_dispatch' # No concurrency required, runs every time on a schedule. diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d739afcd30..587bf14488 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,6 +12,30 @@ env: -Porg.gradle.parallel=false jobs: + # Build Android Tests + build-android-tests: + name: Build Android Tests + runs-on: ubuntu-latest + concurrency: + group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('build-android-tests-{0}', github.ref) }} + cancel-in-progress: true + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: 11 + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Build Android Tests + run: ./gradlew clean assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace + unit-tests: name: Run Unit Tests runs-on: ubuntu-latest @@ -41,3 +65,20 @@ jobs: ( github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository ) with: files: ./**/build/test-results/**/*.xml + +# Notify the channel about runs against develop or main that have failures, as PRs should have caught these first. + notify: + runs-on: ubuntu-latest + needs: + - unit-tests + - build-android-tests + if: ${{ (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' ) && failure() }} + steps: + - uses: michaelkaye/matrix-hookshot-action@v0.3.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + matrix_access_token: ${{ secrets.ELEMENT_ANDROID_NOTIFICATION_ACCESS_TOKEN }} + matrix_room_id: ${{ secrets.ELEMENT_ANDROID_INTERNAL_ROOM_ID }} + text_template: "Build is broken for ${{ github.ref }}: {{#each job_statuses }}{{#with this }}{{#if completed }}{{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}" + html_template: "Build is broken for ${{ github.ref }}: {{#each job_statuses }}{{#with this }}{{#if completed }}
{{icon conclusion }} {{name}} {{conclusion}} at {{completed_at}} [details]{{/if}}{{/with}}{{/each}}" + diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml index ed572b573f..85290e72df 100644 --- a/.idea/dictionaries/bmarty.xml +++ b/.idea/dictionaries/bmarty.xml @@ -11,6 +11,7 @@ emoji emojis fdroid + ganfra gplay hmac homeserver @@ -18,6 +19,7 @@ ktlint linkified linkify + manu megolm msisdn msisdns diff --git a/CHANGES.md b/CHANGES.md index 318290107a..c411593627 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,49 @@ +Changes in Element v1.4.4 (2022-03-09) +====================================== + +Features ✨ +---------- + - Adds animated typing indicator to the bottom of the timeline ([#3296](https://github.com/vector-im/element-android/issues/3296)) + - Removes the topic and typing information from the room's top bar ([#4642](https://github.com/vector-im/element-android/issues/4642)) + - Add possibility to save media from Gallery + reorder choices in message context menu ([#5005](https://github.com/vector-im/element-android/issues/5005)) + - Improves settings error dialog messaging when changing avatar or display name fails ([#5418](https://github.com/vector-im/element-android/issues/5418)) + +Bugfixes 🐛 +---------- + - Open direct message screen when clicking on DM button in the space members list ([#4319](https://github.com/vector-im/element-android/issues/4319)) + - Fix incorrect media cache size in settings ([#5394](https://github.com/vector-im/element-android/issues/5394)) + - Setting an avatar when creating a room had no effect ([#5402](https://github.com/vector-im/element-android/issues/5402)) + - Fix reactions summary crash when reopening a room ([#5463](https://github.com/vector-im/element-android/issues/5463)) + - Fixing room titles overlapping the room image in the room toolbar ([#5468](https://github.com/vector-im/element-android/issues/5468)) + +In development 🚧 +---------------- + - Starts the FTUE account personalisation flow by adding an account created screen behind a feature flag ([#5158](https://github.com/vector-im/element-android/issues/5158)) + +SDK API changes ⚠️ +------------------ + - Change name of getTimeLineEvent and getTimeLineEventLive methods to getTimelineEvent and getTimelineEventLive. ([#5330](https://github.com/vector-im/element-android/issues/5330)) + +Other changes +------------- + - Improve Bubble layouts rendering ([#5303](https://github.com/vector-im/element-android/issues/5303)) + - Continue improving realm usage (potentially helping with storage and RAM usage) ([#5330](https://github.com/vector-im/element-android/issues/5330)) + - Update reaction button layout. ([#5313](https://github.com/vector-im/element-android/issues/5313)) + - Adds forceLoginFallback feature flag and usages to FTUE login and registration ([#5325](https://github.com/vector-im/element-android/issues/5325)) + - Override task affinity to prevent unknown activities running in our app tasks. ([#4498](https://github.com/vector-im/element-android/issues/4498)) + - Tentatively fixing the UI sanity test being unable to click on the space menu items ([#5269](https://github.com/vector-im/element-android/issues/5269)) + - Moves attachment-viewer, diff-match-patch, and multipicker modules to subfolders under library ([#5309](https://github.com/vector-im/element-android/issues/5309)) + - Log the `since` token used and `next_batch` token returned when doing an incremental sync. ([#5312](https://github.com/vector-im/element-android/issues/5312), [#5318](https://github.com/vector-im/element-android/issues/5318)) + - Upgrades material dependency version from 1.4.0 to 1.5.0 ([#5392](https://github.com/vector-im/element-android/issues/5392)) + - Using app name instead of hardcoded "Element" for exported keys filename ([#5326](https://github.com/vector-im/element-android/issues/5326)) + - Upgrade the plugin which generate strings with template from 1.2.2 to 2.0.0 ([#5348](https://github.com/vector-im/element-android/issues/5348)) + - Remove about 700 unused strings and their translations ([#5352](https://github.com/vector-im/element-android/issues/5352)) + - Creates dedicated VectorOverrides for forcing behaviour for local testing/development ([#5361](https://github.com/vector-im/element-android/issues/5361)) + - Cleanup unused threads build configurations ([#5379](https://github.com/vector-im/element-android/issues/5379)) + - Notify element-android channel each time a nightly build completes. ([#5314](https://github.com/vector-im/element-android/issues/5314)) + - Iterate on badge / unread indicator color ([#5456](https://github.com/vector-im/element-android/issues/5456)) + + Changes in Element v1.4.2 (2022-02-22 Palindrome Day!) ====================================================== diff --git a/changelog.d/3296.bugfix b/changelog.d/3296.bugfix deleted file mode 100644 index e5f8799f21..0000000000 --- a/changelog.d/3296.bugfix +++ /dev/null @@ -1 +0,0 @@ -Typing notifications moved from the header to the bottom of the timeline. \ No newline at end of file diff --git a/changelog.d/4319.bugfix b/changelog.d/4319.bugfix deleted file mode 100644 index da42c864c6..0000000000 --- a/changelog.d/4319.bugfix +++ /dev/null @@ -1 +0,0 @@ -Open direct message screen when clicking on DM button in the space members list diff --git a/changelog.d/4498.misc b/changelog.d/4498.misc deleted file mode 100644 index 78493b5d77..0000000000 --- a/changelog.d/4498.misc +++ /dev/null @@ -1 +0,0 @@ -Override task affinity to prevent unknown activities running in our app tasks. \ No newline at end of file diff --git a/changelog.d/4533.misc b/changelog.d/4533.misc new file mode 100644 index 0000000000..1137a1c43c --- /dev/null +++ b/changelog.d/4533.misc @@ -0,0 +1 @@ +Improve headers UI in Rooms/Messages lists diff --git a/changelog.d/4642.bugfix b/changelog.d/4642.bugfix deleted file mode 100644 index 2a5ea97196..0000000000 --- a/changelog.d/4642.bugfix +++ /dev/null @@ -1 +0,0 @@ -Update the top bar in a room: remove topic and typing information \ No newline at end of file diff --git a/changelog.d/4860.bugfix b/changelog.d/4860.bugfix new file mode 100644 index 0000000000..32049face4 --- /dev/null +++ b/changelog.d/4860.bugfix @@ -0,0 +1 @@ +Add colors for shield vector drawable \ No newline at end of file diff --git a/changelog.d/5005.feature b/changelog.d/5005.feature deleted file mode 100644 index ce3b2ad1f9..0000000000 --- a/changelog.d/5005.feature +++ /dev/null @@ -1 +0,0 @@ -Add possibility to save media from Gallery + reorder choices in message context menu diff --git a/changelog.d/5158.wip b/changelog.d/5158.wip deleted file mode 100644 index 67a3d83a7a..0000000000 --- a/changelog.d/5158.wip +++ /dev/null @@ -1 +0,0 @@ -Starts the FTUE account personalisation flow by adding an account created screen behind a feature flag \ No newline at end of file diff --git a/changelog.d/5269.misc b/changelog.d/5269.misc deleted file mode 100644 index 699ddfd3dd..0000000000 --- a/changelog.d/5269.misc +++ /dev/null @@ -1 +0,0 @@ -Tentatively fixing the UI sanity test being unable to click on the space menu items \ No newline at end of file diff --git a/changelog.d/5303.misc b/changelog.d/5303.misc deleted file mode 100644 index dbad0b738d..0000000000 --- a/changelog.d/5303.misc +++ /dev/null @@ -1 +0,0 @@ -Improve Bubble layouts rendering. \ No newline at end of file diff --git a/changelog.d/5309.misc b/changelog.d/5309.misc deleted file mode 100644 index 83771995af..0000000000 --- a/changelog.d/5309.misc +++ /dev/null @@ -1 +0,0 @@ -Moves attachment-viewer, diff-match-patch, and multipicker modules to subfolders under library \ No newline at end of file diff --git a/changelog.d/5312.misc b/changelog.d/5312.misc deleted file mode 100644 index d724f1ba3f..0000000000 --- a/changelog.d/5312.misc +++ /dev/null @@ -1 +0,0 @@ -Log the `since` token used and `next_batch` token returned when doing an incremental sync. diff --git a/changelog.d/5313.misc b/changelog.d/5313.misc deleted file mode 100644 index efc225a0a4..0000000000 --- a/changelog.d/5313.misc +++ /dev/null @@ -1 +0,0 @@ -Update reaction button layout. \ No newline at end of file diff --git a/changelog.d/5314.misc b/changelog.d/5314.misc deleted file mode 100644 index 35fed08a61..0000000000 --- a/changelog.d/5314.misc +++ /dev/null @@ -1 +0,0 @@ -Notify element-android channel each time a nightly build completes. diff --git a/changelog.d/5318.misc b/changelog.d/5318.misc deleted file mode 100644 index d724f1ba3f..0000000000 --- a/changelog.d/5318.misc +++ /dev/null @@ -1 +0,0 @@ -Log the `since` token used and `next_batch` token returned when doing an incremental sync. diff --git a/changelog.d/5325.feature b/changelog.d/5325.feature deleted file mode 100644 index 23754c790d..0000000000 --- a/changelog.d/5325.feature +++ /dev/null @@ -1 +0,0 @@ -Adds forceLoginFallback feature flag and usages to FTUE login and registration \ No newline at end of file diff --git a/changelog.d/5326.misc b/changelog.d/5326.misc deleted file mode 100644 index 5ffa732d53..0000000000 --- a/changelog.d/5326.misc +++ /dev/null @@ -1 +0,0 @@ -[Export e2ee keys] use appName instead of element \ No newline at end of file diff --git a/changelog.d/5330.misc b/changelog.d/5330.misc deleted file mode 100644 index 6315ad536c..0000000000 --- a/changelog.d/5330.misc +++ /dev/null @@ -1 +0,0 @@ -Continue improving realm usage. \ No newline at end of file diff --git a/changelog.d/5330.sdk b/changelog.d/5330.sdk deleted file mode 100644 index 3f6d46401c..0000000000 --- a/changelog.d/5330.sdk +++ /dev/null @@ -1 +0,0 @@ -Change name of getTimeLineEvent and getTimeLineEventLive methods to getTimelineEvent and getTimelineEventLive. \ No newline at end of file diff --git a/changelog.d/5346.misc b/changelog.d/5346.misc new file mode 100644 index 0000000000..f979c180ef --- /dev/null +++ b/changelog.d/5346.misc @@ -0,0 +1 @@ +Selected space highlight changed in left panel \ No newline at end of file diff --git a/changelog.d/5348.misc b/changelog.d/5348.misc deleted file mode 100644 index f5ee8627ce..0000000000 --- a/changelog.d/5348.misc +++ /dev/null @@ -1 +0,0 @@ -Upgrade the plugin which generate strings with template from 1.2.2 to 2.0.0 \ No newline at end of file diff --git a/changelog.d/5352.misc b/changelog.d/5352.misc deleted file mode 100644 index 956de682d8..0000000000 --- a/changelog.d/5352.misc +++ /dev/null @@ -1 +0,0 @@ -Remove about 700 unused strings and their translations \ No newline at end of file diff --git a/changelog.d/5361.misc b/changelog.d/5361.misc deleted file mode 100644 index d49554c7e7..0000000000 --- a/changelog.d/5361.misc +++ /dev/null @@ -1 +0,0 @@ -Creates dedicated VectorOverrides for forcing behaviour for local testing/development \ No newline at end of file diff --git a/changelog.d/5375.wip b/changelog.d/5375.wip new file mode 100644 index 0000000000..352b2385a9 --- /dev/null +++ b/changelog.d/5375.wip @@ -0,0 +1 @@ +Dynamically showing/hiding onboarding personalisation screens based on the users homeserver capabilities \ No newline at end of file diff --git a/changelog.d/5379.misc b/changelog.d/5379.misc deleted file mode 100644 index d485636f10..0000000000 --- a/changelog.d/5379.misc +++ /dev/null @@ -1 +0,0 @@ -Cleanup unused threads build configurations \ No newline at end of file diff --git a/changelog.d/5384.misc b/changelog.d/5384.misc new file mode 100644 index 0000000000..dca87422bb --- /dev/null +++ b/changelog.d/5384.misc @@ -0,0 +1 @@ +Add top margin before our first message diff --git a/changelog.d/5392.misc b/changelog.d/5392.misc deleted file mode 100644 index 54d7dba992..0000000000 --- a/changelog.d/5392.misc +++ /dev/null @@ -1 +0,0 @@ -Upgrades material dependency version from 1.4.0 to 1.5.0 diff --git a/changelog.d/5394.bugfix b/changelog.d/5394.bugfix deleted file mode 100644 index f8c5311492..0000000000 --- a/changelog.d/5394.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix incorrect media cache size in settings \ No newline at end of file diff --git a/changelog.d/5395.feature b/changelog.d/5395.feature new file mode 100644 index 0000000000..eb16c6cd81 --- /dev/null +++ b/changelog.d/5395.feature @@ -0,0 +1 @@ +Add a custom view to display a picker for share location options diff --git a/changelog.d/5402.bugfix b/changelog.d/5402.bugfix deleted file mode 100644 index fde9e7e74f..0000000000 --- a/changelog.d/5402.bugfix +++ /dev/null @@ -1 +0,0 @@ -[Create room] Setting an avatar when creating a room had no effect \ No newline at end of file diff --git a/changelog.d/5418.feature b/changelog.d/5418.feature deleted file mode 100644 index 5e1efc8718..0000000000 --- a/changelog.d/5418.feature +++ /dev/null @@ -1 +0,0 @@ -Improves settings error dialog messaging when changing avatar or display name fails \ No newline at end of file diff --git a/changelog.d/5443.misc b/changelog.d/5443.misc new file mode 100644 index 0000000000..f9fd715403 --- /dev/null +++ b/changelog.d/5443.misc @@ -0,0 +1 @@ +Adds stable room hierarchy endpoint with a fallback to the unstable one diff --git a/changelog.d/5448.bugfix b/changelog.d/5448.bugfix new file mode 100644 index 0000000000..c4e8fb4a49 --- /dev/null +++ b/changelog.d/5448.bugfix @@ -0,0 +1 @@ +Fix missing messages when loading messages forwards diff --git a/changelog.d/5456.misc b/changelog.d/5456.misc deleted file mode 100644 index 94746ca788..0000000000 --- a/changelog.d/5456.misc +++ /dev/null @@ -1 +0,0 @@ -Iterate on badge / unread indicator color \ No newline at end of file diff --git a/changelog.d/5501.misc b/changelog.d/5501.misc new file mode 100644 index 0000000000..6c46a105b7 --- /dev/null +++ b/changelog.d/5501.misc @@ -0,0 +1 @@ +Use ColorPrimary for attachmentGalleryButton tint \ No newline at end of file diff --git a/changelog.d/5514.bugfix b/changelog.d/5514.bugfix new file mode 100644 index 0000000000..0dfbca6e9a --- /dev/null +++ b/changelog.d/5514.bugfix @@ -0,0 +1 @@ +Read receipt in wrong order \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index 87b8e3c12f..1f2a08b6a6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -58,6 +58,7 @@ ext.libs = [ 'lifecycleCommon' : "androidx.lifecycle:lifecycle-common:$lifecycle", 'lifecycleLivedata' : "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle", 'lifecycleProcess' : "androidx.lifecycle:lifecycle-process:$lifecycle", + 'lifecycleRuntimeKtx' : "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle", 'datastore' : "androidx.datastore:datastore:1.0.0", 'datastorepreferences' : "androidx.datastore:datastore-preferences:1.0.0", 'pagingRuntimeKtx' : "androidx.paging:paging-runtime-ktx:2.1.2", @@ -141,4 +142,4 @@ ext.libs = [ 'timberJunitRule' : "net.lachlanmckee:timber-junit-rule:1.0.1", 'junit' : "junit:junit:4.13.2" ] -] \ No newline at end of file +] diff --git a/fastlane/metadata/android/en-US/changelogs/40104040.txt b/fastlane/metadata/android/en-US/changelogs/40104040.txt new file mode 100644 index 0000000000..d36b10c390 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40104040.txt @@ -0,0 +1,2 @@ +Main changes in this version: typing indicator UI updates. Various bug fixes and stability improvements. +Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.4.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dcf5e2cb7b..db3bccc1f9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionSha256Sum=a9a7b7baba105f6557c9dcf9c3c6e8f7e57e6b49889c5f1d133f015d0727e4be +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt index 227ac2a71d..00d66645e6 100644 --- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt +++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt @@ -20,7 +20,6 @@ import android.content.ClipData import android.content.ClipboardManager import android.content.Context import android.view.ContextMenu -import android.view.Menu import android.view.View import android.widget.LinearLayout import android.widget.TextView @@ -77,10 +76,7 @@ internal abstract class ValueItem : EpoxyModelWithHolder() { menuInfo: ContextMenu.ContextMenuInfo? ) { if (copyValue != null) { - val menuItem = menu?.add( - Menu.NONE, R.id.copy_value, - Menu.NONE, R.string.copy_value - ) + val menuItem = menu?.add(R.string.copy_value) val clipService = v?.context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager menuItem?.setOnMenuItemClickListener { diff --git a/library/jsonviewer/src/main/res/menu/jv_menu_item.xml b/library/jsonviewer/src/main/res/menu/jv_menu_item.xml deleted file mode 100644 index 4da69b5117..0000000000 --- a/library/jsonviewer/src/main/res/menu/jv_menu_item.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/library/jsonviewer/src/main/res/values/strings.xml b/library/jsonviewer/src/main/res/values/strings.xml index cc4b8726b4..fbd67256f5 100644 --- a/library/jsonviewer/src/main/res/values/strings.xml +++ b/library/jsonviewer/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ + Copy Value diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml index 0f129fb406..cc15bb1b3b 100644 --- a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml +++ b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml @@ -71,19 +71,6 @@ android:enabled="false" android:text="Destructive disabled" /> -