Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

some changes

This commit is contained in:
Thomas 2020-06-23 16:30:22 +02:00
parent e63bc4711d
commit f097ac0854
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
View File

@ -24,6 +24,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Color;
import android.graphics.Point; import android.graphics.Point;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.net.Uri; import android.net.Uri;
@ -35,12 +36,12 @@ import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@ -128,8 +129,10 @@ public class SlideMediaActivity extends BaseFragmentActivity implements OnDownlo
ActivityCompat.postponeEnterTransition(SlideMediaActivity.this); ActivityCompat.postponeEnterTransition(SlideMediaActivity.this);
} }
getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
setContentView(R.layout.activity_media_pager); setContentView(R.layout.activity_media_pager);
fullscreen = false; fullscreen = false;
media_description = findViewById(R.id.media_description); media_description = findViewById(R.id.media_description);
final int med_desc_timeout = sharedpreferences.getInt(Helper.SET_MED_DESC_TIMEOUT, 3) * 1000; final int med_desc_timeout = sharedpreferences.getInt(Helper.SET_MED_DESC_TIMEOUT, 3) * 1000;
@ -141,11 +144,13 @@ public class SlideMediaActivity extends BaseFragmentActivity implements OnDownlo
ActionBar actionBar = getSupportActionBar(); ActionBar actionBar = getSupportActionBar();
if (actionBar != null) { if (actionBar != null) {
actionBar.setBackgroundDrawable(new ColorDrawable(bgColor));
actionBar.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
actionBar.setElevation(0);
LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
assert inflater != null; assert inflater != null;
View view = inflater.inflate(R.layout.media_action_bar, new LinearLayout(SlideMediaActivity.this), false); View view = inflater.inflate(R.layout.media_action_bar, new LinearLayout(SlideMediaActivity.this), false);
view.setBackgroundColor(bgColor);
actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close); ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);

2
app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
View File

@ -543,8 +543,6 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
public void onSlideChange(float percent) { public void onSlideChange(float percent) {
if( percent < 0.80 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if( percent < 0.80 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
ActivityCompat.finishAfterTransition((AppCompatActivity) context); ActivityCompat.finishAfterTransition((AppCompatActivity) context);
}else{
((SlideMediaActivity) context).setFullscreen(true);
} }
} }

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

@ -180,6 +180,9 @@
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item> <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item> <item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item> <item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
<item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
</style> </style>
<style name="TransparentDark" parent="Theme.Cyanea.Dark"> <style name="TransparentDark" parent="Theme.Cyanea.Dark">
@ -193,6 +196,9 @@
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item> <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item> <item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item> <item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
<item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
</style> </style>
<style name="TransparentBlack" parent="Theme.Cyanea.Dark"> <style name="TransparentBlack" parent="Theme.Cyanea.Dark">
@ -207,6 +213,9 @@
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item> <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item> <item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item> <item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
<item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
</style> </style>
<style name="Fedilab.PopupMenu.Light" parent="Cyanea.PopupMenu.Light"> <style name="Fedilab.PopupMenu.Light" parent="Cyanea.PopupMenu.Light">