Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df4ac748 authored by George Lin's avatar George Lin
Browse files

Rename ShapeGridInteractor and ShapeGridRepository 

Since when applying we set both shape and grid at the same time. It
makes more sense to have one interactor and repo to handle it in one
call.

Test: Refactor. Make sure it builds and runs.
Bug: 362237825
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: I46ea9aa56c251d7eee943bee70be727192ceba89
parent 0d5e6b2f

src/com/android/customization/model/grid/DefaultGridOptionsManager.kt→src/com/android/customization/model/grid/DefaultShapeGridManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ import kotlinx.coroutines.CoroutineDispatcher 
import kotlinx.coroutines.withContext



@Singleton

class DefaultGridOptionsManager

class DefaultShapeGridManager

@Inject

constructor(

    @ApplicationContext private val context: Context,

    @BackgroundDispatcher private val bgDispatcher: CoroutineDispatcher,

) : GridOptionsManager2 {

) : ShapeGridManager {



    private val authorityMetadataKey: String =

        context.getString(R.string.grid_control_metadata_name)
@@ -59,7 +59,7 @@ constructor( 
                                        context.getString(

                                            com.android.themepicker.R.string.grid_title_pattern,

                                            cols,

                                            rows

                                            rows,

                                        ),

                                    isCurrent =

                                        cursor

src/com/android/customization/model/grid/GridOptionsManager2.kt→src/com/android/customization/model/grid/ShapeGridManager.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.customization.model.grid



interface GridOptionsManager2 {

interface ShapeGridManager {



    suspend fun isGridOptionAvailable(): Boolean

src/com/android/customization/picker/grid/data/repository/GridRepository2.kt→src/com/android/customization/picker/grid/data/repository/ShapeGridRepository.kt

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
package com.android.customization.picker.grid.data.repository



import com.android.customization.model.grid.GridOptionModel

import com.android.customization.model.grid.GridOptionsManager2

import com.android.customization.model.grid.ShapeGridManager

import com.android.wallpaper.picker.di.modules.BackgroundDispatcher

import javax.inject.Inject

import javax.inject.Singleton
@@ -33,10 +33,10 @@ import kotlinx.coroutines.launch 
import kotlinx.coroutines.withContext



@Singleton

class GridRepository2

class ShapeGridRepository

@Inject

constructor(

    private val manager: GridOptionsManager2,

    private val manager: ShapeGridManager,

    @BackgroundDispatcher private val bgScope: CoroutineScope,

    @BackgroundDispatcher private val bgDispatcher: CoroutineDispatcher,

) {

src/com/android/customization/picker/grid/domain/interactor/GridInteractor2.kt→src/com/android/customization/picker/grid/domain/interactor/ShapeGridInteractor.kt

+2 −6
Original line number Diff line number Diff line
@@ -17,16 +17,12 @@ 


package com.android.customization.picker.grid.domain.interactor



import com.android.customization.picker.grid.data.repository.GridRepository2

import com.android.customization.picker.grid.data.repository.ShapeGridRepository

import javax.inject.Inject

import javax.inject.Singleton



@Singleton

class GridInteractor2

@Inject

constructor(

    private val repository: GridRepository2,

) {

class ShapeGridInteractor @Inject constructor(private val repository: ShapeGridRepository) {

    suspend fun isGridOptionAvailable(): Boolean = repository.isGridOptionAvailable()



    val gridOptions = repository.gridOptions

src/com/android/wallpaper/customization/ui/viewmodel/ShapeGridPickerViewModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.content.Context 
import android.content.res.Resources

import com.android.customization.model.ResourceConstants

import com.android.customization.model.grid.GridOptionModel

import com.android.customization.picker.grid.domain.interactor.GridInteractor2

import com.android.customization.picker.grid.domain.interactor.ShapeGridInteractor

import com.android.customization.picker.grid.ui.viewmodel.GridIconViewModel

import com.android.customization.picker.grid.ui.viewmodel.ShapeIconViewModel

import com.android.themepicker.R
@@ -50,7 +50,7 @@ class ShapeGridPickerViewModel 
@AssistedInject

constructor(

    @ApplicationContext private val context: Context,

    interactor: GridInteractor2,

    interactor: ShapeGridInteractor,

    @Assisted private val viewModelScope: CoroutineScope,

) {