diff --git a/app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt
index e5489e6d9468..2bbea6512618 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt
@@ -8,14 +8,25 @@
package com.owncloud.android.ui.activity
import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.core.view.MenuProvider
import androidx.recyclerview.widget.LinearLayoutManager
import com.nextcloud.client.di.Injectable
+import com.owncloud.android.R
import com.owncloud.android.databinding.InternalTwoWaySyncLayoutBinding
import com.owncloud.android.ui.adapter.InternalTwoWaySyncAdapter
+import com.owncloud.android.utils.theme.ViewThemeUtils
+import javax.inject.Inject
-class InternalTwoWaySyncActivity : BaseActivity(), Injectable {
+class InternalTwoWaySyncActivity : DrawerActivity(), Injectable {
lateinit var binding: InternalTwoWaySyncLayoutBinding
+ @Inject
+ lateinit var viewThemeUtils: ViewThemeUtils
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -23,8 +34,53 @@ class InternalTwoWaySyncActivity : BaseActivity(), Injectable {
setContentView(binding.root)
binding.list.apply {
- adapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), context)
+ setEmptyView(binding.emptyList.emptyListView)
+
+ binding.emptyList.emptyListViewHeadline.apply {
+ visibility = View.VISIBLE
+ setText(R.string.internal_two_way_sync_list_empty_headline)
+ }
+ binding.emptyList.emptyListViewText.apply {
+ visibility = View.VISIBLE
+ setText(R.string.internal_two_way_sync_text)
+ }
+ binding.emptyList.emptyListIcon.apply {
+ visibility = View.VISIBLE
+ setImageDrawable(
+ viewThemeUtils.platform.tintPrimaryDrawable(
+ context,
+ R.drawable.ic_sync
+ )
+ )
+ }
+
+ adapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), context).apply {
+ notifyDataSetChanged()
+ }
layoutManager = LinearLayoutManager(context)
}
+
+ setupToolbar()
+ updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_synced_folders))
+ if (supportActionBar != null) {
+ supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+ }
+
+ addMenuProvider(
+ object : MenuProvider {
+ override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+ }
+
+ override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+ return when (menuItem.itemId) {
+ android.R.id.home -> {
+ onBackPressed()
+ true
+ }
+ else -> false
+ }
+ }
+ }
+ )
}
}
diff --git a/app/src/main/res/layout/internal_two_way_sync_layout.xml b/app/src/main/res/layout/internal_two_way_sync_layout.xml
index 69d985bcc177..17771007c080 100644
--- a/app/src/main/res/layout/internal_two_way_sync_layout.xml
+++ b/app/src/main/res/layout/internal_two_way_sync_layout.xml
@@ -1,18 +1,32 @@
-
-
-
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true"
+ tools:openDrawer="start">
-
+ android:layout_height="match_parent">
-
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71b8e5459c93..bc9d069fd363 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1236,4 +1236,6 @@
.%s is a forbidden file extension
Name ends with a space or a period
Sync
+ No two way sync folder yet
+ To setup a two way sync folder, please enable it in details of desired folder.