diff --git a/app/build.gradle b/app/build.gradle index 199ebad18..37165b704 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,17 +8,17 @@ if (taskRequest.contains("Gplay") || taskRequest.contains("findbugs") || taskReq } android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.nextcloud.talk2" versionName version minSdkVersion 21 - targetSdkVersion 27 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + targetSdkVersion 28 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - versionCode 62 - versionName "3.0.0" + versionCode 63 + versionName "3.0.1" flavorDimensions "default" renderscriptTargetApi 19 @@ -103,18 +103,18 @@ configurations.all { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:appcompat-v7:${supportLibraryVersion}" - implementation "com.android.support:design:${supportLibraryVersion}" - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation "com.android.support:support-emoji-bundled:${supportLibraryVersion}" - implementation "com.android.support:palette-v7:${supportLibraryVersion}" + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' + implementation 'androidx.emoji:emoji-bundled:1.0.0' + implementation 'androidx.palette:palette:1.0.0' implementation "android.arch.work:work-runtime:${workVersion}" implementation "android.arch.work:work-firebase:${workVersion}" androidTestImplementation "android.arch.work:work-testing:${workVersion}" - implementation "android.arch.lifecycle:extensions:1.1.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" - implementation 'com.android.support:multidex:1.0.3' + implementation 'androidx.multidex:multidex:2.0.0' implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' implementation "io.reactivex.rxjava2:rxjava:2.2.2" @@ -155,8 +155,8 @@ dependencies { compileOnly "org.projectlombok:lombok:1.18.2" annotationProcessor "org.projectlombok:lombok:1.18.2" - implementation 'com.jakewharton:butterknife:8.8.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation 'com.jakewharton:butterknife:9.0.0-SNAPSHOT' + annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-SNAPSHOT' debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4' releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4' @@ -194,7 +194,7 @@ dependencies { implementation 'com.kevalpatel2106:emoticongifkeyboard:1.1' testImplementation 'junit:junit:4.12' - androidTestImplementation ('com.android.support.test.espresso:espresso-core:3.0.1', { + androidTestImplementation ('androidx.test.espresso:espresso-core:3.1.0-alpha4', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/app/src/androidTest/java/com/nextcloud/talk/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/nextcloud/talk/ExampleInstrumentedTest.java index 7eda47b45..8bbb7ae99 100644 --- a/app/src/androidTest/java/com/nextcloud/talk/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/nextcloud/talk/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.nextcloud.talk; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java index f5ede5627..3a1606e33 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java @@ -22,7 +22,7 @@ package com.nextcloud.talk.activities; import android.content.res.Configuration; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.view.ViewGroup; import android.view.Window; diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java index 23fbad8f8..cef60461f 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java @@ -23,11 +23,11 @@ package com.nextcloud.talk.activities; import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.text.emoji.EmojiCompat; -import android.support.text.emoji.bundled.BundledEmojiCompatConfig; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.emoji.text.EmojiCompat; +import androidx.emoji.bundled.BundledEmojiCompatConfig; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.ViewGroup; import android.webkit.SslErrorHandler; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java index c015e8699..9ba0215cc 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java @@ -21,7 +21,7 @@ package com.nextcloud.talk.adapters.items; import android.accounts.Account; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.widget.ImageButton; import android.widget.ImageView; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java index 461372433..584569912 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java @@ -21,7 +21,7 @@ package com.nextcloud.talk.adapters.items; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.Spannable; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ProgressItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ProgressItem.java index 143a6e51d..b9817a936 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ProgressItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ProgressItem.java @@ -26,7 +26,7 @@ package com.nextcloud.talk.adapters.items; import android.animation.Animator; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java index 8335fdc12..58f8e7243 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java @@ -23,10 +23,9 @@ package com.nextcloud.talk.adapters.messages; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.graphics.Color; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java index 276cde0e5..0c7c6b764 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java @@ -25,7 +25,7 @@ import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.text.Spannable; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java index 146c4cf86..312fa9801 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java @@ -25,7 +25,7 @@ import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.text.Spannable; import android.text.SpannableString; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java index 928d50bd1..ece33c723 100644 --- a/app/src/main/java/com/nextcloud/talk/api/NcApi.java +++ b/app/src/main/java/com/nextcloud/talk/api/NcApi.java @@ -20,7 +20,7 @@ */ package com.nextcloud.talk.api; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.nextcloud.talk.models.json.call.CallOverall; import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall; diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java index 73ffd31dd..3c6a40962 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java @@ -20,14 +20,14 @@ */ package com.nextcloud.talk.application; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleObserver; -import android.arch.lifecycle.OnLifecycleEvent; -import android.arch.lifecycle.ProcessLifecycleOwner; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.lifecycle.ProcessLifecycleOwner; import android.content.Context; import android.os.Build; -import android.support.multidex.MultiDex; -import android.support.multidex.MultiDexApplication; +import androidx.multidex.MultiDex; +import androidx.multidex.MultiDexApplication; import android.util.Log; import com.nextcloud.talk.dagger.modules.BusModule; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java index f055d6b54..b3e23d9d5 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java @@ -23,7 +23,7 @@ package com.nextcloud.talk.controllers; import android.content.pm.ActivityInfo; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java index 64cbfe9e4..5e0b8d368 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java @@ -29,9 +29,9 @@ import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 91169e31a..39315478b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -37,9 +37,9 @@ import android.renderscript.Allocation; import android.renderscript.Element; import android.renderscript.RenderScript; import android.renderscript.ScriptIntrinsicBlur; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.v7.graphics.Palette; +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.palette.graphics.Palette; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index 881e55f96..1886bcb10 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -31,10 +31,10 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index a32cf6793..43556aea7 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -25,13 +25,13 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomNavigationView; -import android.support.v4.view.MenuItemCompat; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.core.view.MenuItemCompat; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; import android.text.InputType; import android.text.TextUtils; import android.view.LayoutInflater; @@ -229,7 +229,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ adapter.setEndlessScrollListener(this, new ProgressItem()); - adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { + adapter.registerAdapterDataObserver(new androidx.recyclerview.widget.RecyclerView.AdapterDataObserver() { @Override public void onChanged() { super.onChanged(); @@ -332,7 +332,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ } final View mSearchEditFrame = searchView - .findViewById(android.support.v7.appcompat.R.id.search_edit_frame); + .findViewById(androidx.appcompat.R.id.search_edit_frame); BottomNavigationView bottomNavigationView = null; if (getParentController() != null && getParentController().getView() != null) { @@ -601,7 +601,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ private void prepareViews() { layoutManager = new SmoothScrollLinearLayoutManager(getActivity()); - recyclerView.setLayoutManager(layoutManager); + recyclerView.setLayoutManager(new SmoothScrollLinearLayoutManager(getActivity())); recyclerView.setHasFixedSize(true); recyclerView.setAdapter(adapter); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index 5f987a40f..77bddd053 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -25,14 +25,14 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomNavigationView; -import android.support.v4.view.MenuItemCompat; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.core.view.MenuItemCompat; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; import android.text.InputType; import android.text.TextUtils; import android.view.LayoutInflater; @@ -216,7 +216,7 @@ public class ConversationsListController extends BaseController implements Searc } final View mSearchEditFrame = searchView - .findViewById(android.support.v7.appcompat.R.id.search_edit_frame); + .findViewById(androidx.appcompat.R.id.search_edit_frame); BottomNavigationView bottomNavigationView = getParentController().getView().findViewById(R.id.navigation); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/MagicBottomNavigationController.java b/app/src/main/java/com/nextcloud/talk/controllers/MagicBottomNavigationController.java index f966d0445..47520bf91 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/MagicBottomNavigationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/MagicBottomNavigationController.java @@ -24,7 +24,7 @@ package com.nextcloud.talk.controllers; -import android.support.annotation.IdRes; +import androidx.annotation.IdRes; import com.bluelinelabs.conductor.Controller; import com.nextcloud.talk.R; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java index 7e7144275..72c29efbf 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java @@ -27,9 +27,9 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java index ba6f1601e..8f1983469 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java @@ -26,7 +26,7 @@ import android.content.pm.ActivityInfo; import android.net.Uri; import android.os.Bundle; import android.security.KeyChain; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index 7e85de85f..28894fb55 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -26,8 +26,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.security.KeyChain; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java index a5a63742d..1585c54f7 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java @@ -25,11 +25,11 @@ package com.nextcloud.talk.controllers; import android.accounts.Account; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java index 2e5a5964c..748211a73 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java @@ -28,7 +28,7 @@ import android.os.Build; import android.os.Bundle; import android.security.KeyChain; import android.security.KeyChainException; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java index 6d1056d3f..48e9ab0fa 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java @@ -19,8 +19,8 @@ package com.nextcloud.talk.controllers.base; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.ActionBar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.java b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.java index f7a67e385..852b5c893 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.java @@ -19,7 +19,7 @@ package com.nextcloud.talk.controllers.base; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/RefWatchingController.java b/app/src/main/java/com/nextcloud/talk/controllers/base/RefWatchingController.java index 6b7421da6..7b4852135 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/RefWatchingController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/RefWatchingController.java @@ -19,7 +19,7 @@ package com.nextcloud.talk.controllers.base; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.conductor.ControllerChangeHandler; import com.bluelinelabs.conductor.ControllerChangeType; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java b/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java index 8efa2a098..7c60d0867 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java @@ -25,10 +25,10 @@ package com.nextcloud.talk.controllers.base.bottomnavigation; import android.os.Bundle; -import android.support.annotation.MenuRes; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomNavigationView; -import android.support.design.widget.CoordinatorLayout; +import androidx.annotation.MenuRes; +import androidx.annotation.NonNull; +import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.coordinatorlayout.widget.CoordinatorLayout; import android.util.Log; import android.util.SparseArray; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationMenuItem.java b/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationMenuItem.java index 7f33a41b3..375ee78ef 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationMenuItem.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationMenuItem.java @@ -24,7 +24,7 @@ package com.nextcloud.talk.controllers.base.bottomnavigation; -import android.support.annotation.IdRes; +import androidx.annotation.IdRes; import com.bluelinelabs.conductor.Controller; import com.nextcloud.talk.R; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/providers/ActionBarProvider.java b/app/src/main/java/com/nextcloud/talk/controllers/base/providers/ActionBarProvider.java index b98351eb1..ceb393e67 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/providers/ActionBarProvider.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/providers/ActionBarProvider.java @@ -18,7 +18,7 @@ */ package com.nextcloud.talk.controllers.base.providers; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; public interface ActionBarProvider { ActionBar getSupportActionBar(); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java index b15d06c58..65343525a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java @@ -23,9 +23,9 @@ package com.nextcloud.talk.controllers.bottomsheet; import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java index 830ca668b..565855a9d 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java @@ -23,7 +23,7 @@ package com.nextcloud.talk.controllers.bottomsheet; import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java index cf53a6b82..c2678530e 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java @@ -25,8 +25,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java index 3d83a76ca..a9c5e1945 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java @@ -21,7 +21,7 @@ package com.nextcloud.talk.dagger.modules; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import dagger.Module; import dagger.Provides; diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java index 369269a91..edd11f474 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java @@ -21,7 +21,7 @@ package com.nextcloud.talk.dagger.modules; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.nextcloud.talk.R; import com.nextcloud.talk.models.database.Models; diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java index de8884874..b5f441171 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java @@ -20,8 +20,8 @@ */ package com.nextcloud.talk.dagger.modules; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java b/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java index a5a5afcfc..570541276 100644 --- a/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/CertificateEvent.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.events; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.webkit.SslErrorHandler; import com.nextcloud.talk.utils.ssl.MagicTrustManager; diff --git a/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java b/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java index de9a3c02e..3ebdbbc2b 100644 --- a/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/MediaStreamEvent.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.events; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.webrtc.MediaStream; diff --git a/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java b/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java index 860b4fde5..96218d7a9 100644 --- a/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/PeerConnectionEvent.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.events; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import lombok.Data; diff --git a/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java b/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java index 1c1d2f02e..5ad7df492 100644 --- a/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java +++ b/app/src/main/java/com/nextcloud/talk/events/SessionDescriptionSendEvent.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.events; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.nextcloud.talk.models.json.signaling.NCIceCandidate; diff --git a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java index be4f9b2c3..638d74694 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java @@ -24,7 +24,7 @@ package com.nextcloud.talk.jobs; import android.app.NotificationManager; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java index 3acfbad1b..dcbbb768f 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java index 04b627526..dad58959c 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java @@ -34,7 +34,7 @@ import android.os.Build; import android.os.Bundle; import android.os.VibrationEffect; import android.os.Vibrator; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Base64; import android.util.Log; diff --git a/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java index 1e9869a20..1d6f98dba 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.nextcloud.talk.utils.PushUtils; diff --git a/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java b/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java index 64f27c3a8..341c5ba37 100644 --- a/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java +++ b/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import lombok.Data; diff --git a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java index 0fe4edb0b..2fbff8d67 100644 --- a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java +++ b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java @@ -21,7 +21,7 @@ package com.nextcloud.talk.models; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java index e288e1940..9022b5e96 100644 --- a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java +++ b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java @@ -21,8 +21,8 @@ package com.nextcloud.talk.presenters; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java index bfa3a8df7..3d516eedb 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java @@ -20,8 +20,8 @@ package com.nextcloud.talk.utils; import android.net.Uri; -import android.support.annotation.DimenRes; -import android.support.annotation.Nullable; +import androidx.annotation.DimenRes; +import androidx.annotation.Nullable; import com.nextcloud.talk.BuildConfig; import com.nextcloud.talk.R; diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java index 80635ee64..603750f98 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java @@ -27,12 +27,12 @@ import android.content.res.Resources; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.widget.AppCompatDrawableManager; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.appcompat.widget.AppCompatDrawableManager; import android.text.Spannable; import android.text.TextUtils; import android.text.style.AbsoluteSizeSpan; diff --git a/app/src/main/java/com/nextcloud/talk/utils/EmojiDetection.java b/app/src/main/java/com/nextcloud/talk/utils/EmojiDetection.java index c3245fa9b..08afa08e5 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/EmojiDetection.java +++ b/app/src/main/java/com/nextcloud/talk/utils/EmojiDetection.java @@ -23,8 +23,8 @@ package com.nextcloud.talk.utils; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java index 13121edf2..5fcb0f8dd 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java @@ -28,7 +28,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.kennyc.bottomsheet.adapters.AppAdapter; diff --git a/app/src/main/java/com/nextcloud/talk/utils/animations/PulseAnimation.java b/app/src/main/java/com/nextcloud/talk/utils/animations/PulseAnimation.java index e98c195fa..c3636dae7 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/animations/PulseAnimation.java +++ b/app/src/main/java/com/nextcloud/talk/utils/animations/PulseAnimation.java @@ -26,7 +26,7 @@ package com.nextcloud.talk.utils.animations; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; public class PulseAnimation { diff --git a/app/src/main/java/com/nextcloud/talk/utils/animations/ViewHidingBehaviourAnimation.java b/app/src/main/java/com/nextcloud/talk/utils/animations/ViewHidingBehaviourAnimation.java index cc7b95d6b..0ad73d30b 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/animations/ViewHidingBehaviourAnimation.java +++ b/app/src/main/java/com/nextcloud/talk/utils/animations/ViewHidingBehaviourAnimation.java @@ -24,9 +24,9 @@ package com.nextcloud.talk.utils.animations; -import android.support.annotation.NonNull; -import android.support.design.widget.CoordinatorLayout; -import android.support.v4.view.ViewCompat; +import androidx.annotation.NonNull; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.view.ViewCompat; import android.view.View; public class ViewHidingBehaviourAnimation extends CoordinatorLayout.Behavior { diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java index b1d47b234..c5c417237 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java @@ -20,7 +20,7 @@ */ package com.nextcloud.talk.utils.database.user; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.nextcloud.talk.models.database.User; diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/MagicUserInputModule.java b/app/src/main/java/com/nextcloud/talk/utils/preferences/MagicUserInputModule.java index b1b89f22b..b7ff31601 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preferences/MagicUserInputModule.java +++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/MagicUserInputModule.java @@ -22,7 +22,7 @@ package com.nextcloud.talk.utils.preferences; import android.app.Dialog; import android.content.Context; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.text.InputType; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideMessageHolder.java b/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideMessageHolder.java index fedbbd80e..60a5899d5 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideMessageHolder.java +++ b/app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideMessageHolder.java @@ -20,7 +20,7 @@ package com.nextcloud.talk.utils.singletons; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class ApplicationWideMessageHolder { private static final ApplicationWideMessageHolder holder = new ApplicationWideMessageHolder(); diff --git a/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java index 79f2189f0..9d9b64ee2 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java @@ -23,7 +23,7 @@ package com.nextcloud.talk.utils.ssl; import android.content.Context; import android.security.KeyChain; import android.security.KeyChainException; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 235372b30..3c42f40e0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - - + - + diff --git a/app/src/main/res/layout/call_item.xml b/app/src/main/res/layout/call_item.xml index d2679a0e4..4971a365a 100644 --- a/app/src/main/res/layout/call_item.xml +++ b/app/src/main/res/layout/call_item.xml @@ -38,15 +38,16 @@ android:layout_height="80dp" android:layout_centerInParent="true"/> - + android:textColor="@android:color/white"/> - + android:layout_toEndOf="@id/remote_audio_off" + android:src="@drawable/ic_videocam_off_white_24px" + android:visibility="invisible"/> diff --git a/app/src/main/res/layout/controller_bottom_navigation.xml b/app/src/main/res/layout/controller_bottom_navigation.xml index b56a6745c..3267ec0e1 100644 --- a/app/src/main/res/layout/controller_bottom_navigation.xml +++ b/app/src/main/res/layout/controller_bottom_navigation.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/controller_call_menu.xml b/app/src/main/res/layout/controller_call_menu.xml index 603f2fcce..13a77f5a5 100644 --- a/app/src/main/res/layout/controller_call_menu.xml +++ b/app/src/main/res/layout/controller_call_menu.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:background="@color/nc_white_color"> - . --> - - + diff --git a/app/src/main/res/layout/controller_conversations_rv.xml b/app/src/main/res/layout/controller_conversations_rv.xml index 7160c81ae..852d8b95f 100644 --- a/app/src/main/res/layout/controller_conversations_rv.xml +++ b/app/src/main/res/layout/controller_conversations_rv.xml @@ -19,7 +19,7 @@ ~ along with this program. If not, see . --> - - - - + - + diff --git a/app/src/main/res/layout/controller_generic_rv.xml b/app/src/main/res/layout/controller_generic_rv.xml index d82190989..a364253cd 100644 --- a/app/src/main/res/layout/controller_generic_rv.xml +++ b/app/src/main/res/layout/controller_generic_rv.xml @@ -19,14 +19,14 @@ ~ along with this program. If not, see . --> - - @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + - + diff --git a/app/src/main/res/layout/view_message_input.xml b/app/src/main/res/layout/view_message_input.xml index 0199d6b6e..a6a7ad10b 100644 --- a/app/src/main/res/layout/view_message_input.xml +++ b/app/src/main/res/layout/view_message_input.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true"/> - - + ~ + ~ 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 . + --> + Conversations diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index de56323cb..71da8df79 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -1,3 +1,23 @@ + + Konverzace diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml index b492bf438..1902b9097 100644 --- a/app/src/main/res/values-es-rCL/strings.xml +++ b/app/src/main/res/values-es-rCL/strings.xml @@ -1,3 +1,23 @@ + + Conversaciones diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml index b492bf438..1902b9097 100644 --- a/app/src/main/res/values-es-rCO/strings.xml +++ b/app/src/main/res/values-es-rCO/strings.xml @@ -1,3 +1,23 @@ + + Conversaciones diff --git a/app/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml index b492bf438..1902b9097 100644 --- a/app/src/main/res/values-es-rCR/strings.xml +++ b/app/src/main/res/values-es-rCR/strings.xml @@ -1,3 +1,23 @@ + + Conversaciones diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml index b492bf438..1902b9097 100644 --- a/app/src/main/res/values-es-rDO/strings.xml +++ b/app/src/main/res/values-es-rDO/strings.xml @@ -1,3 +1,23 @@ + + Conversaciones diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml index b492bf438..1902b9097 100644 --- a/app/src/main/res/values-es-rEC/strings.xml +++ b/app/src/main/res/values-es-rEC/strings.xml @@ -1,3 +1,23 @@ + + Conversaciones diff --git a/app/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml index b492bf438..1902b9097 100644 --- a/app/src/main/res/values-es-rGT/strings.xml +++ b/app/src/main/res/values-es-rGT/strings.xml @@ -1,3 +1,23 @@ + + Conversaciones diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index b492bf438..1902b9097 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -1,3 +1,23 @@ + + Conversaciones diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml index b492bf438..1902b9097 100644 --- a/app/src/main/res/values-es-rSV/strings.xml +++ b/app/src/main/res/values-es-rSV/strings.xml @@ -1,3 +1,23 @@ + + Conversaciones diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index b1ec8e564..339fcb5a7 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -1,3 +1,23 @@ + + Beszélgetések diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml deleted file mode 100644 index 0e711995b..000000000 --- a/app/src/main/res/values-it/strings.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - Conversazioni - Contatti - Impostazioni - - - Indirizzo del server - Termina l\'installazione di %1$s - Aggiorna il tuo database %1$s - Esci dalla manutenzione di %1$s - %1$s funziona solo con %2$s 13 e successivi - Importa account - Importa account - Importa account dall\'applicazione %1$s - Importa account dall\'applicazione %1$s - Importazione dell\'account selezionato non riuscita - L\'account selezionato è ora importato e disponibile - Non hai ancora un server?\nFai clic qui per ottenerne uno da un fornitore - - - Nome visualizzato recuperato - Notifiche push disabilitate - Recupero delle capacità non riuscito, interruzione in corso - Il nome visualizzato non può essere recuperato, interruzione in corso - Applicazione %1$s trovate - Applicazione %1$s non installata, interruzione in corso - Nome visualizzato memorizzato - Nome visualizzato non memorizzato, interruzione in corso - - Mai partecipato - Cerca - - Controlla il certificato - Ti fidi del certificato SSL fino ad ora sconosciuto, rilasciato da %1$s per %2$s, valido da %3$s a %4$s? - Sì - No - Dettagli - La tua configurazione SSL ha impedito la connessione - - - Proxy - Tipo proxy - Host proxy - Porta proxy - Usa credenziali - Cambia account - Autorizza nuovamente - Configura certificato client - Cambia certificato client - Rimuovi account - Aggiungi un nuovo account - Può essere autorizzato nuovamente solo l\'account attuale - L\'applicazione Talk non è installata sul server sul quale hai provato l\'autorizzazione - Il tuo account preesistente è stato aggiornato, invece di aggiungerne un nuovo - L\'eliminazione dell\'account è stata pianificata, e non può essere modificata - Suoni delle notifiche - Chiamate uno a uno - Altro - Nessun suono - Vibrazione - Se abilitata, il telefono vibrerà a meno che sia silenziato - Nessun proxy - Nome utente - Password - Collegamento della conversazione - Nuova password - Password errata - Informazioni - Riservatezza - Ottieni codice sorgente - Licenza - GNU General Public License, versione 3 - - Seleziona account - - - Inizia una conversazione - Configura conversazione - Lascia la conversazione - Rinomina conversazione - Imposta una password - Modifica password - Cancella la password - Condividi collegamento - Condividi collegamento tramite - Rendi pubblica la conversazione - Rendi privata la conversazione - Elimina conversazione - Nuova conversazione - Unisciti tramite collegamento - Unisciti tramite web - Aggiungi ai preferiti - Rimuovi dai preferiti - - - Seleziona contatti - contatto selezionato - contatti selezionati - Cancella - Fine - - - È necessario accordare permessi per stabilire una chiamata audio/video. Fai clic su \"CONSENTI\" nella finestra di sistema che apparirà. - Il permesso per il microfono deve essere accordato per abilitare le chiamate audio. Fai clic su \"CONSENTI\" nella finestra di sistema che apparirà. - Il permesso per la fotocamera deve essere accordato per abilitare le chiamate video. Fai clic su \\"CONSENTI\\" nella finestra di sistema che apparirà. - Per abilitare la comunicazione video devi accordare il permesso per la \"Fotocamera\" nelle impostazioni di sistema. - Per abilitare la comunicazione vocale devi accordare il permesso per \"Microfono\" nelle impostazioni di sistema. - Apri impostazioni - - - Connessione in corso… - Chiamata in ingresso da - Ospite - Nuova conversazione pubblica - Le conversazioni pubbliche ti consentono di invitare persone esterne tramite un - collegamento appositamente generato. - - - %1$s sul canale di notifica %2$s - Canale di notifica delle chiamate - Canale di notifica dei messaggi - Mostra le chiamate in ingresso - Mostra i messaggi in ingresso - - - Spiacenti, qualcosa non ha funzionato! - Il server di destinazione non supporta la partecipazione a stanze pubbliche tramite cellulare - Puoi provare a unirti alla conversazioni tramite un browser web. - OK, tutto fatto! - OK - Nome della conversazione - Procedi - Il nome che hai digitato è uguale a quello esistente - Il collegamento della conversazione non è valido - Partecipa alla conversazione su %1$s/index.php/call/%2$s - %1$s invito - \nPassword: %1$s - - - Premi per parlare - Con il microfono disabilitato, fai clic e mantieni per utillizzare Premi per parlare - Videochiamate e chat utilizzando il tuo server. - Seleziona certificato di autenticazione - Cambia certificato di autenticazione - Usa Nextcloud Talk per effettuare chiamate audio o video uno a uno o di gruppo, creare o partecipare a conferenze web e inviare messaggi di chat. Tutte le comunicazioni sono completamente cifrate e mediate dal tuo server, fornendo il più alto grado di riservatezza possibile. - -Nextcloud Talk è semplice da utilizzare e sarà sempre completamente gratuito e libero! - -Nextcloud Talk supporta: -* Chiamate audio/video HD (H.265) -* Chiamate di gruppo e uno a uno -* Webinar e incontri pubblici sul web -* Chat individuali e di gruppo -* Facile condivisione dello schermo -* Applicazione mobile per Android e iOS -* Chiamate da mobile e notifiche push delle chat -* Integrazione in Nextcloud File e Nextcloud Groupware -* Completamente on-premise, completamente open source -* Chiamate cifrate end-to-end -* Capacità di scalare fino a milioni di utenti -* Gateway SIP: chiamate tramite telefono - -L\'applicazione Nextcloud Talk richiede un server Nextcloud Talk per funzionare. Nextcloud è una piattaforma privata e gestita in autonomia di sincronizzazione file e comunicazione, progettata per restituirti il controllo dei tuoi dati. Può essere eseguito su un server di tua scelta, sia esso a casa, presso un fornitore di servizi o nella tua azienda, che ti fornisce l\'accesso ai tuoi documenti, calendari, contatti, messaggi di posta e altri dati. Puoi condividere con altri anche attraverso server Nextcloud differenti e lavorare insieme sui documenti. Nextcloud è completamente open source, offrendoti la possibilità di estenderlo per il tuo utilizzo, partecipare allo sviluppo o semplicemente verificare che faccia quanto previsto. - -Milioni di utenti utilizzano quotidianamente Nextcloud a lavoro o a casa in tutto il mondo. Gli utenti aziendali fanno affidamento sul supporto professionale di Nextcloud GmbH, assicurandosi di avere una piattaforma completamente supportata e pronta per l\\'ambito aziendale per la produttività e la collaborazione, completamente sotto il controllo del reparto IT. - -Scopri altro su https://nextcloud.com/talk - -Trovi Nextcloud su https://nextcloud.com - - - Digita un messaggio - Ieri - Oggi - Chiamata vocale - Chiamata video - Nuovi messaggi - Ancora nessun messaggio - Tu - - - Non ci sono altri elementi da caricare. Aggiorna per riprovare. - Non ci sono altri elementi da caricare (massimo raggiunto). - Annullato dall\'utente. - Si è verificato un errore durante il caricamento di altri elementi. - - - Menu per conversazione con %1$s - Menu per conversazione di gruppo %1$s - Menu per conversazione pubblica %1$s - Invia messaggio - - - Tocca per essere il primo a dire %1$s! - Non hai ancora parlato con nessuno!\n Tocca per iniziare una conversazione. - Ciao - - diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml index c122039dd..36d151e00 100644 --- a/app/src/main/res/values-ka-rGE/strings.xml +++ b/app/src/main/res/values-ka-rGE/strings.xml @@ -1,3 +1,23 @@ + + კონტაქტები პარამეტრები diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index f829592f7..64126b4af 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -1,3 +1,23 @@ + + Samtaler diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f5023c727..28ef50647 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,3 +1,23 @@ + + Conversas diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index c96983903..c2e524488 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1,3 +1,23 @@ + + Conversações diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 50421a1ef..531bea0c4 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -1,3 +1,23 @@ + + Rozhovory diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e614e7778..fdca071cc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,3 +1,23 @@ + + Görüşmeler diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index cc17af381..37c67ce89 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,3 +1,23 @@ + + Đàm thoại diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 31a12c751..959ad9346 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,3 +1,23 @@ + + 对话 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3af6112fd..ff29343b5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,7 +6,6 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorPrimary - @style/Widget.Design.CoordinatorLayout diff --git a/build.gradle b/build.gradle index ea54e2e8b..c43307452 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlinVersion = '1.2.50' + kotlinVersion = '1.2.61' } repositories { @@ -13,7 +13,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index aac7c9b46..c489a19dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.enableAapt2=false +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 315e181c6..b052ecc28 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Thu Apr 26 16:49:12 CEST 2018 +#Mon Oct 01 13:14:24 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip -distributionSha256Sum=7a2c66d1a78f811d5f37d14630ad21cec5e77a2a4dc61e787e2257a6341016ce +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c