mirror
/
amethyst
kopia lustrzana https://github.com/vitorpamplona/amethyst
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fixes profile images to square sizes

pull/3/head
Vitor Pamplona 2023-01-15 11:52:45 -05:00
rodzic 0539861008
commit 4026ae03e7
9 zmienionych plików z 16 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
Wyświetl plik

@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.navigation
import android.util.Log
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
@ -99,7 +100,7 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
contentDescription = "Profile Image",
modifier = Modifier
.width(34.dp)
.width(34.dp).height(34.dp)
.clip(shape = CircleShape),
)
}

3
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
Wyświetl plik

@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
@ -103,7 +104,7 @@ fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier) {
model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
contentDescription = "Profile Image",
modifier = Modifier
.width(100.dp)
.width(100.dp).height(100.dp)
.clip(shape = CircleShape)
.border(3.dp, MaterialTheme.colors.background, CircleShape)
.background(MaterialTheme.colors.background)

3
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt
Wyświetl plik

@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.note
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
@ -66,7 +67,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
model = userToComposeOn?.profilePicture(),
contentDescription = "Profile Image",
modifier = Modifier
.width(55.dp)
.width(55.dp).height(55.dp)
.clip(shape = CircleShape)
)

1
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
Wyświetl plik

@ -77,6 +77,7 @@ fun ChatroomMessageCompose(baseNote: Note, accountViewModel: AccountViewModel, n
verticalAlignment = Alignment.CenterVertically
) {
val eventContent = accountViewModel.decrypt(note)
if (eventContent != null)
RichTextViewer(
eventContent,

2
app/src/main/java/com/vitorpamplona/amethyst/ui/note/LikeSetCompose.kt
Wyświetl plik

@ -68,7 +68,7 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
model = userState?.user?.profilePicture(),
contentDescription = "Profile Image",
modifier = Modifier
.width(35.dp)
.width(35.dp).height(35.dp)
.height(35.dp)
.clip(shape = CircleShape)
)

5
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
Wyświetl plik

@ -7,6 +7,7 @@ import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
@ -74,7 +75,7 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
model = author?.profilePicture(),
contentDescription = "Profile Image",
modifier = Modifier
.width(55.dp)
.width(55.dp).height(55.dp)
.clip(shape = CircleShape)
)
@ -85,7 +86,7 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
model = boostedPosts[0].author?.profilePicture(),
contentDescription = "Profile Image",
modifier = Modifier
.width(35.dp)
.width(35.dp).height(35.dp)
.clip(shape = CircleShape)
.align(Alignment.BottomEnd)
.background(MaterialTheme.colors.background)

1
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
Wyświetl plik

@ -45,6 +45,7 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
Persona(Hex.decode(key))
}
)
}
fun login(person: Persona) {

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
Wyświetl plik

@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
@ -169,7 +170,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
model = author?.profilePicture(),
contentDescription = "Profile Image",
modifier = Modifier
.width(55.dp)
.width(55.dp).height(55.dp)
.clip(shape = CircleShape)
)

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
Wyświetl plik

@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
@ -111,7 +112,7 @@ fun ChatroomHeader(baseUser: User, accountViewModel: AccountViewModel, navContro
model = author?.profilePicture(),
contentDescription = "Profile Image",
modifier = Modifier
.width(35.dp)
.width(35.dp).height(35.dp)
.clip(shape = CircleShape)
)