mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-25 14:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2941 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-8.0.0

Browse source 
Build(deps): Bump com.android.tools.build:gradle from 7.4.2 to 8.0.0
This commit is contained in:
Andy Scherzinger 2023-04-17 10:30:27 +02:00 committed by GitHub
commit 1227961ad8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 100 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.drone.yml
View file

@ -4,7 +4,7 @@ name: generic
steps:
- name: generic
image: ghcr.io/nextcloud/continuous-integration-android8:2
image: ghcr.io/nextcloud/continuous-integration-android8:3
commands:
- ./gradlew --console=plain assembleGeneric
@ -23,7 +23,7 @@ name: gplay
steps:
- name: gplay
image: ghcr.io/nextcloud/continuous-integration-android8:2
image: ghcr.io/nextcloud/continuous-integration-android8:3
commands:
- ./gradlew --console=plain assembleGplay
@ -42,7 +42,7 @@ name: tests
steps:
- name: all
image: ghcr.io/nextcloud/continuous-integration-android8:2
image: ghcr.io/nextcloud/continuous-integration-android8:3
privileged: true
commands:
- emulator -avd android -no-snapshot -gpu swiftshader_indirect -no-window -no-audio -skin 500x833 &

4
.github/workflows/analysis.yml vendored
View file

@ -32,11 +32,11 @@ jobs:
with:
repository: ${{ steps.get-vars.outputs.repo }}
ref: ${{ steps.get-vars.outputs.branch }}
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
with:
distribution: "temurin"
java-version: 11
java-version: 17
- name: Install dependencies
run: |
python3 -m pip install defusedxml

2
.github/workflows/assembleFlavors.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
with:
distribution: "temurin"
java-version: 11
java-version: 17
- name: Build ${{ matrix.flavor }}
run: |
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" >> gradle.properties

4
.github/workflows/check.yml vendored
View file

@ -16,10 +16,10 @@ jobs:
task: [ detekt, ktlintCheck ]
steps:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
with:
distribution: "temurin"
java-version: 11
java-version: 17
- name: Check ${{ matrix.task }}
run: ./gradlew ${{ matrix.task }}

2
.github/workflows/codeql.yml vendored
View file

@ -39,7 +39,7 @@ jobs:
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
with:
distribution: "temurin"
java-version: 11
java-version: 17
- name: Assemble
run: |
mkdir -p "$HOME/.gradle"

4
.github/workflows/qa.yml vendored
View file

@ -17,12 +17,12 @@ jobs:
id: check-secrets
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
if: ${{ steps.check-secrets.outputs.ok == 'true' }}
- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
if: ${{ steps.check-secrets.outputs.ok == 'true' }}
with:
distribution: "temurin"
java-version: 11
java-version: 17
- name: Build QA
if: ${{ steps.check-secrets.outputs.ok == 'true' }}
env:

4
app/build.gradle
View file

