Skip to content

Commit be14eb8

Browse files
titooantitooan
authored
Merge pull request #1 from titooan/rename-tryfox
Rename FenixInstaller into TryFox
2 parents 79b09f0 + 44558a9 commit be14eb8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+267
-292
lines changed

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ plugins {
77
}
88

99
android {
10-
namespace = "org.mozilla.fenixinstaller"
10+
namespace = "org.mozilla.tryfox"
1111
compileSdk {
1212
version = release(36)
1313
}
1414

1515
defaultConfig {
16-
applicationId = "org.mozilla.fenixinstaller"
16+
applicationId = "org.mozilla.tryfox"
1717
minSdk = 26
1818
targetSdk = 36
1919
versionCode = 1

‎app/detekt-baseline.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -181,18 +181,18 @@
181181
<ID>MaxLineLength:TreeherderApksScreen.kt$}</ID>
182182
<ID>MaxLineLength:UserDataRepository.kt$private</ID>
183183
<ID>NestedBlockDepth:HomeViewModel.kt$HomeViewModel$private fun isAppCachePopulated(appSpecificCacheDir: File): Boolean</ID>
184-
<ID>NewLineAtEndOfFile:AbiChip.kt$org.mozilla.fenixinstaller.ui.composables.AbiChip.kt</ID>
185-
<ID>NewLineAtEndOfFile:AbiUiModel.kt$org.mozilla.fenixinstaller.ui.models.AbiUiModel.kt</ID>
186-
<ID>NewLineAtEndOfFile:Color.kt$org.mozilla.fenixinstaller.ui.theme.Color.kt</ID>
187-
<ID>NewLineAtEndOfFile:ExampleUnitTest.kt$org.mozilla.fenixinstaller.ExampleUnitTest.kt</ID>
188-
<ID>NewLineAtEndOfFile:ExpandableListView.kt$org.mozilla.fenixinstaller.ui.composables.ExpandableListView.kt</ID>
189-
<ID>NewLineAtEndOfFile:FocusApksState.kt$org.mozilla.fenixinstaller.ui.models.FocusApksState.kt</ID>
190-
<ID>NewLineAtEndOfFile:JobDetailsSerializer.kt$org.mozilla.fenixinstaller.data.JobDetailsSerializer.kt</ID>
191-
<ID>NewLineAtEndOfFile:JobDetailsSerializerTest.kt$org.mozilla.fenixinstaller.JobDetailsSerializerTest.kt</ID>
192-
<ID>NewLineAtEndOfFile:JobUiModel.kt$org.mozilla.fenixinstaller.ui.models.JobUiModel.kt</ID>
193-
<ID>NewLineAtEndOfFile:Theme.kt$org.mozilla.fenixinstaller.ui.theme.Theme.kt</ID>
194-
<ID>NewLineAtEndOfFile:Type.kt$org.mozilla.fenixinstaller.ui.theme.Type.kt</ID>
195-
<ID>NewLineAtEndOfFile:UiModels.kt$org.mozilla.fenixinstaller.data.UiModels.kt</ID>
184+
<ID>NewLineAtEndOfFile:AbiChip.kt$org.mozilla.tryfox.ui.composables.AbiChip.kt</ID>
185+
<ID>NewLineAtEndOfFile:AbiUiModel.kt$org.mozilla.tryfox.ui.models.AbiUiModel.kt</ID>
186+
<ID>NewLineAtEndOfFile:Color.kt$org.mozilla.tryfox.ui.theme.Color.kt</ID>
187+
<ID>NewLineAtEndOfFile:ExampleUnitTest.kt$org.mozilla.tryfox.ExampleUnitTest.kt</ID>
188+
<ID>NewLineAtEndOfFile:ExpandableListView.kt$org.mozilla.tryfox.ui.composables.ExpandableListView.kt</ID>
189+
<ID>NewLineAtEndOfFile:FocusApksState.kt$org.mozilla.tryfox.ui.models.FocusApksState.kt</ID>
190+
<ID>NewLineAtEndOfFile:JobDetailsSerializer.kt$org.mozilla.tryfox.data.JobDetailsSerializer.kt</ID>
191+
<ID>NewLineAtEndOfFile:JobDetailsSerializerTest.kt$org.mozilla.tryfox.JobDetailsSerializerTest.kt</ID>
192+
<ID>NewLineAtEndOfFile:JobUiModel.kt$org.mozilla.tryfox.ui.models.JobUiModel.kt</ID>
193+
<ID>NewLineAtEndOfFile:Theme.kt$org.mozilla.tryfox.ui.theme.Theme.kt</ID>
194+
<ID>NewLineAtEndOfFile:Type.kt$org.mozilla.tryfox.ui.theme.Type.kt</ID>
195+
<ID>NewLineAtEndOfFile:UiModels.kt$org.mozilla.tryfox.data.UiModels.kt</ID>
196196
<ID>ReturnCount:FenixInstallerViewModel.kt$FenixInstallerViewModel$fun getDownloadedFile(artifactName: String, context: Context, taskId: String): File?</ID>
197197
<ID>ReturnCount:HomeViewModel.kt$HomeViewModel$private fun isAppCachePopulated(appSpecificCacheDir: File): Boolean</ID>
198198
<ID>ReturnCount:MozillaArchiveRepositoryImpl.kt$MozillaArchiveRepositoryImpl$private fun parseNightlyBuildsFromHtml( html: String, archiveUrl: String, // This parameter is the fully constructed URL for the month app: String // "fenix" or "focus" ): List&lt;ParsedNightlyApk&gt;</ID>

‎app/src/androidTest/java/org/mozilla/fenixinstaller/data/FakeFenixRepository.kt‎ renamed to ‎app/src/androidTest/java/org/mozilla/tryfox/data/FakeFenixRepository.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.mozilla.fenixinstaller.data
1+
package org.mozilla.tryfox.data
22

33
import kotlinx.coroutines.delay
44
import java.io.File

‎app/src/androidTest/java/org/mozilla/fenixinstaller/ui/screens/FakeUserDataRepository.kt‎ renamed to ‎app/src/androidTest/java/org/mozilla/tryfox/ui/screens/FakeUserDataRepository.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.mozilla.fenixinstaller.ui.screens
1+
package org.mozilla.tryfox.ui.screens
22

33
import kotlinx.coroutines.flow.Flow
44
import kotlinx.coroutines.flow.MutableStateFlow
5-
import org.mozilla.fenixinstaller.data.UserDataRepository
5+
import org.mozilla.tryfox.data.UserDataRepository
66

77
/**
88
* A fake implementation of [UserDataRepository] for testing purposes.

‎app/src/androidTest/java/org/mozilla/fenixinstaller/ui/screens/HomeScreenTest.kt‎ renamed to ‎app/src/androidTest/java/org/mozilla/tryfox/ui/screens/HomeScreenTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.mozilla.fenixinstaller.ui.screens
1+
package org.mozilla.tryfox.ui.screens
22

33
import androidx.compose.ui.test.assertIsDisplayed
44
import androidx.compose.ui.test.hasContentDescription
@@ -8,8 +8,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
88
import org.junit.Rule
99
import org.junit.Test
1010
import org.junit.runner.RunWith
11-
import org.mozilla.fenixinstaller.MainActivity
12-
import org.mozilla.fenixinstaller.R
11+
import org.mozilla.tryfox.MainActivity
12+
import org.mozilla.tryfox.R
1313

1414
@RunWith(AndroidJUnit4::class)
1515
class HomeScreenTest {

‎app/src/androidTest/java/org/mozilla/fenixinstaller/ui/screens/ProfileScreenTest.kt‎ renamed to ‎app/src/androidTest/java/org/mozilla/tryfox/ui/screens/ProfileScreenTest.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.mozilla.fenixinstaller.ui.screens
1+
package org.mozilla.tryfox.ui.screens
22

33
import androidx.compose.ui.semantics.SemanticsProperties
44
import androidx.compose.ui.test.assertIsDisplayed
@@ -8,14 +8,12 @@ import androidx.compose.ui.test.onNodeWithTag
88
import androidx.compose.ui.test.performClick
99
import androidx.compose.ui.test.performTextInput
1010
import androidx.test.ext.junit.runners.AndroidJUnit4
11-
import androidx.test.platform.app.InstrumentationRegistry
1211
import org.junit.Assert.assertNotNull
13-
import org.junit.Before
1412
import org.junit.Rule
1513
import org.junit.Test
1614
import org.junit.runner.RunWith
17-
import org.mozilla.fenixinstaller.data.FakeFenixRepository
18-
import org.mozilla.fenixinstaller.data.UserDataRepository
15+
import org.mozilla.tryfox.data.FakeFenixRepository
16+
import org.mozilla.tryfox.data.UserDataRepository
1917
import java.io.File
2018

2119
@RunWith(AndroidJUnit4::class)

‎app/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
</queries>
1313

1414
<application
15-
android:name=".FenixInstallerApplication"
15+
android:name=".TryFoxApplication"
1616
android:allowBackup="true"
1717
android:dataExtractionRules="@xml/data_extraction_rules"
1818
android:fullBackupContent="@xml/backup_rules"
1919
android:icon="@mipmap/ic_launcher"
2020
android:label="@string/app_name"
2121
android:roundIcon="@mipmap/ic_launcher_round"
2222
android:supportsRtl="true"
23-
android:theme="@style/Theme.FenixInstaller">
23+
android:theme="@style/Theme.TryFox">
2424
<activity
2525
android:name=".MainActivity"
2626
android:exported="true"
2727
android:label="@string/app_name"
2828
android:launchMode="singleTop"
29-
android:theme="@style/Theme.FenixInstaller">
29+
android:theme="@style/Theme.TryFox">
3030
<intent-filter>
3131
<action android:name="android.intent.action.MAIN" />
3232
<category android:name="android.intent.category.LAUNCHER" />
@@ -57,7 +57,7 @@
5757
android:name=".InstallResultReceiver"
5858
android:exported="true">
5959
<intent-filter>
60-
<action android:name="org.mozilla.fenixinstaller.INSTALL_COMPLETE" />
60+
<action android:name="org.mozilla.tryfox.INSTALL_COMPLETE" />
6161
</intent-filter>
6262
</receiver>
6363

‎app/src/main/java/org/mozilla/fenixinstaller/MainActivity.kt‎ renamed to ‎app/src/main/java/org/mozilla/tryfox/MainActivity.kt‎

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.mozilla.fenixinstaller
1+
package org.mozilla.tryfox
22

33
import android.content.ActivityNotFoundException
44
import android.content.Intent
@@ -11,27 +11,22 @@ import androidx.activity.compose.setContent
1111
import androidx.activity.enableEdgeToEdge
1212
import androidx.compose.runtime.Composable
1313
import androidx.compose.runtime.LaunchedEffect
14-
import androidx.compose.runtime.getValue
15-
import androidx.compose.runtime.mutableStateOf
16-
import androidx.compose.runtime.remember
17-
import androidx.compose.runtime.setValue
1814
import androidx.core.content.FileProvider
1915
import androidx.navigation.NavHostController
2016
import androidx.navigation.NavType
2117
import androidx.navigation.compose.NavHost
2218
import androidx.navigation.compose.composable
23-
import androidx.navigation.compose.currentBackStackEntryAsState
2419
import androidx.navigation.compose.rememberNavController
2520
import androidx.navigation.navArgument
2621
import androidx.navigation.navDeepLink
2722
import org.koin.androidx.compose.koinViewModel
2823
import org.koin.androidx.viewmodel.ext.android.viewModel
29-
import org.mozilla.fenixinstaller.ui.screens.FenixInstallerApp
30-
import org.mozilla.fenixinstaller.ui.screens.HomeScreen
31-
import org.mozilla.fenixinstaller.ui.screens.HomeViewModel
32-
import org.mozilla.fenixinstaller.ui.screens.ProfileScreen
33-
import org.mozilla.fenixinstaller.ui.screens.ProfileViewModel
34-
import org.mozilla.fenixinstaller.ui.theme.FenixInstallerTheme
24+
import org.mozilla.tryfox.ui.screens.TryFoxMainScreen
25+
import org.mozilla.tryfox.ui.screens.HomeScreen
26+
import org.mozilla.tryfox.ui.screens.HomeViewModel
27+
import org.mozilla.tryfox.ui.screens.ProfileScreen
28+
import org.mozilla.tryfox.ui.screens.ProfileViewModel
29+
import org.mozilla.tryfox.ui.theme.TryFoxTheme
3530
import java.io.File
3631

3732
sealed class NavScreen(val route: String) {
@@ -46,17 +41,17 @@ sealed class NavScreen(val route: String) {
4641
class MainActivity : ComponentActivity() {
4742

4843
// Inject FenixInstallerViewModel using Koin
49-
private val fenixInstallerViewModel: FenixInstallerViewModel by viewModel()
44+
private val tryFoxViewModel: TryFoxViewModel by viewModel()
5045
private lateinit var navController: NavHostController
5146

5247
override fun onCreate(savedInstanceState: Bundle?) {
5348
super.onCreate(savedInstanceState)
5449
Log.d("MainActivity", "onCreate called. Intent: $intent, Data: ${intent?.data}")
5550
enableEdgeToEdge()
5651
setContent {
57-
FenixInstallerTheme {
52+
TryFoxTheme {
5853
// Pass the Koin-injected ViewModel
59-
AppNavigation(fenixInstallerViewModel)
54+
AppNavigation(tryFoxViewModel)
6055
}
6156
}
6257
}
@@ -81,24 +76,11 @@ class MainActivity : ComponentActivity() {
8176
}
8277

8378
@Composable
84-
fun AppNavigation(mainActivityViewModel: FenixInstallerViewModel) {
79+
fun AppNavigation(mainActivityViewModel: TryFoxViewModel) {
8580
val localNavController = rememberNavController()
8681
this@MainActivity.navController = localNavController
8782
Log.d("MainActivity", "AppNavigation: NavController instance assigned: $localNavController")
8883

89-
val navBackStackEntry by localNavController.currentBackStackEntryAsState()
90-
var currentScreenTitle by remember { mutableStateOf("Fenix Installer") }
91-
92-
LaunchedEffect(navBackStackEntry) {
93-
currentScreenTitle = when (navBackStackEntry?.destination?.route) {
94-
NavScreen.Home.route -> "Fenix Nightly Builds"
95-
NavScreen.TreeherderSearch.route -> "Treeherder Build Search"
96-
NavScreen.TreeherderSearchWithArgs.route -> "Treeherder Build Search"
97-
NavScreen.Profile.route -> "Profile"
98-
else -> "Fenix Installer"
99-
}
100-
}
101-
10284
NavHost(navController = localNavController, startDestination = NavScreen.Home.route) {
10385
composable(NavScreen.Home.route) {
10486
// Inject HomeViewModel using Koin in Composable
@@ -113,8 +95,8 @@ class MainActivity : ComponentActivity() {
11395
composable(NavScreen.TreeherderSearch.route) {
11496
// mainActivityViewModel is already injected and passed as a parameter
11597
mainActivityViewModel.onInstallApk = ::installApk
116-
FenixInstallerApp(
117-
fenixInstallerViewModel = mainActivityViewModel,
98+
TryFoxMainScreen(
99+
tryFoxViewModel = mainActivityViewModel,
118100
onNavigateUp = { localNavController.popBackStack() }
119101
)
120102
}
@@ -152,8 +134,8 @@ class MainActivity : ComponentActivity() {
152134
)
153135
}
154136
mainActivityViewModel.onInstallApk = ::installApk
155-
FenixInstallerApp(
156-
fenixInstallerViewModel = mainActivityViewModel,
137+
TryFoxMainScreen(
138+
tryFoxViewModel = mainActivityViewModel,
157139
onNavigateUp = { localNavController.popBackStack() }
158140
)
159141
}

‎app/src/main/java/org/mozilla/fenixinstaller/FenixInstallerApplication.kt‎ renamed to ‎app/src/main/java/org/mozilla/tryfox/TryFoxApplication.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package org.mozilla.fenixinstaller
1+
package org.mozilla.tryfox
22

33
import android.app.Application
44
import logcat.AndroidLogcatLogger
55
import logcat.LogPriority
66
import org.koin.android.ext.koin.androidContext
77
import org.koin.android.ext.koin.androidLogger
88
import org.koin.core.context.startKoin
9-
import org.mozilla.fenixinstaller.di.appModules
9+
import org.mozilla.tryfox.di.appModules
1010

11-
class FenixInstallerApplication : Application() {
11+
class TryFoxApplication : Application() {
1212
override fun onCreate() {
1313
super.onCreate()
1414

1515
startKoin {
1616
androidLogger()
17-
androidContext(this@FenixInstallerApplication)
17+
androidContext(this@TryFoxApplication)
1818
modules(appModules)
1919
}
2020

‎app/src/main/java/org/mozilla/fenixinstaller/FenixInstallerViewModel.kt‎ renamed to ‎app/src/main/java/org/mozilla/tryfox/TryFoxViewModel.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.mozilla.fenixinstaller
1+
package org.mozilla.tryfox
22

33
import android.os.Build
44
import android.util.Log
@@ -17,17 +17,17 @@ import kotlinx.coroutines.flow.asStateFlow
1717
import kotlinx.coroutines.flow.launchIn
1818
import kotlinx.coroutines.flow.onEach
1919
import kotlinx.coroutines.launch
20-
import org.mozilla.fenixinstaller.data.DownloadState
21-
import org.mozilla.fenixinstaller.data.IFenixRepository
22-
import org.mozilla.fenixinstaller.data.NetworkResult
23-
import org.mozilla.fenixinstaller.data.managers.CacheManager
24-
import org.mozilla.fenixinstaller.model.CacheManagementState
25-
import org.mozilla.fenixinstaller.ui.models.AbiUiModel
26-
import org.mozilla.fenixinstaller.ui.models.ArtifactUiModel
27-
import org.mozilla.fenixinstaller.ui.models.JobDetailsUiModel
20+
import org.mozilla.tryfox.data.DownloadState
21+
import org.mozilla.tryfox.data.IFenixRepository
22+
import org.mozilla.tryfox.data.NetworkResult
23+
import org.mozilla.tryfox.data.managers.CacheManager
24+
import org.mozilla.tryfox.model.CacheManagementState
25+
import org.mozilla.tryfox.ui.models.AbiUiModel
26+
import org.mozilla.tryfox.ui.models.ArtifactUiModel
27+
import org.mozilla.tryfox.ui.models.JobDetailsUiModel
2828
import java.io.File
2929

30-
class FenixInstallerViewModel(
30+
class TryFoxViewModel(
3131
private val repository: IFenixRepository,
3232
private val cacheManager: CacheManager // Injected CacheManager
3333
) : ViewModel() {

0 commit comments

Comments
 (0)