Skip to content

Commit eb03518

Browse files
kirklandsignkirklandsign
committed
Rename stuff
1 parent 10abb19 commit eb03518

6 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎llm/android/LlamaDemo/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:name=".LogsActivity"
2323
android:exported="false" />
2424
<activity
25-
android:name=".SettingsActivity"
25+
android:name=".ModelSettingsActivity"
2626
android:exported="false" />
2727
<activity
2828
android:name=".AppSettingsActivity"

‎llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/MainActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class MainActivity : ComponentActivity() {
8585
finish()
8686
},
8787
onSettingsClick = {
88-
startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
88+
startActivity(Intent(this@MainActivity, ModelSettingsActivity::class.java))
8989
},
9090
onLogsClick = {
9191
startActivity(Intent(this@MainActivity, LogsActivity::class.java))
@@ -106,7 +106,7 @@ class MainActivity : ComponentActivity() {
106106
launchCamera()
107107
}
108108
},
109-
audioFiles = SettingsActivity.listLocalFile("/data/local/tmp/audio/", arrayOf(".bin")).toList(),
109+
audioFiles = ModelSettingsActivity.listLocalFile("/data/local/tmp/audio/", arrayOf(".bin")).toList(),
110110
onAudioFileSelected = { audioFile ->
111111
chatViewModel?.setAudioFile(audioFile)
112112
}

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsActivity.kt renamed to llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ModelSettingsActivity.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import androidx.compose.runtime.setValue
2222
import androidx.compose.ui.Modifier
2323
import androidx.core.content.ContextCompat
2424
import androidx.lifecycle.viewmodel.compose.viewModel
25-
import com.example.executorchllamademo.ui.screens.SettingsScreen
25+
import com.example.executorchllamademo.ui.screens.ModelSettingsScreen
2626
import com.example.executorchllamademo.ui.theme.LlamaDemoTheme
27-
import com.example.executorchllamademo.ui.viewmodel.SettingsViewModel
27+
import com.example.executorchllamademo.ui.viewmodel.ModelSettingsViewModel
2828
import java.io.File
2929