@ -122,8 +122,8 @@ android {
check.dependsOn 'spotbugsGplayDebug', 'lint', 'ktlintCheck', 'detekt'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
buildFeatures {

2
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
View file

@ -339,7 +339,7 @@ class ConversationItem(
}
companion object {
const val VIEW_TYPE = R.layout.rv_item_conversation_with_last_message
const val VIEW_TYPE = FlexibleItemViewType.CONVERSATION_ITEM
private const val MILLIES = 1000L
private const val STATUS_SIZE_IN_DP = 9f
private const val UNREAD_BUBBLE_STROKE_WIDTH = 6.0f

33
app/src/main/java/com/nextcloud/talk/adapters/items/FlexibleItemViewType.kt Normal file
View file

@ -0,0 +1,33 @@
/*
* Nextcloud Talk application
*
* @author Andy Scherzinger
* Copyright (C) 2023 Andy Scherzinger <info@andy-scherzinger.de>
*
* This program 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.
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.nextcloud.talk.adapters.items
class FlexibleItemViewType {
companion object {
const val CONVERSATION_ITEM: Int = 1120391230
const val LOAD_MORE_RESULTS_ITEM: Int = 1120391231
const val MESSAGE_RESULT_ITEM: Int = 1120391232
const val MESSAGES_TEXT_HEADER_ITEM: Int = 1120391233
const val POLL_RESULT_HEADER_ITEM: Int = 1120391234
const val POLL_RESULT_VOTER_ITEM: Int = 1120391235
const val POLL_RESULT_VOTERS_OVERVIEW_ITEM: Int = 1120391236
}
}

2
app/src/main/java/com/nextcloud/talk/adapters/items/LoadMoreResultsItem.kt
View file

@ -36,7 +36,7 @@ object LoadMoreResultsItem :
IFilterable<String> {
// layout is used as view type for uniqueness
const val VIEW_TYPE: Int = R.layout.rv_item_load_more
const val VIEW_TYPE = FlexibleItemViewType.LOAD_MORE_RESULTS_ITEM
class ViewHolder(view: View, adapter: FlexibleAdapter<*>) :
FlexibleViewHolder(view, adapter) {

3
app/src/main/java/com/nextcloud/talk/adapters/items/MessageResultItem.kt
View file

@ -92,8 +92,7 @@ data class MessageResultItem constructor(
}
companion object {
// layout is used as view type for uniqueness
const val VIEW_TYPE: Int = R.layout.rv_item_search_message
const val VIEW_TYPE = FlexibleItemViewType.MESSAGE_RESULT_ITEM
}
override fun getHeader(): GenericTextHeaderItem = MessagesTextHeaderItem(context, viewThemeUtils)

5
app/src/main/java/com/nextcloud/talk/adapters/items/MessagesTextHeaderItem.kt
View file

@ -28,10 +28,7 @@ import com.nextcloud.talk.ui.theme.ViewThemeUtils
class MessagesTextHeaderItem(context: Context, viewThemeUtils: ViewThemeUtils) :
GenericTextHeaderItem(context.getString(R.string.messages), viewThemeUtils) {
companion object {
/**
* "Random" value, just has to be different than other view types
*/
const val VIEW_TYPE = 1120391230
const val VIEW_TYPE = FlexibleItemViewType.MESSAGES_TEXT_HEADER_ITEM
}
override fun getItemViewType(): Int = VIEW_TYPE

3
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt
View file

@ -37,7 +37,6 @@ import com.nextcloud.talk.databinding.ItemCustomIncomingLinkPreviewMessageBindin
import com.nextcloud.talk.extensions.loadBotsAvatar
import com.nextcloud.talk.extensions.loadChangelogBotAvatar
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.DateUtils
@ -98,7 +97,7 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : M
true
}
itemView.setTag(MessageSwipeCallback.REPLYABLE_VIEW_TAG, message.replyable)
itemView.setTag(R.string.replyable_message_view_tag, message.replyable)
Reaction().showReactions(
message,

3
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
View file

@ -45,7 +45,6 @@ import com.nextcloud.talk.databinding.ItemCustomIncomingTextMessageBinding
import com.nextcloud.talk.extensions.loadBotsAvatar
import com.nextcloud.talk.extensions.loadChangelogBotAvatar
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.DateUtils
@ -111,7 +110,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) : MessageHolde
binding.messageQuote.quotedChatMessageView.visibility = View.GONE
}
itemView.setTag(MessageSwipeCallback.REPLYABLE_VIEW_TAG, message.replyable)
itemView.setTag(R.string.replyable_message_view_tag, message.replyable)
Reaction().showReactions(
message,

3
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt
View file

@ -36,7 +36,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA
import com.nextcloud.talk.databinding.ItemCustomOutcomingLinkPreviewMessageBinding
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.models.json.chat.ReadStatus
import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.DateUtils
@ -121,7 +120,7 @@ class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) :
true
}
itemView.setTag(MessageSwipeCallback.REPLYABLE_VIEW_TAG, message.replyable)
itemView.setTag(R.string.replyable_message_view_tag, message.replyable)
Reaction().showReactions(
message,

3
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
View file

@ -42,7 +42,6 @@ import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.databinding.ItemCustomOutcomingTextMessageBinding
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.models.json.chat.ReadStatus
import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.DateUtils
@ -127,7 +126,7 @@ class OutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessageViewH
binding.checkMark.setContentDescription(readStatusContentDescriptionString)
itemView.setTag(MessageSwipeCallback.REPLYABLE_VIEW_TAG, message.replyable)
itemView.setTag(R.string.replyable_message_view_tag, message.replyable)
Reaction().showReactions(
message,

3
app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt
View file

@ -54,7 +54,6 @@ import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding
import com.nextcloud.talk.extensions.loadChangelogBotAvatar
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.DateUtils
import com.nextcloud.talk.utils.DisplayUtils
@ -159,7 +158,7 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
}
messageText.text = ""
}
itemView.setTag(MessageSwipeCallback.REPLYABLE_VIEW_TAG, message.replyable)
itemView.setTag(R.string.replyable_message_view_tag, message.replyable)
Reaction().showReactions(
message,
::clickOnReaction,

4
app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.java
View file

@ -43,8 +43,6 @@ import javax.inject.Inject;
import androidx.core.view.ViewCompat;
import autodagger.AutoInjector;
import static com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback.REPLYABLE_VIEW_TAG;
@AutoInjector(NextcloudTalkApplication.class)
public class SystemMessageViewHolder extends MessageHolders.IncomingTextMessageViewHolder<ChatMessage> {
@ -109,6 +107,6 @@ public class SystemMessageViewHolder extends MessageHolders.IncomingTextMessageV
time.setText(dateUtils.getLocalTimeStringFromTimestamp(message.getTimestamp()));
}
itemView.setTag(REPLYABLE_VIEW_TAG, message.getReplyable());
itemView.setTag(R.string.replyable_message_view_tag, message.getReplyable());
}
}

