From ed262dfb2de6fcb783ac584b3d7349480df7c879 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 9 Mar 2017 23:21:02 +0100 Subject: [PATCH] Fix crash when adding media, make all activities use coordinator layout --- .../com/keylesspalace/tusky/MastodonAPI.java | 2 +- app/src/main/res/layout/activity_account.xml | 1 + app/src/main/res/layout/activity_blocks.xml | 7 +++-- app/src/main/res/layout/activity_compose.xml | 6 ++-- .../main/res/layout/activity_favourites.xml | 7 +++-- app/src/main/res/layout/activity_login.xml | 4 +-- app/src/main/res/layout/activity_main.xml | 6 ++-- app/src/main/res/layout/activity_report.xml | 3 ++ app/src/main/res/layout/activity_splash.xml | 28 +++++++------------ app/src/main/res/layout/activity_view_tag.xml | 7 +++-- .../main/res/layout/activity_view_thread.xml | 7 +++-- .../main/res/layout/activity_view_video.xml | 4 +-- app/src/main/res/values/styles.xml | 4 +++ 13 files changed, 51 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java b/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java index 66019ad1..e6a78016 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java +++ b/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java @@ -55,7 +55,7 @@ public interface MastodonAPI { @Multipart @POST("api/v1/media") - Call uploadMedia(@Part("file") MultipartBody.Part file); + Call uploadMedia(@Part MultipartBody.Part file); @FormUrlEncoded @POST("api/v1/statuses") diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index 1b047bc0..32399cb1 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -12,6 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppTheme.Account.AppBarLayout" + app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark" android:id="@+id/account_app_bar_layout"> - @@ -32,4 +35,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml index dfb05a2c..a1bd33f8 100644 --- a/app/src/main/res/layout/activity_compose.xml +++ b/app/src/main/res/layout/activity_compose.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_favourites.xml b/app/src/main/res/layout/activity_favourites.xml index f64acdbf..0cad8874 100644 --- a/app/src/main/res/layout/activity_favourites.xml +++ b/app/src/main/res/layout/activity_favourites.xml @@ -1,6 +1,7 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4aab7117..6a3a901f 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 031b9ccf..004527b6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - @@ -70,4 +72,4 @@ android:layout_margin="16dp" android:layout_height="wrap_content" app:srcCompat="@drawable/ic_create_24dp"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml index 18e58158..9b884f32 100644 --- a/app/src/main/res/layout/activity_report.xml +++ b/app/src/main/res/layout/activity_report.xml @@ -1,5 +1,6 @@ @@ -9,6 +10,8 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:elevation="4dp" + android:theme="@style/AppTheme.Account.AppBarLayout" + app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark" android:background="?attr/toolbar_background_color" /> - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_tag.xml b/app/src/main/res/layout/activity_view_tag.xml index 93c3b732..808c0357 100644 --- a/app/src/main/res/layout/activity_view_tag.xml +++ b/app/src/main/res/layout/activity_view_tag.xml @@ -1,6 +1,7 @@ - @@ -32,4 +35,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_thread.xml b/app/src/main/res/layout/activity_view_thread.xml index a8cc6100..d808ea49 100644 --- a/app/src/main/res/layout/activity_view_thread.xml +++ b/app/src/main/res/layout/activity_view_thread.xml @@ -1,6 +1,7 @@ - @@ -32,4 +35,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml index d904f05e..77001cba 100644 --- a/app/src/main/res/layout/activity_view_video.xml +++ b/app/src/main/res/layout/activity_view_video.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8546465d..ac08ab61 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -78,6 +78,8 @@ @@ -138,6 +140,8 @@