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

change icon

This commit is contained in:
tom79 2019-06-26 19:09:26 +02:00
parent b3adf0591b
commit 5bb50617e1
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/app/fedilab/android/activities/MediaActivity.java
View File

@ -30,7 +30,6 @@ import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.os.Handler;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
@ -39,19 +38,15 @@ import android.webkit.WebView;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.MediaController;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.VideoView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
import com.cleveroad.audiovisualization.DbmHandler;
import com.cleveroad.audiovisualization.GLAudioVisualizationView;
import com.cleveroad.audiovisualization.SpeechRecognizerDbmHandler;
import com.cleveroad.audiovisualization.VisualizerDbmHandler;
import com.github.chrisbanes.photoview.OnMatrixChangedListener;
import com.github.chrisbanes.photoview.PhotoView;
import com.google.android.exoplayer2.ExoPlayerFactory;
@ -65,7 +60,6 @@ import com.google.android.exoplayer2.util.Util;
import com.gw.swipeback.SwipeBackLayout;
import java.io.File;
import java.io.IOException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@ -83,8 +77,6 @@ import app.fedilab.android.webview.MastalabWebChromeClient;
import app.fedilab.android.webview.MastalabWebViewClient;
import app.fedilab.android.R;
import app.fedilab.android.interfaces.OnDownloadInterface;
import cafe.adriel.androidaudiorecorder.AndroidAudioRecorder;
import cafe.adriel.androidaudiorecorder.AudioRecorderActivity;
import cafe.adriel.androidaudiorecorder.VisualizerHandler;
import omrecorder.AudioChunk;
import omrecorder.PullTransport;
@ -591,7 +583,6 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface,
playeraudio.prepare();
playeraudio.start();
visualizerView.linkTo(DbmHandler.Factory.newVisualizerHandler(this, playeraudio));
visualizerView.post(new Runnable() {
@Override
@ -712,6 +703,17 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface,
if( playeraudio != null) {
playeraudio.pause();
}
try {
visualizerView.onPause();
} catch (Exception ignored){ }
}
@Override
protected void onDestroy() {
try {
visualizerView.release();
} catch (Exception ignored){ }
super.onDestroy();
}
@Override
@ -723,7 +725,9 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface,
if( playeraudio != null) {
playeraudio.start();
}
try {
visualizerView.onResume();
} catch (Exception e){ }
}
@Override

12
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -884,7 +884,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.dark_text);
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot, R.color.black_text_toot_header);
Helper.changeDrawableColor(context, R.drawable.ic_soundcloud, R.color.black_text_toot_header);
Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.dark_icon);
holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
@ -908,7 +907,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_reply_count.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.action_dark));
Helper.changeDrawableColor(context, R.drawable.ic_soundcloud, R.color.action_dark);
Helper.changeDrawableColor(context, R.drawable.ic_audio_wave, R.color.action_dark);
Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot, R.color.dark_text_toot_header);
Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4);
@ -935,7 +934,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
Helper.changeDrawableColor(context, R.drawable.ic_repeat, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_plus_one, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, R.color.action_light);
Helper.changeDrawableColor(context, R.drawable.ic_soundcloud, R.color.action_light);
holder.status_reply_count.setTextColor(ContextCompat.getColor(context, R.color.action_light));
holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.action_light));
holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.action_light));
@ -2971,7 +2969,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if( !blur) {
Glide.with(imageView.getContext())
.asBitmap()
.load( !attachment.getType().toLowerCase().equals("audio")?url:R.drawable.ic_soundcloud)
.load( !attachment.getType().toLowerCase().equals("audio")?url:R.drawable.ic_audio_wave)
.thumbnail(0.1f)
.apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10)))
.into(new SimpleTarget<Bitmap>() {
@ -2994,7 +2992,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}else{
Glide.with(imageView.getContext())
.asBitmap()
.load(!attachment.getType().toLowerCase().equals("audio")?url:R.drawable.ic_soundcloud)
.load(!attachment.getType().toLowerCase().equals("audio")?url:R.drawable.ic_audio_wave)
.thumbnail(0.1f)
.apply(new RequestOptions().transforms(new BlurTransformation(50,3), new RoundedCorners(10)))
.into(new SimpleTarget<Bitmap>() {
@ -3019,14 +3017,14 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) {
if( !blur) {
Glide.with(imageView.getContext())
.load(!attachment.getType().toLowerCase().equals("audio")?url:R.drawable.ic_soundcloud)
.load(!attachment.getType().toLowerCase().equals("audio")?url:R.drawable.ic_audio_wave)
.thumbnail(0.1f)
.apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10)))
.transition(DrawableTransitionOptions.withCrossFade())
.into(imageView);
}else{
Glide.with(imageView.getContext())
.load(!attachment.getType().toLowerCase().equals("audio")?url:R.drawable.ic_soundcloud)
.load(!attachment.getType().toLowerCase().equals("audio")?url:R.drawable.ic_audio_wave)
.thumbnail(0.1f)
.apply(new RequestOptions().transforms(new BlurTransformation(50,3), new RoundedCorners(10)))
.transition(DrawableTransitionOptions.withCrossFade())

4
app/src/main/res/drawable/ic_soundcloud.xml
View File

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="90"
android:viewportWidth="90" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M0,54c0,3 1.4,5.8 3.6,7.6V46.4C1.4,48.3 0,51 0,54M7.3,44.4v19.2c0.9,0.2 1.8,0.4 2.8,0.4h1V44.1c-0.3,0 -0.6,0 -1,0C9.2,44 8.2,44.2 7.3,44.4M15.7,45.7c-0.3,-0.2 -0.5,-0.3 -0.8,-0.5V64h3.8V38.9C17.2,40.8 16.1,43.2 15.7,45.7M22.4,35.3V64h3.8V33.5C24.9,33.9 23.6,34.6 22.4,35.3M30,32.7V64h3.8V32.8c-0.8,-0.1 -1.6,-0.2 -2.4,-0.2C30.9,32.7 30.4,32.7 30,32.7M39.6,34.9c-1.2,-0.7 -2.6,-1.3 -4,-1.7V64h5.7V32.6C40.7,33.4 40.1,34.1 39.6,34.9M43.2,30.8V64H79v0c7.5,-0.5 11,-5.2 11,-10.9c0,-6 -4.6,-10.9 -10.7,-10.9c-1.6,0 -2.9,0.3 -4.2,0.9c-1,-9.6 -9.1,-17.1 -19.1,-17.1C51,26 46.6,27.8 43.2,30.8"/>
</vector>