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

Commit 3a077271 authored by Hasib Prince's avatar Hasib Prince
Browse files

Merge branch '333-refactor_pkg_structure' into 'epic59-refactor_package_structure' 

refactored package structure

See merge request !303
parents ba79eb05 1c9968e4

app/src/main/AndroidManifest.xml

+8 −8
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
        android:usesCleartextTraffic="true">



        <activity

            android:name=".MainActivity"

            android:name=".ui.MainActivity"

            android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -54,10 +54,10 @@ 
            </intent-filter>

            <nav-graph android:value="@navigation/navigation_resource" />

        </activity>

        <service android:name=".manager.pkg.InstallerService" />

        <service android:name=".install.pkg.InstallerService" />



        <receiver

            android:name="foundation.e.apps.manager.download.DownloadManagerBR"

            android:name="foundation.e.apps.install.download.DownloadManagerBR"

            android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED" />
@@ -67,13 +67,13 @@ 
            </intent-filter>

        </receiver>



        <receiver android:name=".updates.manager.UpdatesBroadcastReceiver">

        <receiver android:name=".install.updates.UpdatesBroadcastReceiver">

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED" />

            </intent-filter>

        </receiver>



        <receiver android:name=".receiver.PWAPlayerStatusReceiver"

        <receiver android:name=".install.receiver.PWAPlayerStatusReceiver"

            android:exported="true">

            <intent-filter>

                <action android:name="foundation.e.pwaplayer.PWA_ADDED" />
@@ -86,7 +86,7 @@ 
            </intent-filter>

        </receiver>



        <receiver android:name=".setup.signin.LocaleChangedBroadcastReceiver">

        <receiver android:name=".ui.setup.signin.LocaleChangedBroadcastReceiver">

            <intent-filter>

                <action android:name="android.intent.action.LOCALE_CHANGED"/>

            </intent-filter>
@@ -98,10 +98,10 @@ 
            android:authorities="${applicationId}.androidx-startup"

            tools:node="remove" />



        <service android:name=".manager.pkg.PackageInstallerService" />

        <service android:name=".install.pkg.PackageInstallerService" />



        <service

            android:name=".splitinstall.SplitInstallService"

            android:name=".install.splitinstall.SplitInstallService"

            android:exported="true" />

    </application>

app/src/main/java/foundation/e/apps/AppLoungeApplication.kt

+7 −7
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ import androidx.hilt.work.HiltWorkerFactory 
import androidx.work.Configuration

import androidx.work.ExistingPeriodicWorkPolicy

import dagger.hilt.android.HiltAndroidApp

import foundation.e.apps.manager.pkg.PkgManagerBR

import foundation.e.apps.manager.pkg.PkgManagerModule

import foundation.e.apps.manager.workmanager.InstallWorkManager

import foundation.e.apps.setup.tos.TOS_VERSION

import foundation.e.apps.updates.manager.UpdatesWorkManager

import foundation.e.apps.utils.modules.DataStoreModule

import foundation.e.apps.utils.modules.PreferenceManagerModule

import foundation.e.apps.data.preference.DataStoreModule

import foundation.e.apps.data.preference.PreferenceManagerModule

import foundation.e.apps.install.pkg.PkgManagerBR

import foundation.e.apps.install.pkg.PkgManagerModule

import foundation.e.apps.install.updates.UpdatesWorkManager

import foundation.e.apps.install.workmanager.InstallWorkManager

import foundation.e.apps.ui.setup.tos.TOS_VERSION

import foundation.e.lib.telemetry.Telemetry

import kotlinx.coroutines.DelicateCoroutinesApi

import kotlinx.coroutines.MainScope

app/src/main/java/foundation/e/apps/api/ApiCaller.kt→app/src/main/java/foundation/e/apps/data/ApiCaller.kt

+1 −1
Original line number Diff line number Diff line 
package foundation.e.apps.api

package foundation.e.apps.data



import retrofit2.Response

app/src/main/java/foundation/e/apps/api/BaseStoreRepository.kt→app/src/main/java/foundation/e/apps/data/BaseStoreRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.

 */



package foundation.e.apps.api

package foundation.e.apps.data



interface BaseStoreRepository {

    suspend fun getHomeScreenData(): Any

app/src/main/java/foundation/e/apps/utils/Constants.kt→app/src/main/java/foundation/e/apps/data/Constants.kt

+1 −1
Original line number Diff line number Diff line 
package foundation.e.apps.utils

package foundation.e.apps.data



object Constants {

    const val timeoutDurationInMillis: Long = 10000