diff --git a/app/src/main/java/app/fedilab/android/activities/MediaActivity.java b/app/src/main/java/app/fedilab/android/activities/MediaActivity.java index e7cb41b7..49ef8338 100644 --- a/app/src/main/java/app/fedilab/android/activities/MediaActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/MediaActivity.java @@ -1,3 +1,4 @@ +package app.fedilab.android.activities; /* Copyright 2022 Thomas Schneider * * This file is a part of Fedilab @@ -12,8 +13,6 @@ * * You should have received a copy of the GNU General Public License along with Fedilab; if not, * see . */ -package app.fedilab.android.activities; - import android.Manifest; import android.app.DownloadManager; @@ -144,18 +143,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { handler = new Handler(); if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) { binding.mediaDescription.setText(description); - binding.mediaDescription.setVisibility(View.VISIBLE); - handler.postDelayed(() -> { - if (binding != null && !binding.mediaDescription.hasSelection()) { - binding.mediaDescription.setVisibility(View.GONE); - } - }, med_desc_timeout); - - } else { - if (!binding.mediaDescription.hasSelection()) { - binding.mediaDescription.setVisibility(View.GONE); - } } binding.mediaViewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { public void onPageScrollStateChanged(int state) { @@ -172,18 +160,6 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { handler = new Handler(); if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) { binding.mediaDescription.setText(description); - binding.mediaDescription.setVisibility(View.VISIBLE); - - handler.postDelayed(() -> { - if (binding != null && !binding.mediaDescription.hasSelection()) { - binding.mediaDescription.setVisibility(View.GONE); - } - }, med_desc_timeout); - - } else { - if (!binding.mediaDescription.hasSelection()) { - binding.mediaDescription.setVisibility(View.GONE); - } } } }); @@ -302,18 +278,6 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { handler = new Handler(); if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) { binding.mediaDescription.setText(description); - binding.mediaDescription.setVisibility(View.VISIBLE); - - handler.postDelayed(() -> { - if (binding != null && !binding.mediaDescription.hasSelection()) { - binding.mediaDescription.setVisibility(View.GONE); - } - }, med_desc_timeout); - - } else { - if (!binding.mediaDescription.hasSelection()) { - binding.mediaDescription.setVisibility(View.GONE); - } } } } @@ -371,8 +335,9 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { this.fullscreen = fullscreen; if (!fullscreen) { showSystemUI(); - + binding.mediaDescription.setVisibility(View.VISIBLE); } else { + binding.mediaDescription.setVisibility(View.GONE); hideSystemUI(); } } @@ -395,11 +360,12 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { } // Shows the system bars by removing all the flags -// except for the ones that make the content appear under the system bars. + // except for the ones that make the content appear under the system bars. private void showSystemUI() { View decorView = getWindow().getDecorView(); decorView.setSystemUiVisibility( View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); } diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/media/FragmentMedia.java b/app/src/main/java/app/fedilab/android/ui/fragment/media/FragmentMedia.java index af7f8fa4..3ef9f557 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/media/FragmentMedia.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/media/FragmentMedia.java @@ -33,7 +33,6 @@ import androidx.core.app.ActivityCompat; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceManager; -import com.arges.sepan.argmusicplayer.Models.ArgAudio; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; @@ -68,7 +67,7 @@ public class FragmentMedia extends Fragment { private boolean swipeEnabled; private CustomWebview webview_video; private FragmentSlideMediaBinding binding; - private ArgAudio audio; + public FragmentMedia() { } diff --git a/app/src/main/res/layout/activity_media_pager.xml b/app/src/main/res/layout/activity_media_pager.xml index 9f0a39fe..c8467264 100644 --- a/app/src/main/res/layout/activity_media_pager.xml +++ b/app/src/main/res/layout/activity_media_pager.xml @@ -16,24 +16,22 @@ --> - + android:animateLayoutChanges="true" + android:background="@android:color/transparent"> - - - - diff --git a/app/src/main/res/layout/fragment_slide_media.xml b/app/src/main/res/layout/fragment_slide_media.xml index a7f1263d..5ac3674f 100644 --- a/app/src/main/res/layout/fragment_slide_media.xml +++ b/app/src/main/res/layout/fragment_slide_media.xml @@ -6,16 +6,21 @@ android:layout_height="match_parent" android:background="@android:color/transparent"> - - + android:fillViewport="true"> + + + @@ -130,5 +135,6 @@ android:textColor="@color/dark_text" android:textSize="14sp" android:visibility="gone" /> - + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 09645154..bc5fe8be 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,6 +10,7 @@ #FFEA00 #42A5F5 + #333 #f3f3f3 #606984 #ca8f04 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 76318e74..59563b9d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -138,6 +138,14 @@ @color/cyanea_accent_dark_reference +