Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: migrate to compose part 1 #898

Merged
merged 42 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d72f64c
feat: convert setup screens to compose
jarnedemeulemeester Nov 9, 2024
291e573
refactor: move all setup related strings from core to setup module
jarnedemeulemeester Nov 9, 2024
41f1c39
refactor(tv): move AddServerScreen and LoginScreen to new viewmodels
jarnedemeulemeester Nov 10, 2024
2d4c875
feat(tv): add WelcomeScreen
jarnedemeulemeester Nov 10, 2024
442f469
feat: add ServersScreen
jarnedemeulemeester Nov 11, 2024
e451eb5
feat(welcome): move buttons to center
jarnedemeulemeester Nov 16, 2024
6caa96e
feat(servers): replace add server button by fab
jarnedemeulemeester Nov 16, 2024
7d21178
refactor: remove DiscoverServerScreen and put discovered servers on A…
jarnedemeulemeester Nov 16, 2024
9da8f54
refactor(tv): move ServerSelectScreen to ServersViewModel
jarnedemeulemeester Nov 16, 2024
fc865bc
refactor: remove ServerSelectFragment
jarnedemeulemeester Nov 16, 2024
39be758
refactor: move set current server to repository
jarnedemeulemeester Nov 16, 2024
4c849f8
refactor: remove leftover discovered server code
jarnedemeulemeester Nov 16, 2024
f44656b
fix(servers): fill remaining space when there are no servers
jarnedemeulemeester Nov 16, 2024
7ed287b
refactor: replace icon with image and animate discovered servers
jarnedemeulemeester Nov 16, 2024
44dbe07
feat(login): add divider between login and quick connect buttons
jarnedemeulemeester Nov 17, 2024
da96d86
feat(addserver,tv): list discovered servers
jarnedemeulemeester Nov 17, 2024
d1cd072
lint: fix servers_no_servers string
jarnedemeulemeester Nov 17, 2024
8e0dd53
feat: animate quick connect button appearing
jarnedemeulemeester Nov 23, 2024
39ff66b
feat(tv): animate quick connect button appearing
jarnedemeulemeester Nov 23, 2024
70c8592
feat(login): display current server
jarnedemeulemeester Nov 23, 2024
7ee1fd6
feat(login): add button to change server
jarnedemeulemeester Nov 23, 2024
07f4965
fix: place top buttons above the column
jarnedemeulemeester Nov 23, 2024
6f5ced1
refactor: streamline themes between phone and tv
jarnedemeulemeester Nov 24, 2024
2049170
refactor: streamline screens between phone and tv
jarnedemeulemeester Nov 24, 2024
777bec1
feat(phone): add users screen
jarnedemeulemeester Nov 30, 2024
8cbee55
refactor(tv): migrate UsersScreen to new viewmodel
jarnedemeulemeester Nov 30, 2024
f3f576e
refactor: remove old users fragment code
jarnedemeulemeester Nov 30, 2024
972a6ee
refactor(tv): migrate to native compose navigation
jarnedemeulemeester Nov 30, 2024
84b0b99
chore: move all user related strings to setup module
jarnedemeulemeester Dec 1, 2024
365fcaf
chore: remove unused NavigationPlayer.kt
jarnedemeulemeester Dec 1, 2024
f4f56d4
chore: move remove_server_dialog strings to setup module
jarnedemeulemeester Dec 1, 2024
3b9c667
refactor: remove tests for now
jarnedemeulemeester Dec 1, 2024
edea8d7
refactor: run startup checks in viewmodel
jarnedemeulemeester Dec 1, 2024
39c7ace
refactor: remove unused code
jarnedemeulemeester Dec 1, 2024
6653139
fix: add back uiState to MainViewModel for MainScreen
jarnedemeulemeester Dec 1, 2024
c919c95
feat: hide password by default and add eye to toggle visibility
jarnedemeulemeester Dec 7, 2024
1d9f665
fix(phone): hide back button when screen is start destination
jarnedemeulemeester Dec 7, 2024
ddc6df8
fix(phone): only navigate when current lifecycle state is resumed and…
jarnedemeulemeester Dec 7, 2024
bf97265
Merge branch 'main' into compose/setup
jarnedemeulemeester Dec 8, 2024
2d27689
refactor: simplify when to show back button by checking the previous …
jarnedemeulemeester Dec 8, 2024
e13e605
refactor: remove extra check in showBack
jarnedemeulemeester Dec 8, 2024
d688317
refactor: make discoverServers a normal method
jarnedemeulemeester Dec 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions app/phone/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose.compiler)
alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.ksp)
alias(libs.plugins.androidx.navigation.safeargs)
alias(libs.plugins.hilt)
Expand Down Expand Up @@ -81,6 +83,7 @@ android {
buildFeatures {
buildConfig = true
viewBinding = true
compose = true
}

dependenciesInfo {
Expand All @@ -107,10 +110,22 @@ dependencies {
implementation(projects.preferences)
implementation(projects.player.core)
implementation(projects.player.video)
implementation(projects.setup)
implementation(libs.aboutlibraries.core)
implementation(libs.aboutlibraries)
implementation(libs.androidx.activity)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.appcompat)

// Compose
implementation(libs.androidx.compose.foundation)
implementation(libs.androidx.compose.runtime)
implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.tooling.preview)
debugImplementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.hilt.navigation.compose)

implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.core)
implementation(libs.androidx.hilt.work)
Expand All @@ -125,6 +140,7 @@ dependencies {
implementation(libs.androidx.swiperefreshlayout)
implementation(libs.androidx.work)
implementation(libs.coil)
implementation(libs.coil.compose)
implementation(libs.coil.svg)
implementation(libs.hilt.android)
ksp(libs.hilt.compiler)
Expand All @@ -136,9 +152,7 @@ dependencies {

coreLibraryDesugaring(libs.android.desugar.jdk)

androidTestImplementation(libs.androidx.room.runtime)
androidTestImplementation(libs.junit)
androidTestImplementation(libs.bundles.androidx.test)
androidTestImplementation(libs.hilt.android.testing)
kspTest(libs.hilt.android.compiler)
implementation(libs.kotlinx.serialization.json)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.navigation.compose)
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion app/phone/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustPan">

<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Loading