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

Commit c65a11a4 authored by Evan Laird's avatar Evan Laird
Browse files

[Sb refactor] Pull the WifiRepository interface out of the impl file (1/2) 

In order to keep the git commit history cleaner, this commit duplicates
the file WifiRepository.kt, and moves the interface definition from one
to the other. The follow-up to this renames the Impl's file

Test: existing tests
Bug: 238425913
Change-Id: I40a6d5aa7e1c5e82954c35a233ca23e8942ac6f3
parent 4109042c

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt

+1 −1
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy 
import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxyImpl

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositorySwitcher

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepository

import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor

import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl

import dagger.Binds

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.pipeline.wifi.data.repository



import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel

import kotlinx.coroutines.flow.StateFlow



/** Provides data related to the wifi state. */

interface WifiRepository {

    /** Observable for the current wifi enabled status. */

    val isWifiEnabled: StateFlow<Boolean>



    /** Observable for the current wifi default status. */

    val isWifiDefault: StateFlow<Boolean>



    /** Observable for the current wifi network. */

    val wifiNetwork: StateFlow<WifiNetworkModel>



    /** Observable for the current wifi network activity. */

    val wifiActivity: StateFlow<DataActivityModel>

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcher.kt

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.systemui.demomode.DemoModeController 
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel

import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.DemoWifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import com.android.systemui.dagger.qualifiers.Application 
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import com.android.systemui.statusbar.pipeline.shared.data.model.toWifiDataActivityModel

import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model.FakeWifiEventModel

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepository

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Job

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepository.kt

+1 −15
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger 
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import com.android.systemui.statusbar.pipeline.shared.data.model.toWifiDataActivityModel

import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository

import java.util.concurrent.Executor

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope
@@ -62,21 +63,6 @@ import kotlinx.coroutines.flow.mapLatest 
import kotlinx.coroutines.flow.merge

import kotlinx.coroutines.flow.stateIn



/** Provides data related to the wifi state. */

interface WifiRepository {

    /** Observable for the current wifi enabled status. */

    val isWifiEnabled: StateFlow<Boolean>



    /** Observable for the current wifi default status. */

    val isWifiDefault: StateFlow<Boolean>



    /** Observable for the current wifi network. */

    val wifiNetwork: StateFlow<WifiNetworkModel>



    /** Observable for the current wifi network activity. */

    val wifiActivity: StateFlow<DataActivityModel>

}



/** Real implementation of [WifiRepository]. */

@Suppress("EXPERIMENTAL_IS_NOT_ENABLED")

@OptIn(ExperimentalCoroutinesApi::class)