From bdd4fba4bdf7654329f4657aaa3fe232074a2e66 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 9 Nov 2019 18:47:33 +0100 Subject: [PATCH] Some other improvements --- .../android/drawers/StatusListAdapter.java | 1 - app/src/main/res/drawable-anydpi/ic_add.xml | 2 +- .../main/res/drawable-ldpi/video_preview.png | Bin 256 -> 0 bytes .../main/res/drawable-mdpi/video_preview.png | Bin 388 -> 0 bytes .../main/res/layout/activity_show_account.xml | 4 +-- .../res/layout/conversation_action_bar.xml | 8 ++--- app/src/main/res/layout/drawer_status.xml | 31 ++++++++++-------- .../main/res/layout/drawer_status_compact.xml | 6 ++-- .../main/res/layout/drawer_status_console.xml | 4 +-- .../main/res/layout/drawer_status_focused.xml | 4 +-- app/src/main/res/layout/nav_header_main.xml | 6 ++-- app/src/main/res/layout/simple_action_bar.xml | 2 +- app/src/main/res/layout/simple_bar.xml | 2 +- app/src/main/res/layout/simple_bar_add.xml | 2 +- app/src/main/res/layout/toot_action_bar.xml | 2 +- app/src/main/res/layout/update_account.xml | 3 +- app/src/main/res/menu/tag_pin.xml | 4 +-- app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/values/styles.xml | 7 ++++ 19 files changed, 52 insertions(+), 38 deletions(-) delete mode 100644 app/src/main/res/drawable-ldpi/video_preview.png delete mode 100644 app/src/main/res/drawable-mdpi/video_preview.png diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 9af168c33..dcd150a91 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -1351,7 +1351,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_privacy.setVisibility(View.VISIBLE); - Helper.changeDrawableColor(context, R.drawable.video_preview, R.color.white); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int iconColor = prefs.getInt("theme_icons_color", -1); diff --git a/app/src/main/res/drawable-anydpi/ic_add.xml b/app/src/main/res/drawable-anydpi/ic_add.xml index a55694af3..c4be63a59 100644 --- a/app/src/main/res/drawable-anydpi/ic_add.xml +++ b/app/src/main/res/drawable-anydpi/ic_add.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable-ldpi/video_preview.png b/app/src/main/res/drawable-ldpi/video_preview.png deleted file mode 100644 index 6e6bd85f1efa03836e5b5c6c681d95e715de0f87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmV+b0ssDqP) zK?=e!5X{lD1n~)Zf*#Tr_&UGQ{=x@%i9ufwBGPjqHgU$LB@_{=14~$TCOgTl5Cu|7 zI>uPz^l5-+9zv+Z97?IJG3E$@Lv)Bf4(N04SSN21S!*e1<9D^|1XrzjOSO``lkD|Fp? z@6V%<{NFk)eG{S)9NgmHTQVo|{@aLR_bSd|wtLNFDdPoPbOuI@MGBe#0000BA!}RmZk4`-aSe`;QI^wQvs^lwtb}5(uo!b>;tlPU009e zcvBR`5r6t2sy(&g)gaK64g&~PtqsG_$W7B+<$1mX>`8_ZV=)M0UO}@R;!4nLYmVdS zcy0haBBpNboY+wm9gy?7MC`fozbzR*81}VZ$h+%Z5pikte_UF9ZjG>+HNuo@WMZ+| iGzodJiI_cVa$-MMW)3WbLy6M>0000 @@ -537,7 +537,7 @@ android:layout_height="30dp" android:layout_gravity="center" android:src="@drawable/ic_more_vert" - android:tint="?attr/iconColor" + android:tint="?attr/iconColorMenu" android:layout_marginEnd="10dp" android:gravity="center" android:contentDescription="@string/display_toot_truncate" /> diff --git a/app/src/main/res/layout/conversation_action_bar.xml b/app/src/main/res/layout/conversation_action_bar.xml index cf13333d4..80a5083bc 100644 --- a/app/src/main/res/layout/conversation_action_bar.xml +++ b/app/src/main/res/layout/conversation_action_bar.xml @@ -35,7 +35,7 @@ + app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info" + android:contentDescription="@string/bot" /> @@ -479,7 +479,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="5dp" - android:layout_marginLeft="5dp" android:layout_weight="1" android:gravity="center_vertical" android:orientation="vertical" @@ -530,14 +529,15 @@ android:id="@+id/webview_preview_card" android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="centerCrop" /> + android:scaleType="centerCrop" + android:contentDescription="@string/card_view_image" /> @@ -583,7 +583,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" - android:scaleType="fitCenter" /> + android:scaleType="fitCenter" + android:contentDescription="@string/image_preview" /> + android:scaleType="fitCenter" + android:contentDescription="@string/image_preview" /> diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml index e0fa49ffd..69bc8643a 100644 --- a/app/src/main/res/layout/drawer_status_compact.xml +++ b/app/src/main/res/layout/drawer_status_compact.xml @@ -262,7 +262,7 @@ android:layout_height="20dp" android:contentDescription="@string/cached_status" android:src="@drawable/ic_cached_black" - android:tint="?attr/iconColor" + android:tint="?attr/iconColorMenu" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -494,7 +494,7 @@ android:layout_height="30dp" android:layout_centerInParent="true" android:contentDescription="@string/play_video" - android:src="@drawable/video_preview" + android:src="@drawable/ic_play_arrow" android:tint="@color/white"/> @@ -965,7 +965,7 @@ android:layout_marginTop="5dp" android:contentDescription="@string/delete" android:src="@drawable/ic_clear_toot" - android:tint="?attr/iconColor" + android:tint="?attr/iconColorMenu" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/new_element" diff --git a/app/src/main/res/layout/drawer_status_console.xml b/app/src/main/res/layout/drawer_status_console.xml index 48387d340..ac1d988c6 100644 --- a/app/src/main/res/layout/drawer_status_console.xml +++ b/app/src/main/res/layout/drawer_status_console.xml @@ -192,7 +192,7 @@ diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml index 0abae2e93..c0f48e0f6 100644 --- a/app/src/main/res/layout/drawer_status_focused.xml +++ b/app/src/main/res/layout/drawer_status_focused.xml @@ -189,7 +189,7 @@ android:layout_height="20dp" android:contentDescription="@string/cached_status" android:src="@drawable/ic_cached_black" - android:tint="?attr/iconColor" + android:tint="?attr/iconColorMenu" android:visibility="gone" /> diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 819a83fdd..715c3d3ae 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -72,7 +72,7 @@ @@ -116,7 +116,7 @@ - \ No newline at end of file diff --git a/app/src/main/res/menu/tag_pin.xml b/app/src/main/res/menu/tag_pin.xml index 986febd8f..b3c7a4317 100644 --- a/app/src/main/res/menu/tag_pin.xml +++ b/app/src/main/res/menu/tag_pin.xml @@ -1,8 +1,8 @@ + app:itemTextColor="?attr/iconColorMenu" + app:itemIconTint="?attr/iconColorMenu"> Logo of the instance Edite profile Make an action + Translation + Image preview \ 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 6b4ffabae..c3c9fcadc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -2,6 +2,7 @@ + @@ -11,6 +12,7 @@