30-
class SettingsActivity : ComponentActivity() {
30+
class ModelSettingsActivity : ComponentActivity() {
3131

3232
private var appearanceMode by mutableStateOf(AppearanceMode.SYSTEM)
3333

@@ -50,16 +50,16 @@ class SettingsActivity : ComponentActivity() {
5050

5151
LlamaDemoTheme(darkTheme = isDarkTheme) {
5252
Surface(modifier = Modifier.fillMaxSize()) {
53-
val viewModel: SettingsViewModel = viewModel()
54-
SettingsScreen(
53+
val viewModel: ModelSettingsViewModel = viewModel()
54+
ModelSettingsScreen(
5555
viewModel = viewModel,
5656
onBackPressed = {
5757
viewModel.saveSettings()
5858
finish()
5959
},
6060
onLoadModel = {
6161
// Navigate to MainActivity (conversation) after loading model
62-
startActivity(Intent(this@SettingsActivity, MainActivity::class.java))
62+
startActivity(Intent(this@ModelSettingsActivity, MainActivity::class.java))
6363
finish()
6464
},
6565
onAppearanceChanged = { mode ->

‎llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/WelcomeActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class WelcomeActivity : ComponentActivity() {
4949
Surface(modifier = Modifier.fillMaxSize()) {
5050
WelcomeScreen(
5151
onLoadModelClick = {
52-
startActivity(Intent(this@WelcomeActivity, SettingsActivity::class.java))
52+
startActivity(Intent(this@WelcomeActivity, ModelSettingsActivity::class.java))
5353
},
5454
onAppSettingsClick = {
5555
startActivity(Intent(this@WelcomeActivity, AppSettingsActivity::class.java))

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/screens/SettingsScreen.kt renamed to llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/screens/ModelSettingsScreen.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ import com.example.executorchllamademo.ui.components.SettingsRow
6868
import com.example.executorchllamademo.ui.theme.BtnDisabled
6969
import com.example.executorchllamademo.ui.theme.BtnEnabled
7070
import com.example.executorchllamademo.ui.theme.LocalAppColors
71-
import com.example.executorchllamademo.ui.viewmodel.SettingsViewModel
71+
import com.example.executorchllamademo.ui.viewmodel.ModelSettingsViewModel
7272

7373
@Composable
74-
fun SettingsScreen(
75-
viewModel: SettingsViewModel = viewModel(),
74+
fun ModelSettingsScreen(
75+
viewModel: ModelSettingsViewModel = viewModel(),
7676
onBackPressed: () -> Unit = {},
7777
onLoadModel: () -> Unit = {},
7878
onAppearanceChanged: (AppearanceMode) -> Unit = {}
@@ -388,7 +388,7 @@ private fun PromptSection(
388388
}
389389

390390
@Composable
391-
private fun BackendDialog(viewModel: SettingsViewModel) {
391+
private fun BackendDialog(viewModel: ModelSettingsViewModel) {
392392
if (viewModel.showBackendDialog) {
393393
SingleChoiceDialog(
394394
title = "Select backend type",
@@ -404,7 +404,7 @@ private fun BackendDialog(viewModel: SettingsViewModel) {
404404

405405
@Composable
406406
private fun AppearanceDialog(
407-
viewModel: SettingsViewModel,
407+
viewModel: ModelSettingsViewModel,
408408
onAppearanceChanged: (AppearanceMode) -> Unit
409409
) {
410410
if (viewModel.showAppearanceDialog) {
@@ -423,7 +423,7 @@ private fun AppearanceDialog(
423423
}
424424

425425
@Composable
426-
private fun ModelDialog(viewModel: SettingsViewModel) {
426+
private fun ModelDialog(viewModel: ModelSettingsViewModel) {
427427
if (viewModel.showModelDialog) {
428428
if (viewModel.modelFiles.isEmpty()) {
429429
AlertDialog(
@@ -453,7 +453,7 @@ private fun ModelDialog(viewModel: SettingsViewModel) {
453453
}
454454

455455
@Composable
456-
private fun TokenizerDialog(viewModel: SettingsViewModel) {
456+
private fun TokenizerDialog(viewModel: ModelSettingsViewModel) {
457457
if (viewModel.showTokenizerDialog) {
458458
if (viewModel.tokenizerFiles.isEmpty()) {
459459
AlertDialog(
@@ -483,7 +483,7 @@ private fun TokenizerDialog(viewModel: SettingsViewModel) {
483483
}
484484

485485
@Composable
486-
private fun DataPathDialog(viewModel: SettingsViewModel) {
486+
private fun DataPathDialog(viewModel: ModelSettingsViewModel) {
487487
if (viewModel.showDataPathDialog) {
488488
val options = if (viewModel.dataPathFiles.isEmpty()) {
489489
listOf("(unused)")
@@ -508,7 +508,7 @@ private fun DataPathDialog(viewModel: SettingsViewModel) {
508508
}
509509

510510
@Composable
511-
private fun ModelTypeDialog(viewModel: SettingsViewModel) {
511+
private fun ModelTypeDialog(viewModel: ModelSettingsViewModel) {
512512
if (viewModel.showModelTypeDialog) {
513513
SingleChoiceDialog(
514514
title = "Select model type",
@@ -524,7 +524,7 @@ private fun ModelTypeDialog(viewModel: SettingsViewModel) {
524524

525525
@Composable
526526
private fun LoadModelDialog(
527-
viewModel: SettingsViewModel,
527+
viewModel: ModelSettingsViewModel,
528528
onLoadModel: () -> Unit,
529529
onBackPressed: () -> Unit
530530
) {
@@ -561,7 +561,7 @@ private fun LoadModelDialog(
561561
}
562562

563563
@Composable
564-
private fun ResetSystemPromptDialog(viewModel: SettingsViewModel) {
564+
private fun ResetSystemPromptDialog(viewModel: ModelSettingsViewModel) {
565565
if (viewModel.showResetSystemPromptDialog) {
566566
AlertDialog(
567567
onDismissRequest = { viewModel.showResetSystemPromptDialog = false },
@@ -593,7 +593,7 @@ private fun ResetSystemPromptDialog(viewModel: SettingsViewModel) {
593593
}
594594

595595
@Composable
596-
private fun ResetUserPromptDialog(viewModel: SettingsViewModel) {
596+
private fun ResetUserPromptDialog(viewModel: ModelSettingsViewModel) {
597597
if (viewModel.showResetUserPromptDialog) {
598598
AlertDialog(
599599
onDismissRequest = { viewModel.showResetUserPromptDialog = false },
@@ -625,7 +625,7 @@ private fun ResetUserPromptDialog(viewModel: SettingsViewModel) {
625625
}
626626

627627
@Composable
628-
private fun InvalidPromptDialog(viewModel: SettingsViewModel) {
628+
private fun InvalidPromptDialog(viewModel: ModelSettingsViewModel) {
629629
if (viewModel.showInvalidPromptDialog) {
630630
AlertDialog(
631631
onDismissRequest = { viewModel.showInvalidPromptDialog = false },

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/SettingsViewModel.kt renamed to llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ModelSettingsViewModel.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import com.example.executorchllamademo.AppearanceMode
1717
import com.example.executorchllamademo.AppSettings
1818
import com.example.executorchllamademo.BackendType
1919
import com.example.executorchllamademo.DemoSharedPreferences
20+
import com.example.executorchllamademo.ModelSettingsActivity
2021
import com.example.executorchllamademo.ModelType
2122
import com.example.executorchllamademo.ModuleSettings
2223
import com.example.executorchllamademo.PromptFormat
23-
import com.example.executorchllamademo.SettingsActivity
2424

25-
class SettingsViewModel : ViewModel() {
25+
class ModelSettingsViewModel : ViewModel() {
2626

2727
var moduleSettings by mutableStateOf(ModuleSettings())
2828
private set
@@ -71,9 +71,9 @@ class SettingsViewModel : ViewModel() {
7171
}
7272

7373
fun refreshFileLists() {
74-
modelFiles = SettingsActivity.listLocalFile("/data/local/tmp/llama/", arrayOf(".pte"))
75-
tokenizerFiles = SettingsActivity.listLocalFile("/data/local/tmp/llama/", arrayOf(".bin", ".json", ".model"))
76-
dataPathFiles = SettingsActivity.listLocalFile("/data/local/tmp/llama/", arrayOf(".ptd"))
74+
modelFiles = ModelSettingsActivity.listLocalFile("/data/local/tmp/llama/", arrayOf(".pte"))
75+
tokenizerFiles = ModelSettingsActivity.listLocalFile("/data/local/tmp/llama/", arrayOf(".bin", ".json", ".model"))
76+
dataPathFiles = ModelSettingsActivity.listLocalFile("/data/local/tmp/llama/", arrayOf(".ptd"))
7777
}
7878

7979
// Backend selection

0 commit comments

Comments
 (0)