Skip to content

Commit b58df5c

Browse files
committed
Continue to update something to make this project still can run.
1 parent 5bf5821 commit b58df5c

File tree

4 files changed

+31
-51
lines changed

4 files changed

+31
-51
lines changed

app/build.gradle

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 31
5+
compileSdkVersion 34
66
defaultConfig {
77
applicationId "com.iknow.android"
8-
minSdkVersion 16
9-
targetSdkVersion 31
8+
namespace "com.iknow.android"
9+
minSdkVersion 21
10+
targetSdkVersion 33
1011
versionCode 1
1112
versionName "1.0"
1213
}
@@ -15,6 +16,10 @@ android {
1516
enabled = true
1617
}
1718

19+
buildFeatures {
20+
buildConfig = true
21+
}
22+
1823
buildTypes {
1924
release {
2025
minifyEnabled false
@@ -30,15 +35,15 @@ android {
3035

3136
dependencies {
3237
implementation fileTree(dir: 'libs', include: ['*.jar'])
33-
implementation 'androidx.appcompat:appcompat:1.1.0'
34-
implementation 'androidx.recyclerview:recyclerview:1.1.0'
38+
implementation 'androidx.appcompat:appcompat:1.7.0'
39+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
3540
implementation 'com.github.iknow4:android-utils-sdk:1.1.2'
3641
implementation 'nl.bravobit:android-ffmpeg:1.1.7'
3742
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
3843
implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
3944
implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
40-
implementation 'com.github.bumptech.glide:glide:3.7.0'
41-
implementation "androidx.core:core-ktx:1.7.0"
45+
implementation 'com.github.bumptech.glide:glide:4.15.0'
46+
implementation "androidx.core:core-ktx:1.13.1"
4247
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4348
}
4449

app/src/main/java/com/iknow/android/widget/VideoTrimmerView.java

Lines changed: 18 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.animation.ValueAnimator;
44
import android.content.Context;
5-
import android.graphics.Bitmap;
65
import android.media.MediaPlayer;
76
import android.net.Uri;
87
import android.os.Handler;
@@ -27,7 +26,6 @@
2726
import com.iknow.android.interfaces.VideoTrimListener;
2827
import com.iknow.android.features.trim.VideoTrimmerUtil;
2928
import com.iknow.android.utils.StorageUtil;
30-
import iknow.android.utils.callback.SingleCallback;
3129
import iknow.android.utils.thread.BackgroundExecutor;
3230
import iknow.android.utils.thread.UiThreadExecutor;
3331

@@ -139,15 +137,13 @@ public void initVideoByURI(final Uri videoURI) {
139137

140138
private void startShootVideoThumbs(final Context context, final Uri videoUri, int totalThumbsCount, long startPosition, long endPosition) {
141139
VideoTrimmerUtil.shootVideoThumbInBackground(context, videoUri, totalThumbsCount, startPosition, endPosition,
142-
new SingleCallback<Bitmap, Integer>() {
143-
@Override public void onSingleCallback(final Bitmap bitmap, final Integer interval) {
144-
if (bitmap != null) {
145-
UiThreadExecutor.runTask("", new Runnable() {
146-
@Override public void run() {
147-
mVideoThumbAdapter.addBitmaps(bitmap);
148-
}
149-
}, 0L);
150-
}
140+
(bitmap, interval) -> {
141+
if (bitmap != null) {
142+
UiThreadExecutor.runTask("", new Runnable() {
143+
@Override public void run() {
144+
mVideoThumbAdapter.addBitmaps(bitmap);
145+
}
146+
}, 0L);
151147
}
152148
});
153149
}
@@ -161,7 +157,6 @@ private void videoPrepared(MediaPlayer mp) {
161157
int videoWidth = mp.getVideoWidth();
162158
int videoHeight = mp.getVideoHeight();
163159

164-
float videoProportion = (float) videoWidth / (float) videoHeight;
165160
int screenWidth = mLinearVideo.getWidth();
166161
int screenHeight = mLinearVideo.getHeight();
167162

@@ -221,33 +216,15 @@ public void setOnTrimVideoListener(VideoTrimListener onTrimVideoListener) {
221216
}
222217

223218
private void setUpListeners() {
224-
findViewById(R.id.cancelBtn).setOnClickListener(new OnClickListener() {
225-
@Override public void onClick(View view) {
226-
onCancelClicked();
227-
}
228-
});
219+
findViewById(R.id.cancelBtn).setOnClickListener(view -> onCancelClicked());
229220

230-
findViewById(R.id.finishBtn).setOnClickListener(new OnClickListener() {
231-
@Override public void onClick(View view) {
232-
onSaveClicked();
233-
}
234-
});
235-
mVideoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
236-
@Override public void onPrepared(MediaPlayer mp) {
237-
mp.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
238-
videoPrepared(mp);
239-
}
240-
});
241-
mVideoView.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
242-
@Override public void onCompletion(MediaPlayer mp) {
243-
videoCompleted();
244-
}
245-
});
246-
mPlayView.setOnClickListener(new OnClickListener() {
247-
@Override public void onClick(View v) {
248-
playVideoOrPause();
249-
}
221+
findViewById(R.id.finishBtn).setOnClickListener(view -> onSaveClicked());
222+
mVideoView.setOnPreparedListener(mp -> {
223+
mp.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
224+
videoPrepared(mp);
250225
});
226+
mVideoView.setOnCompletionListener(mp -> videoCompleted());
227+
mPlayView.setOnClickListener(v -> playVideoOrPause());
251228
}
252229

253230
private void onSaveClicked() {
@@ -382,12 +359,10 @@ private void playingAnimation() {
382359
int end = (int) (RECYCLER_VIEW_PADDING + (mRightProgressPos - scrollPos) * averagePxMs);
383360
mRedProgressAnimator = ValueAnimator.ofInt(start, end).setDuration((mRightProgressPos - scrollPos) - (mRedProgressBarPos - scrollPos));
384361
mRedProgressAnimator.setInterpolator(new LinearInterpolator());
385-
mRedProgressAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
386-
@Override public void onAnimationUpdate(ValueAnimator animation) {
387-
params.leftMargin = (int) animation.getAnimatedValue();
388-
mRedProgressIcon.setLayoutParams(params);
389-
Log.d(TAG, "----onAnimationUpdate--->>>>>>>" + mRedProgressBarPos);
390-
}
362+
mRedProgressAnimator.addUpdateListener(animation -> {
363+
params.leftMargin = (int) animation.getAnimatedValue();
364+
mRedProgressIcon.setLayoutParams(params);
365+
Log.d(TAG, "----onAnimationUpdate--->>>>>>>" + mRedProgressBarPos);
391366
});
392367
mRedProgressAnimator.start();
393368
}
Loading

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip

0 commit comments

Comments
 (0)