Skip to content
Draft

1 0 dev #2153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
09b507c
Getting multi-pane home working.
dessalines Nov 20, 2024
fbecf47
Adding navigation bar scaffold.
dessalines Nov 20, 2024
78b4915
Fixing back button.
dessalines Nov 20, 2024
7492570
Merge remote-tracking branch 'origin/main' into post_listing_detail_t…
dessalines Nov 20, 2024
e6546cc
Updating to stable compose bom.
dessalines Nov 20, 2024
fe47f61
Merge remote-tracking branch 'origin/main' into post_listing_detail_t…
dessalines Feb 18, 2025
7c846c2
Fixing JDK crash.
dessalines Feb 18, 2025
17828a0
Addressing PR comments
dessalines Feb 19, 2025
9f2f300
Merge branch 'main' into post_listing_detail_tablet_merge_1
dessalines Jun 11, 2026
fd24493
Some mis-merges
dessalines Jun 11, 2026
22968dc
Fixing deps
dessalines Jun 17, 2026
e3dc542
Merge branch 'main' into 1_0_dev
dessalines Jun 21, 2026
6fb6bb7
Starting to work on 1.0
dessalines Jun 21, 2026
0e00edd
More updates
dessalines Jul 2, 2026
51ec5be
Halfway through PersonProfileViewModel
dessalines Jul 3, 2026
756304b
Fixing up profile, likes, registration app, and reports viewmodels
dessalines Jul 6, 2026
7202e1f
Extracting MyUserInfoViewModel from SiteViewModel
dessalines Jul 6, 2026
ba34532
Working through notificationviewmodel
dessalines Jul 6, 2026
ccae115
Cleaning up mutable lists by using replaceAll
dessalines Jul 7, 2026
1e3c457
Fixing some more notifications
dessalines Jul 7, 2026
b4882eb
Ban person screen
dessalines Jul 7, 2026
8125ace
Fixing registration app view model
dessalines Jul 7, 2026
520c9a0
Mostly done with votehelpers.
dessalines Jul 8, 2026
fb85b4d
Running fmt
dessalines Jul 8, 2026
39e91e8
Lots of updates
dessalines Jul 11, 2026
e9258c3
Merge branch 'main' into 1_0_dev
dessalines Jul 11, 2026
30431a4
Updating a lot for voteinfo, and the postlistings.
dessalines Jul 14, 2026
d59a9e3
A few more
dessalines Jul 15, 2026
34f4e3b
Community list screen done
dessalines Jul 15, 2026
66beaa7
Blocks screen
dessalines Jul 15, 2026
1e6bcc1
Starting to work on heavier refactor.
dessalines Jul 16, 2026
fe18861
Starting to work on comment-node refactor
dessalines Jul 17, 2026
34d8256
More refactoring
dessalines Jul 20, 2026
8c381b2
Add Lemmy Api changes (#2192)
MV-GH Sep 8, 2026
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
15 changes: 12 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ dependencies {
implementation("androidx.appcompat:appcompat:1.7.1")
testImplementation("androidx.arch.core:core-testing:2.2.0")

// Adaptive layouts
implementation("androidx.compose.material3.adaptive:adaptive:1.2.0")
implementation("androidx.compose.material3.adaptive:adaptive-layout:1.2.0")
implementation("androidx.compose.material3.adaptive:adaptive-navigation:1.2.0")
implementation("androidx.compose.material3:material3-adaptive-navigation-suite")

implementation("me.zhanghai.compose.preference:library:1.1.1")

// Freedroidwarn
Expand Down Expand Up @@ -215,9 +221,12 @@ dependencies {
implementation("androidx.profileinstaller:profileinstaller:1.4.1")
baselineProfile(project(":benchmarks"))

implementation("it.vercruysse.lemmyapi:lemmy-api:0.4.1")
implementation("it.vercruysse.lemmyapi:lemmy-api:0.6.0-beta.7")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")

// For custom logging plugin
implementation("io.ktor:ktor-client-logging:3.5.1")
val ktor = "3.5.2"
implementation("io.ktor:ktor-client-core:$ktor")
implementation("io.ktor:ktor-client-okhttp:$ktor")
implementation("io.ktor:ktor-client-logging:$ktor")

}
6 changes: 4 additions & 2 deletions app/src/main/java/com/jerboa/JerboaAppState.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
import com.jerboa.datatypes.BanData
import com.jerboa.datatypes.BanFromCommunityData
import com.jerboa.model.ReplyItem
import com.jerboa.state.VideoAppState
Expand All @@ -34,6 +35,7 @@ import it.vercruysse.lemmyapi.datatypes.CommunityId
import it.vercruysse.lemmyapi.datatypes.GetCommunityResponse
import it.vercruysse.lemmyapi.datatypes.Person
import it.vercruysse.lemmyapi.datatypes.PersonId
import it.vercruysse.lemmyapi.datatypes.PersonView
import it.vercruysse.lemmyapi.datatypes.Post
import it.vercruysse.lemmyapi.datatypes.PostId
import it.vercruysse.lemmyapi.datatypes.PostView
Expand Down Expand Up @@ -95,8 +97,8 @@ class JerboaAppState(
navController.navigate(Route.COMMENT_REMOVE)
}

fun toBanPerson(person: Person) {
sendReturnForwards(BanPersonReturn.PERSON_SEND, person)
fun toBanPerson(banData: BanData) {
sendReturnForwards(BanPersonReturn.BAN_DATA_SEND, banData)
navController.navigate(Route.BAN_PERSON)
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/jerboa/JerboaApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class JerboaApplication :
imageLoader =
ImageLoader
.Builder(this)
.okHttpClient(API.httpClient)
.okHttpClient(API.okHttpClient)
.crossfade(true)
.error(R.drawable.error_placeholder)
.placeholder(R.drawable.ic_launcher_mono)
Expand Down
1,364 changes: 683 additions & 681 deletions app/src/main/java/com/jerboa/MainActivity.kt

Large diffs are not rendered by default.

Loading