diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/app/fedilab/android/helper/MediaHelper.java | 11 | ||||
| -rw-r--r-- | app/src/main/res/drawable/ic_baseline_android_24.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_status.xml | 40 |
3 files changed, 41 insertions, 20 deletions
diff --git a/app/src/main/java/app/fedilab/android/helper/MediaHelper.java b/app/src/main/java/app/fedilab/android/helper/MediaHelper.java index b6f65f7c7..1a60e74af 100644 --- a/app/src/main/java/app/fedilab/android/helper/MediaHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/MediaHelper.java @@ -100,7 +100,10 @@ public class MediaHelper { } try { String mime = getMimeType(url); - final String fileName = URLUtil.guessFileName(url, null, null); + String fileName = URLUtil.guessFileName(url, null, null); + if (fileName.endsWith(".bin")) { + fileName = fileName.replace(".bin", ".mp4"); + } request.allowScanningByMediaScanner(); if (mime.toLowerCase().startsWith("video")) { request.setDestinationInExternalPublicDir(Environment.DIRECTORY_MOVIES, context.getString(R.string.app_name) + "/" + fileName); @@ -134,9 +137,11 @@ public class MediaHelper { .into(new CustomTarget<File>() { @Override public void onResourceReady(@NotNull File file, Transition<? super File> transition) { - final String fileName = URLUtil.guessFileName(url, null, null); - + String fileName = URLUtil.guessFileName(url, null, null); + if (fileName.endsWith(".bin")) { + fileName = fileName.replace(".bin", ".jpg"); + } File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES); File targeted_folder = new File(path, context.getString(R.string.app_name)); if (!targeted_folder.exists()) { diff --git a/app/src/main/res/drawable/ic_baseline_android_24.xml b/app/src/main/res/drawable/ic_baseline_android_24.xml new file mode 100644 index 000000000..b812e1ed0 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_android_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M17.6,9.48l1.84,-3.18c0.16,-0.31 0.04,-0.69 -0.26,-0.85c-0.29,-0.15 -0.65,-0.06 -0.83,0.22l-1.88,3.24c-2.86,-1.21 -6.08,-1.21 -8.94,0L5.65,5.67c-0.19,-0.29 -0.58,-0.38 -0.87,-0.2C4.5,5.65 4.41,6.01 4.56,6.3L6.4,9.48C3.3,11.25 1.28,14.44 1,18h22C22.72,14.44 20.7,11.25 17.6,9.48zM7,15.25c-0.69,0 -1.25,-0.56 -1.25,-1.25c0,-0.69 0.56,-1.25 1.25,-1.25S8.25,13.31 8.25,14C8.25,14.69 7.69,15.25 7,15.25zM17,15.25c-0.69,0 -1.25,-0.56 -1.25,-1.25c0,-0.69 0.56,-1.25 1.25,-1.25s1.25,0.56 1.25,1.25C18.25,14.69 17.69,15.25 17,15.25z" /> +</vector> diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index d28cfe2bb..443a3e57d 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -119,23 +119,6 @@ app:layout_constraintTop_toTopOf="parent" tools:src="@tools:sample/avatars" /> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/reply_icon" - android:layout_width="16dp" - android:layout_height="16dp" - android:src="@drawable/ic_baseline_reply_16" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/bot_icon" - android:layout_width="16dp" - android:layout_height="16dp" - android:src="@drawable/ic_baseline_reply_16" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> @@ -147,8 +130,31 @@ <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_gravity="center_vertical" android:orientation="horizontal"> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/reply_icon" + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginStart="6dp" + android:src="@drawable/ic_baseline_reply_16" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + tools:visibility="visible" /> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/bot_icon" + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginStart="6dp" + android:src="@drawable/ic_baseline_android_24" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + tools:visibility="visible" /> + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/display_name" android:layout_width="0dp" |