Skip to content

Commit c8fefeb

Browse files
Rajan-p-simformRajan-p-simform
committed
Support Edge to edge
1 parent 6165294 commit c8fefeb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+300
-36
lines changed

‎app/src/main/java/com/simform/videoimageeditor/MainActivity.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.simform.videoimageeditor
22

33
import android.view.View
4+
import androidx.activity.enableEdgeToEdge
45
import com.simform.videoimageeditor.databinding.ActivityMainBinding
56
import com.simform.videoimageeditor.middlewareActivity.OtherFFMPEGProcessActivity
67
import com.simform.videoimageeditor.middlewareActivity.VideoProcessActivity
8+
import com.simform.videoimageeditor.utils.enableEdgeToEdge
79

810
class MainActivity : BaseActivity(R.layout.activity_main, R.string.ffpmeg_title) {
911

@@ -12,8 +14,8 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.ffpmeg_title)
1214
override fun initialization() {
1315
binding = ActivityMainBinding.inflate(layoutInflater)
1416
setContentView(binding.root)
15-
16-
supportActionBar?.title = getString(R.string.ffpmeg_title)
17+
enableEdgeToEdge(binding.toolbar.root)
18+
binding.toolbar.textTitle.text = getString(R.string.ffpmeg_title)
1719
supportActionBar?.setDisplayHomeAsUpEnabled(false)
1820
supportActionBar?.setDisplayShowHomeEnabled(false)
1921
binding.apply {

‎app/src/main/java/com/simform/videoimageeditor/middlewareActivity/OtherFFMPEGProcessActivity.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.simform.videoimageeditor.middlewareActivity
22

33
import android.view.View
4+
import androidx.activity.enableEdgeToEdge
45
import com.simform.videoimageeditor.BaseActivity
56
import com.simform.videoimageeditor.R
67
import com.simform.videoimageeditor.databinding.ActivityOtherFfmpegProcessBinding
@@ -10,6 +11,7 @@ import com.simform.videoimageeditor.otherFFMPEGProcessActivity.CompressAudioActi
1011
import com.simform.videoimageeditor.otherFFMPEGProcessActivity.CropAudioActivity
1112
import com.simform.videoimageeditor.otherFFMPEGProcessActivity.FastAndSlowAudioActivity
1213
import com.simform.videoimageeditor.otherFFMPEGProcessActivity.MergeGIFActivity
14+
import com.simform.videoimageeditor.utils.enableEdgeToEdge
1315

1416
class OtherFFMPEGProcessActivity : BaseActivity(R.layout.activity_other_ffmpeg_process, R.string.other_ffmpeg_operations) {
1517

@@ -18,7 +20,8 @@ class OtherFFMPEGProcessActivity : BaseActivity(R.layout.activity_other_ffmpeg_p
1820
override fun initialization() {
1921
binding = ActivityOtherFfmpegProcessBinding.inflate(layoutInflater)
2022
setContentView(binding.root)
21-
supportActionBar?.title = getString(R.string.other_ffmpeg_operations)
23+
enableEdgeToEdge(binding.toolbar.root)
24+
binding.toolbar.textTitle.text = getString(R.string.other_ffmpeg_operations)
2225
binding.apply {
2326
btnMergeGIF.setOnClickListener(this@OtherFFMPEGProcessActivity)
2427
btnMergeAudios.setOnClickListener(this@OtherFFMPEGProcessActivity)

‎app/src/main/java/com/simform/videoimageeditor/otherFFMPEGProcessActivity/AudiosMergeActivity.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.jaiselrahman.filepicker.model.MediaFile
88
import com.simform.videoimageeditor.BaseActivity
99
import com.simform.videoimageeditor.R
1010
import com.simform.videoimageeditor.databinding.ActivityAudiosMergeBinding
11+
import com.simform.videoimageeditor.utils.enableEdgeToEdge
1112
import com.simform.videooperations.CallBackOfQuery
1213
import com.simform.videooperations.Common
1314
import com.simform.videooperations.Common.DURATION_FIRST
@@ -22,7 +23,8 @@ class AudiosMergeActivity : BaseActivity(R.layout.activity_audios_merge, R.strin
2223
override fun initialization() {
2324
binding = ActivityAudiosMergeBinding.inflate(layoutInflater)
2425
setContentView(binding.root)
25-
26+
enableEdgeToEdge(binding.toolbar.root)
27+
binding.toolbar.textTitle.text = getString(R.string.merge_audios)
2628
binding.btnAudioPath.setOnClickListener(this)
2729
binding.btnMerge.setOnClickListener(this)
2830
}

‎app/src/main/java/com/simform/videoimageeditor/otherFFMPEGProcessActivity/CropAudioActivity.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.simform.videoimageeditor.BaseActivity
1111
import com.simform.videoimageeditor.R
1212
import com.simform.videoimageeditor.databinding.ActivityCropAudioBinding
1313
import com.simform.videoimageeditor.ikovac.timepickerwithseconds.MyTimePickerDialog
14+
import com.simform.videoimageeditor.utils.enableEdgeToEdge
1415
import com.simform.videooperations.CallBackOfQuery
1516
import com.simform.videooperations.Common
1617
import com.simform.videooperations.Common.stringForTime
@@ -31,7 +32,8 @@ class CropAudioActivity : BaseActivity(R.layout.activity_crop_audio, R.string.cr
3132
override fun initialization() {
3233
binding = ActivityCropAudioBinding.inflate(layoutInflater)
3334
setContentView(binding.root)
34-
35+
enableEdgeToEdge(binding.toolbar.root)
36+
binding.toolbar.textTitle.text = getString(R.string.crop_audio_using_time)
3537
binding.apply {
3638
btnAudioPath.setOnClickListener(this@CropAudioActivity)
3739
btnSelectStartTime.setOnClickListener(this@CropAudioActivity)

‎app/src/main/java/com/simform/videoimageeditor/utils/ExtensionsUtils.kt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.simform.videoimageeditor.utils
2+
3+
import android.view.View
4+
import androidx.appcompat.app.AppCompatActivity
5+
import androidx.core.view.ViewCompat
6+
import androidx.core.view.WindowInsetsCompat
7+
8+
fun AppCompatActivity.enableEdgeToEdge(view: View?) {
9+
view?.let {
10+
ViewCompat.setOnApplyWindowInsetsListener(it) { view, windowInsets ->
11+
val systemBarInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
12+
view.setPadding(
13+
systemBarInsets.left,
14+
systemBarInsets.top,
15+
systemBarInsets.right,
16+
0
17+
)
18+
windowInsets
19+
}
20+
}
21+
}

‎app/src/main/java/com/simform/videoimageeditor/videoProcessActivity/CombineImageAndVideoActivity.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.jaiselrahman.filepicker.model.MediaFile
1212
import com.simform.videoimageeditor.BaseActivity
1313
import com.simform.videoimageeditor.R
1414
import com.simform.videoimageeditor.databinding.ActivityMergeImageAndVideoBinding
15+
import com.simform.videoimageeditor.utils.enableEdgeToEdge
1516
import com.simform.videooperations.CallBackOfQuery
1617
import com.simform.videooperations.Common
1718
import com.simform.videooperations.FFmpegCallBack
@@ -27,7 +28,8 @@ class CombineImageAndVideoActivity : BaseActivity(R.layout.activity_merge_image_
2728
override fun initialization() {
2829
binding = ActivityMergeImageAndVideoBinding.inflate(layoutInflater)
2930
setContentView(binding.root)
30-
31+
enableEdgeToEdge(binding.toolbar.root)
32+
binding.toolbar.textTitle.text = getString(R.string.merge_image_and_video)
3133
binding.apply {
3234
btnVideoPath.setOnClickListener(this@CombineImageAndVideoActivity)
3335
btnImagePath.setOnClickListener(this@CombineImageAndVideoActivity)

‎app/src/main/java/com/simform/videoimageeditor/videoProcessActivity/CompressVideoActivity.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ import android.media.MediaMetadataRetriever
55
import android.os.Build
66
import android.view.View
77
import android.widget.Toast
8+
import androidx.activity.enableEdgeToEdge
89
import androidx.activity.result.PickVisualMediaRequest
910
import androidx.activity.result.contract.ActivityResultContracts
1011
import com.jaiselrahman.filepicker.model.MediaFile
1112
import com.simform.videoimageeditor.BaseActivity
1213
import com.simform.videoimageeditor.R
1314
import com.simform.videoimageeditor.databinding.ActivityCompressVideoBinding
15+
import com.simform.videoimageeditor.utils.enableEdgeToEdge
1416
import com.simform.videooperations.CallBackOfQuery
1517
import com.simform.videooperations.Common
1618
import com.simform.videooperations.FFmpegCallBack
@@ -25,6 +27,8 @@ class CompressVideoActivity : BaseActivity(R.layout.activity_compress_video, R.s
2527
override fun initialization() {
2628
binding = ActivityCompressVideoBinding.inflate(layoutInflater)
2729
setContentView(binding.root)
30+
enableEdgeToEdge(binding.toolbar.root)
31+
binding.toolbar.textTitle.text = getString(R.string.compress_a_video)
2832

2933
binding.apply {
3034
btnVideoPath.setOnClickListener(this@CompressVideoActivity)

‎app/src/main/java/com/simform/videoimageeditor/videoProcessActivity/CutVideoUsingTimeActivity.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ import android.text.TextUtils
66
import android.view.View
77
import android.widget.TextView
88
import android.widget.Toast
9+
import androidx.activity.enableEdgeToEdge
910
import androidx.activity.result.PickVisualMediaRequest
1011
import androidx.activity.result.contract.ActivityResultContracts
1112
import com.jaiselrahman.filepicker.model.MediaFile
1213
import com.simform.videoimageeditor.BaseActivity
1314
import com.simform.videoimageeditor.R
1415
import com.simform.videoimageeditor.databinding.ActivityCutVideoUsingTimeBinding
1516
import com.simform.videoimageeditor.ikovac.timepickerwithseconds.MyTimePickerDialog
17+
import com.simform.videoimageeditor.utils.enableEdgeToEdge
1618
import com.simform.videooperations.CallBackOfQuery
1719
import com.simform.videooperations.Common
1820
import com.simform.videooperations.Common.TIME_FORMAT
@@ -36,6 +38,8 @@ class CutVideoUsingTimeActivity : BaseActivity(R.layout.activity_cut_video_using
3638
override fun initialization() {
3739
binding = ActivityCutVideoUsingTimeBinding.inflate(layoutInflater)
3840
setContentView(binding.root)
41+
enableEdgeToEdge(binding.toolbar.root)
42+
binding.toolbar.textTitle.text = getString(R.string.cut_video_using_time)
3943

4044
binding.apply {
4145
btnVideoPath.setOnClickListener(this@CutVideoUsingTimeActivity)

‎app/src/main/res/drawable/ic_back.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
2+
3+
<path android:fillColor="@android:color/white" android:pathData="M400,880L0,480L400,80L471,151L142,480L471,809L400,880Z"/>
4+
5+
</vector>

‎app/src/main/res/layout/activity_add_text_on_video.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
android:layout_height="match_parent"
77
tools:context=".videoProcessActivity.AddTextOnVideoActivity">
88

9+
<include
10+
android:id="@+id/toolbar"
11+
layout="@layout/toolbar_app"
12+
android:layout_width="match_parent"
13+
android:layout_height="wrap_content"/>
14+
915
<TextView
1016
android:id="@+id/tvInputPathVideo"
1117
android:layout_width="0dp"
@@ -16,7 +22,7 @@
1622
android:layout_marginTop="10dp"
1723
android:layout_marginStart="10dp"
1824
android:layout_marginEnd="10dp"
19-
app:layout_constraintTop_toTopOf="parent"
25+
app:layout_constraintTop_toBottomOf="@id/toolbar"
2026
app:layout_constraintStart_toStartOf="parent"
2127
app:layout_constraintEnd_toStartOf="@+id/btnVideoPath" />
2228

0 commit comments

Comments
 (0)