Просмотр исходного кода

fix emptylist, fix list, fix code analytics

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 7 месяцев назад
Родитель
Сommit
206eeab779

+ 45 - 31
app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt

@@ -15,6 +15,7 @@ import android.view.MenuItem
 import android.view.View
 import androidx.core.view.MenuProvider
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.di.Injectable
 import com.owncloud.android.R
 import com.owncloud.android.databinding.InternalTwoWaySyncLayoutBinding
@@ -23,52 +24,65 @@ import com.owncloud.android.ui.adapter.InternalTwoWaySyncAdapter
 class InternalTwoWaySyncActivity : DrawerActivity(), Injectable {
     lateinit var binding: InternalTwoWaySyncLayoutBinding
 
-    @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         binding = InternalTwoWaySyncLayoutBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        setupToolbar()
+        setupActionBar()
+        setupMenuProvider()
+        setupTwoWaySyncAdapter()
+        setupEmptyList()
+    }
+
+    private fun setupActionBar() {
+        updateActionBarTitleAndHomeButtonByString(getString(R.string.internal_two_way_sync_headline))
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    private fun setupTwoWaySyncAdapter() {
         binding.run {
             list.run {
-                setEmptyView(binding.emptyList.emptyListView)
+                setEmptyView(emptyList.emptyListView)
+                adapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), this@InternalTwoWaySyncActivity)
+                layoutManager = LinearLayoutManager(this@InternalTwoWaySyncActivity)
+                adapter?.notifyDataSetChanged()
+            }
+        }
+    }
 
-                emptyList.run {
-                    emptyListViewHeadline.apply {
-                        visibility = View.VISIBLE
-                        setText(R.string.internal_two_way_sync_list_empty_headline)
-                    }
-                    emptyList.emptyListViewText.apply {
-                        visibility = View.VISIBLE
-                        setText(R.string.internal_two_way_sync_text)
-                    }
-                    emptyList.emptyListIcon.apply {
-                        visibility = View.VISIBLE
-                        setImageDrawable(
-                            viewThemeUtils.platform.tintPrimaryDrawable(
-                                context,
-                                R.drawable.ic_sync
-                            )
-                        )
-                    }
-                }
+    private fun setupEmptyList() {
+        binding.emptyList.run {
+            emptyListViewHeadline.run {
+                visibility = View.VISIBLE
+                setText(R.string.internal_two_way_sync_list_empty_headline)
+            }
 
-                adapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), context).apply {
-                    notifyDataSetChanged()
-                }
-                layoutManager = LinearLayoutManager(context)
+            emptyListViewText.run {
+                visibility = View.VISIBLE
+                setText(R.string.internal_two_way_sync_text)
             }
-        }
 
-        setupToolbar()
-        updateActionBarTitleAndHomeButtonByString(getString(R.string.internal_two_way_sync_headline))
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            emptyListIcon.run {
+                visibility = View.VISIBLE
+                setImageDrawable(
+                    viewThemeUtils.platform.tintDrawable(
+                        context,
+                        R.drawable.ic_sync,
+                        ColorRole.PRIMARY
+                    )
+                )
+            }
+        }
+    }
 
+    private fun setupMenuProvider() {
         addMenuProvider(
             object : MenuProvider {
-                override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-                }
+                override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) = Unit
 
                 override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
                     return when (menuItem.itemId) {

+ 3 - 2
app/src/main/res/layout/internal_two_way_sync_layout.xml

@@ -12,7 +12,8 @@
     android:fitsSystemWindows="true"
     tools:openDrawer="start">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -28,5 +29,5 @@
             android:id="@+id/empty_list"
             layout="@layout/empty_list" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 </androidx.drawerlayout.widget.DrawerLayout>