Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix list editing by moving account_ids from query to form param (#1690) 

* fix list editing by moving account_ids from query to form param

* fix DialogFramentStyle
This commit is contained in:
Konrad Pozniak 2020-02-18 08:45:10 +01:00 committed by GitHub
parent e4b8134977
commit 3f3166522b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
View File

@ -428,16 +428,19 @@ interface MastodonApi {
@Query("limit") limit: Int @Query("limit") limit: Int
): Single<List<Account>> ): Single<List<Account>>
@DELETE("api/v1/lists/{listId}/accounts") @FormUrlEncoded
// @DELETE doesn't support fields
@HTTP(method = "DELETE", path = "api/v1/lists/{listId}/accounts", hasBody = true)
fun deleteAccountFromList( fun deleteAccountFromList(
@Path("listId") listId: String, @Path("listId") listId: String,
@Query("account_ids[]") accountIds: List<String> @Field("account_ids[]") accountIds: List<String>
): Completable ): Completable
@FormUrlEncoded
@POST("api/v1/lists/{listId}/accounts") @POST("api/v1/lists/{listId}/accounts")
fun addCountToList( fun addCountToList(
@Path("listId") listId: String, @Path("listId") listId: String,
@Query("account_ids[]") accountIds: List<String> @Field("account_ids[]") accountIds: List<String>
): Completable ): Completable
@GET("/api/v1/conversations") @GET("/api/v1/conversations")

4
app/src/main/res/layout/fragment_accounts_in_list.xml
View File

@ -29,7 +29,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchView" /> app:layout_constraintTop_toBottomOf="@id/searchView" />
<com.keylesspalace.tusky.view.BackgroundMessageView <com.keylesspalace.tusky.view.BackgroundMessageView
android:id="@+id/messageView" android:id="@+id/messageView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -43,16 +42,15 @@
tools:src="@drawable/elephant_error" tools:src="@drawable/elephant_error"
tools:visibility="visible" /> tools:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/accountsSearchRecycler" android:id="@+id/accountsSearchRecycler"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="?android:attr/windowBackground"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchView" /> app:layout_constraintTop_toBottomOf="@id/searchView" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/styles.xml
View File

@ -97,7 +97,7 @@
<style name="TuskyDialogFragmentStyle" parent="@style/ThemeOverlay.MaterialComponents.Dialog"> <style name="TuskyDialogFragmentStyle" parent="@style/ThemeOverlay.MaterialComponents.Dialog">
<item name="dialogCornerRadius">8dp</item> <item name="dialogCornerRadius">8dp</item>
<item name="android:backgroundTint">?attr/windowBackgroundColor</item> <item name="android:backgroundTint">@color/colorBackground</item>
</style> </style>
<style name="TuskyTabAppearance" parent="Widget.MaterialComponents.TabLayout"> <style name="TuskyTabAppearance" parent="Widget.MaterialComponents.TabLayout">