Skip to content

Commit

Permalink
Merge pull request #3936 from nextcloud/contacts_activity
Browse files Browse the repository at this point in the history
Contacts activity
  • Loading branch information
mahibi authored Jul 23, 2024
2 parents 9ff46f4 + 1255a0b commit eb18abe
Show file tree
Hide file tree
Showing 26 changed files with 1,205 additions and 316 deletions.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ ktlint_standard_import-ordering = disabled
ktlint_standard_wrapping = enabled
ij_kotlin_allow_trailing_comma = false
ij_kotlin_allow_trailing_comma_on_call_site = false
ktlint_function_naming_ignore_when_annotated_with = Composable
38 changes: 37 additions & 1 deletion .idea/inspectionProfiles/ktlint.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ apply plugin: 'com.github.spotbugs'
apply plugin: 'io.gitlab.arturbosch.detekt'
apply plugin: "org.jlleitschuh.gradle.ktlint"
apply plugin: 'kotlinx-serialization'
apply plugin: 'dagger.hilt.android.plugin'

android {
compileSdk 34
Expand All @@ -45,6 +46,7 @@ android {
flavorDimensions "default"
renderscriptTargetApi 19
renderscriptSupportModeEnabled true
javaCompileOptions.annotationProcessorOptions.arguments['dagger.hilt.disableModulesHaveInstallInCheck'] = 'true'

productFlavors {
// used for f-droid
Expand Down Expand Up @@ -121,6 +123,11 @@ android {
buildFeatures {
viewBinding true
buildConfig = true
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.13"
}

lint {
Expand All @@ -130,6 +137,9 @@ android {
htmlReport true
}
}
kapt {
correctErrorTypes = true
}

ext {
androidxCameraVersion = "1.3.4"
Expand Down Expand Up @@ -259,6 +269,7 @@ dependencies {
implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}"

implementation 'com.google.code.gson:gson:2.11.0'
implementation 'com.squareup.retrofit2:converter-gson:2.11.0'

implementation "androidx.media3:media3-exoplayer:$media3_version"
implementation "androidx.media3:media3-ui:$media3_version"
Expand All @@ -280,6 +291,19 @@ dependencies {

implementation 'androidx.core:core-ktx:1.13.1'

//compose
implementation(platform("androidx.compose:compose-bom:2024.02.01"))
implementation("androidx.compose.ui:ui")
implementation 'androidx.compose.material3:material3'
implementation("androidx.compose.ui:ui-tooling-preview")
implementation 'androidx.activity:activity-compose:1.9.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1'
debugImplementation("androidx.compose.ui:ui-tooling")

//tests
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-test-manifest")

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.12.0'
androidTestImplementation 'org.mockito:mockito-android:5.12.0'
Expand Down Expand Up @@ -307,6 +331,11 @@ dependencies {
implementation 'com.github.nextcloud.android-common:ui:0.22.0'

implementation 'com.github.nextcloud-deps:android-talk-webrtc:121.6167.0'
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
implementation("io.coil-kt:coil-compose:2.6.0")

implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
}

tasks.register('installGitHooks', Copy) {
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@
android:name=".account.WebViewLoginActivity"
android:theme="@style/AppTheme" />

<activity android:name=".contacts.ContactsActivityCompose"
android:theme="@style/AppTheme"/>

<activity
android:name=".account.AccountVerificationActivity"
android:theme="@style/AppTheme" />
Expand Down
220 changes: 0 additions & 220 deletions app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.java

This file was deleted.

Loading

0 comments on commit eb18abe

Please sign in to comment.