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

Commit 184fad11 authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

Merge branch '1417-move_main_activity' into 'main' 

refactor: move MainActivity (#1417)

See merge request !486
parents 613aa033 7416f30a

app/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
        tools:targetApi="tiramisu">



        <activity

            android:name=".MainActivity"

            android:name=".ui.MainActivity"

            android:exported="true">

            <intent-filter>

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

app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import androidx.core.app.NotificationCompat 
import androidx.core.app.NotificationManagerCompat

import androidx.core.content.pm.PackageInfoCompat

import foundation.e.apps.ISplitInstallService

import foundation.e.apps.MainActivity

import foundation.e.apps.ui.MainActivity

import foundation.e.apps.R

import foundation.e.apps.data.DownloadManager

import foundation.e.apps.data.application.ApplicationRepository

app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.os.Build 
import androidx.core.app.ActivityCompat

import androidx.core.app.NotificationCompat

import androidx.core.app.NotificationManagerCompat

import foundation.e.apps.MainActivity

import foundation.e.apps.ui.MainActivity

import foundation.e.apps.R



object UpdatesNotifier {

app/src/main/java/foundation/e/apps/MainActivity.kt→app/src/main/java/foundation/e/apps/ui/MainActivity.kt

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 *

 */



package foundation.e.apps

package foundation.e.apps.ui



import android.content.Intent

import android.os.Build.VERSION
@@ -42,6 +42,8 @@ import com.aurora.gplayapi.exceptions.ApiException 
import com.google.android.material.bottomnavigation.BottomNavigationView

import com.google.android.material.snackbar.Snackbar

import dagger.hilt.android.AndroidEntryPoint

import foundation.e.apps.BuildConfig

import foundation.e.apps.R

import foundation.e.apps.contract.ParentalControlContract.COLUMN_LOGIN_TYPE

import foundation.e.apps.data.Constants

import foundation.e.apps.data.enums.User
@@ -52,7 +54,6 @@ import foundation.e.apps.data.login.PlayStoreAuthenticator 
import foundation.e.apps.data.login.exceptions.GPlayValidationException

import foundation.e.apps.databinding.ActivityMainBinding

import foundation.e.apps.install.updates.UpdatesNotifier

import foundation.e.apps.ui.MainActivityViewModel

import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment

import foundation.e.apps.ui.purchase.AppPurchaseFragmentDirections

import foundation.e.apps.ui.settings.SettingsFragment

app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import com.google.android.material.button.MaterialButton 
import com.google.android.material.snackbar.Snackbar

import com.google.android.material.textview.MaterialTextView

import dagger.hilt.android.AndroidEntryPoint

import foundation.e.apps.MainActivity

import foundation.e.apps.ui.MainActivity

import foundation.e.apps.R

import foundation.e.apps.data.application.data.Application

import foundation.e.apps.data.application.data.shareUri