Skip to content

Commit 1126d64

Browse files
committed
feat(auto-upload): fix sync folder layout
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 9d489d3 commit 1126d64

5 files changed

Lines changed: 9 additions & 23 deletions

File tree

app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import android.content.Intent
1111
import android.content.IntentFilter
1212
import android.os.BatteryManager
1313
import android.os.PowerManager
14-
import androidx.core.content.ContextCompat.getSystemService
1514
import com.nextcloud.utils.extensions.registerBroadcastReceiver
1615
import com.owncloud.android.datamodel.ReceiverFlag
1716

app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ class SyncedFoldersActivity :
250250
val gridWidth = resources.getInteger(R.integer.media_grid_width)
251251
val lightVersion = resources.getBoolean(R.bool.syncedFolder_light)
252252
adapter = SyncedFolderAdapter(
253-
autoUploadWarningCardManager,
254253
lifecycleScope,
255254
this,
256255
clock,
@@ -261,6 +260,7 @@ class SyncedFoldersActivity :
261260
powerManagementService,
262261
connectivityService
263262
)
263+
autoUploadWarningCardManager.bind(binding.autoUploadBatterySaverWarningCard)
264264
binding.emptyList.emptyListIcon.setImageResource(R.drawable.nav_synced_folders)
265265
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.emptyList.emptyListViewAction)
266266
val lm = GridLayoutManager(this, gridWidth)

app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import java.util.concurrent.TimeUnit
5656
*/
5757
@Suppress("LongParameterList", "TooManyFunctions")
5858
class SyncedFolderAdapter(
59-
private val autoUploadWarningCardManager: AutoUploadWarningCardManager,
6059
private val lifecycleScope: LifecycleCoroutineScope,
6160
private val context: Context,
6261
private val clock: Clock,
@@ -265,10 +264,6 @@ class SyncedFolderAdapter(
265264
holder.binding.run {
266265
headerContainer.visibility = View.VISIBLE
267266

268-
if (section == 0) {
269-
autoUploadWarningCardManager.bind(autoUploadBatterySaverWarningCard)
270-
}
271-
272267
val syncedFolder = filteredSyncFolderItems[section]
273268

274269
title.text = syncedFolder.folderName

app/src/main/res/layout/synced_folders_item_header.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,6 @@
2020
android:paddingStart="@dimen/standard_quarter_padding"
2121
android:paddingTop="@dimen/alternate_half_padding">
2222

23-
<include
24-
android:id="@+id/auto_upload_battery_saver_warning_card"
25-
layout="@layout/auto_upload_battery_saver_warning_banner"
26-
android:layout_width="match_parent"
27-
android:layout_height="wrap_content"
28-
android:layout_gravity="center"
29-
android:layout_marginBottom="@dimen/standard_quadruple_margin"
30-
android:visibility="gone"
31-
android:layout_marginEnd="@dimen/standard_margin"
32-
android:layout_marginStart="@dimen/standard_half_margin"
33-
app:layout_constraintBottom_toBottomOf="@id/type"
34-
app:layout_constraintEnd_toEndOf="parent"
35-
app:layout_constraintStart_toStartOf="parent"
36-
app:layout_constraintTop_toTopOf="parent"
37-
tools:visibility="visible" />
38-
3923
<ImageView
4024
android:id="@+id/type"
4125
android:layout_width="@dimen/minimum_size_for_touchable_area"

app/src/main/res/layout/synced_folders_layout.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030
android:orientation="vertical"
3131
app:layout_behavior="@string/appbar_scrolling_view_behavior">
3232

33+
<include
34+
android:id="@+id/auto_upload_battery_saver_warning_card"
35+
layout="@layout/auto_upload_battery_saver_warning_banner"
36+
android:layout_width="match_parent"
37+
android:layout_height="wrap_content"
38+
android:layout_marginTop="@dimen/standard_margin"
39+
android:layout_marginHorizontal="@dimen/standard_margin" />
40+
3341
<include
3442
android:id="@+id/storage_permission_warning_banner"
3543
layout="@layout/storage_permission_warning_banner"

0 commit comments

Comments
 (0)