5
app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultHeaderItem.kt
View file

@ -20,7 +20,7 @@
package com.nextcloud.talk.polls.adapters
import com.nextcloud.talk.R
import com.nextcloud.talk.adapters.items.FlexibleItemViewType
data class PollResultHeaderItem(
val name: String,
@ -33,7 +33,6 @@ data class PollResultHeaderItem(
}
companion object {
// layout is used as view type for uniqueness
const val VIEW_TYPE: Int = R.layout.poll_result_header_item
const val VIEW_TYPE = FlexibleItemViewType.POLL_RESULT_HEADER_ITEM
}
}

5
app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultVoterItem.kt
View file

@ -20,7 +20,7 @@
package com.nextcloud.talk.polls.adapters
import com.nextcloud.talk.R
import com.nextcloud.talk.adapters.items.FlexibleItemViewType
import com.nextcloud.talk.polls.model.PollDetails
data class PollResultVoterItem(
@ -32,7 +32,6 @@ data class PollResultVoterItem(
}
companion object {
// layout is used as view type for uniqueness
const val VIEW_TYPE: Int = R.layout.poll_result_voter_item
const val VIEW_TYPE = FlexibleItemViewType.POLL_RESULT_VOTER_ITEM
}
}

4
app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultVotersOverviewItem.kt
View file

