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

Commit f38448fc authored by George Lin's avatar George Lin Committed by Android (Google) Code Review
Browse files

Merge changes I46ea9aa5,I6c3c8841 into main 

* changes:
  Rename ShapeGridInteractor and ShapeGridRepository
  Shape options
parents 752b03f9 df4ac748

res/layout/shape_option.xml

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,14 @@ 
    android:layout_height="64dp"

    android:clipChildren="false">



    <ImageView

        android:id="@id/selection_border"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/option_item_border"

        android:alpha="0"

        android:importantForAccessibility="no" />



    <ImageView

        android:id="@id/background"

        android:layout_width="match_parent"

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