@ -20,7 +20,7 @@
package com.nextcloud.talk.polls.adapters
import com.nextcloud.talk.R
import com.nextcloud.talk.adapters.items.FlexibleItemViewType
import com.nextcloud.talk.polls.model.PollDetails
data class PollResultVotersOverviewItem(
@ -33,6 +33,6 @@ data class PollResultVotersOverviewItem(
companion object {
// layout is used as view type for uniqueness
const val VIEW_TYPE: Int = R.layout.poll_result_voters_overview_item
const val VIEW_TYPE = FlexibleItemViewType.POLL_RESULT_VOTERS_OVERVIEW_ITEM
}
}

56
app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java
View file

@ -39,6 +39,9 @@ import com.nextcloud.talk.ui.theme.ViewThemeUtils;
import com.nextcloud.talk.utils.FileSortOrder;
import com.nextcloud.talk.utils.preferences.AppPreferences;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import androidx.annotation.NonNull;
@ -65,7 +68,7 @@ public class SortingOrderDialogFragment extends DialogFragment implements View.O
private SortingOrderFragmentBinding binding;
private View dialogView;
private View[] taggedViews;
private List<View> taggedViews;
private String currentSortOrderName;
public static SortingOrderDialogFragment newInstance(@NonNull FileSortOrder sortOrder) {
@ -121,31 +124,32 @@ public class SortingOrderDialogFragment extends DialogFragment implements View.O
viewThemeUtils.platform.themeDialog(binding.root);
viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(binding.cancel);
taggedViews = new View[12];
taggedViews[0] = binding.sortByNameAscending;
taggedViews[0].setTag(FileSortOrder.Companion.getSort_a_to_z());
taggedViews[1] = binding.sortByNameAZText;
taggedViews[1].setTag(FileSortOrder.Companion.getSort_a_to_z());
taggedViews[2] = binding.sortByNameDescending;
taggedViews[2].setTag(FileSortOrder.Companion.getSort_z_to_a());
taggedViews[3] = binding.sortByNameZAText;
taggedViews[3].setTag(FileSortOrder.Companion.getSort_z_to_a());
taggedViews[4] = binding.sortByModificationDateAscending;
taggedViews[4].setTag(FileSortOrder.Companion.getSort_old_to_new());
taggedViews[5] = binding.sortByModificationDateOldestFirstText;
taggedViews[5].setTag(FileSortOrder.Companion.getSort_old_to_new());
taggedViews[6] = binding.sortByModificationDateDescending;
taggedViews[6].setTag(FileSortOrder.Companion.getSort_new_to_old());
taggedViews[7] = binding.sortByModificationDateNewestFirstText;
taggedViews[7].setTag(FileSortOrder.Companion.getSort_new_to_old());
taggedViews[8] = binding.sortBySizeAscending;
taggedViews[8].setTag(FileSortOrder.Companion.getSort_small_to_big());
taggedViews[9] = binding.sortBySizeSmallestFirstText;
taggedViews[9].setTag(FileSortOrder.Companion.getSort_small_to_big());
taggedViews[10] = binding.sortBySizeDescending;
taggedViews[10].setTag(FileSortOrder.Companion.getSort_big_to_small());
taggedViews[11] = binding.sortBySizeBiggestFirstText;
taggedViews[11].setTag(FileSortOrder.Companion.getSort_big_to_small());
taggedViews = new ArrayList<>(12);
binding.sortByNameAscending.setTag(FileSortOrder.Companion.getSort_a_to_z());
taggedViews.add(binding.sortByNameAscending);
binding.sortByNameAZText.setTag(FileSortOrder.Companion.getSort_a_to_z());
taggedViews.add(binding.sortByNameAZText);
binding.sortByNameDescending.setTag(FileSortOrder.Companion.getSort_z_to_a());
taggedViews.add(binding.sortByNameDescending);
binding.sortByNameZAText.setTag(FileSortOrder.Companion.getSort_z_to_a());
taggedViews.add(binding.sortByNameZAText);
binding.sortByModificationDateAscending.setTag(FileSortOrder.Companion.getSort_old_to_new());
taggedViews.add(binding.sortByModificationDateAscending);
binding.sortByModificationDateOldestFirstText.setTag(FileSortOrder.Companion.getSort_old_to_new());
taggedViews.add(binding.sortByModificationDateOldestFirstText);
binding.sortByModificationDateDescending.setTag(FileSortOrder.Companion.getSort_new_to_old());
taggedViews.add(binding.sortByModificationDateDescending);
binding.sortByModificationDateNewestFirstText.setTag(FileSortOrder.Companion.getSort_new_to_old());
taggedViews.add(binding.sortByModificationDateNewestFirstText);
binding.sortBySizeAscending.setTag(FileSortOrder.Companion.getSort_small_to_big());
taggedViews.add(binding.sortBySizeAscending);
binding.sortBySizeSmallestFirstText.setTag(FileSortOrder.Companion.getSort_small_to_big());
taggedViews.add(binding.sortBySizeSmallestFirstText);
binding.sortBySizeDescending.setTag(FileSortOrder.Companion.getSort_big_to_small());
taggedViews.add(binding.sortBySizeDescending);
binding.sortBySizeBiggestFirstText.setTag(FileSortOrder.Companion.getSort_big_to_small());
taggedViews.add(binding.sortBySizeBiggestFirstText);
setupActiveOrderSelection();
}

5
app/src/main/java/com/nextcloud/talk/ui/recyclerview/MessageSwipeCallback.kt
View file

@ -74,8 +74,8 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
view = viewHolder.itemView
if (viewHolder.itemView.getTag(REPLYABLE_VIEW_TAG) != null &&
viewHolder.itemView.getTag(REPLYABLE_VIEW_TAG) as Boolean
if (viewHolder.itemView.getTag(R.string.replyable_message_view_tag) != null &&
viewHolder.itemView.getTag(R.string.replyable_message_view_tag) as Boolean
) {
imageDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_reply)!!
shareRound = AppCompatResources.getDrawable(context, R.drawable.round_bgnd)!!
@ -291,6 +291,5 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
const val ICON_BOUNDS_PIXEL_TOP: Int = 13
const val ICON_BOUNDS_PIXEL_RIGHT: Int = 12
const val ICON_BOUNDS_PIXEL_BOTTOM: Int = 11
const val REPLYABLE_VIEW_TAG: Int = R.string.replyable_message_view_tag
}
}

2
build.gradle
View file

@ -34,7 +34,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}"
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14'

5
gradle.properties
View file

@ -35,6 +35,9 @@ org.gradle.jvmargs=-XX:MaxHeapSize\=2048m -Xmx2048m
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
# org.gradle.parallel=true
org.gradle.daemon=true
@ -44,4 +47,4 @@ org.gradle.parallel=true
NC_TEST_SERVER_BASEURL=http://server
NC_TEST_SERVER_USERNAME=user1
NC_TEST_SERVER_PASSWORD=user1
NC_TEST_SERVER_PASSWORD=user1

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip