Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit bd8726e4 authored by Aayush Gupta's avatar Aayush Gupta Committed by Sebastiano Barezzi
Browse files

Recorder: Migrate to Material3 theme 



Co-authored-by: default avatarSebastiano Barezzi <seba@sebaubuntu.dev>
Change-Id: I027145b59ae475f37003c74f1621e0af6285c661
Signed-off-by: default avatarAayush Gupta <aayushgupta219@gmail.com>
parent 1cf61d74

app/src/main/java/org/lineageos/recorder/DeleteLastActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ import android.os.Bundle; 


import androidx.activity.ComponentActivity;

import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;



import com.google.android.material.dialog.MaterialAlertDialogBuilder;



import org.lineageos.recorder.task.DeleteRecordingTask;

import org.lineageos.recorder.task.TaskExecutor;
@@ -45,7 +46,7 @@ public class DeleteLastActivity extends ComponentActivity { 
        if (uri == null) {

            finish();

        } else {

            new AlertDialog.Builder(this)

            new MaterialAlertDialogBuilder(this)

                    .setTitle(R.string.delete_title)

                    .setMessage(getString(R.string.delete_recording_message))

                    .setPositiveButton(R.string.delete, (d, which) -> mTaskExecutor.runTask(

app/src/main/java/org/lineageos/recorder/DialogActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import androidx.appcompat.app.AlertDialog; 
import androidx.appcompat.app.AppCompatActivity;

import androidx.appcompat.widget.SwitchCompat;



import com.google.android.material.dialog.MaterialAlertDialogBuilder;



import org.lineageos.recorder.utils.PermissionManager;

import org.lineageos.recorder.utils.PreferencesManager;
@@ -42,7 +44,7 @@ public class DialogActivity extends AppCompatActivity { 


        setFinishOnTouchOutside(true);



        final AlertDialog dialog = new AlertDialog.Builder(this)

        final AlertDialog dialog = new MaterialAlertDialogBuilder(this)

                .setTitle(R.string.settings_title)

                .setView(R.layout.dialog_content_settings)

                .setOnDismissListener(dialogInterface -> finish())

app/src/main/java/org/lineageos/recorder/ListActivity.java

+6 −5
Original line number Diff line number Diff line
@@ -31,13 +31,14 @@ import android.widget.TextView; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.appcompat.app.ActionBar;

import androidx.appcompat.app.AlertDialog;

import androidx.appcompat.app.AppCompatActivity;

import androidx.appcompat.widget.Toolbar;

import androidx.coordinatorlayout.widget.CoordinatorLayout;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;



import com.google.android.material.dialog.MaterialAlertDialogBuilder;



import org.lineageos.recorder.list.ListActionModeCallback;

import org.lineageos.recorder.list.RecordingData;

import org.lineageos.recorder.list.RecordingListCallbacks;
@@ -123,7 +124,7 @@ public class ListActivity extends AppCompatActivity implements RecordingListCall 


    @Override

    public void onDelete(int index, @NonNull Uri uri) {

        new AlertDialog.Builder(this)

        new MaterialAlertDialogBuilder(this)

                .setTitle(R.string.delete_title)

                .setMessage(getString(R.string.delete_recording_message))

                .setPositiveButton(R.string.delete, (d, which) -> mTaskExecutor.runTask(
@@ -144,7 +145,7 @@ public class ListActivity extends AppCompatActivity implements RecordingListCall 
        editText.requestFocus();

        Utils.showKeyboard(this);



        new AlertDialog.Builder(this)

        new MaterialAlertDialogBuilder(this)

                .setTitle(R.string.list_edit_title)

                .setView(view)

                .setPositiveButton(R.string.list_edit_confirm, (d, which) -> {
@@ -274,7 +275,7 @@ public class ListActivity extends AppCompatActivity implements RecordingListCall 
            return;

        }



        new AlertDialog.Builder(this)

        new MaterialAlertDialogBuilder(this)

                .setTitle(R.string.delete_selected_title)

                .setMessage(getString(R.string.delete_selected_message))

                .setPositiveButton(R.string.delete, (dialog, which) -> {
@@ -290,7 +291,7 @@ public class ListActivity extends AppCompatActivity implements RecordingListCall 
            return;

        }



        new AlertDialog.Builder(this)

        new MaterialAlertDialogBuilder(this)

                .setTitle(R.string.delete_all_title)

                .setMessage(getString(R.string.delete_all_message))

                .setPositiveButton(R.string.delete, (dialog, which) -> {

app/src/main/java/org/lineageos/recorder/RecorderActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ import android.widget.TextView; 


import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;

import androidx.appcompat.app.AppCompatActivity;

import androidx.constraintlayout.widget.ConstraintLayout;

import androidx.core.content.ContextCompat;



import com.google.android.material.dialog.MaterialAlertDialogBuilder;

import com.google.android.material.floatingactionbutton.FloatingActionButton;



import org.lineageos.recorder.service.SoundRecorderService;
@@ -373,7 +373,7 @@ public class RecorderActivity extends AppCompatActivity { 
    }



    private void promptUser() {

        new AlertDialog.Builder(this)

        new MaterialAlertDialogBuilder(this)

                .setTitle(R.string.confirm_result_title)

                .setMessage(R.string.confirm_result_message)

                .setPositiveButton(R.string.confirm, (dialog, which) -> confirmLastResult())

app/src/main/java/org/lineageos/recorder/service/SoundRecorderService.java

+0 −2
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ public class SoundRecorderService extends Service { 
                .setOngoing(true)

                .setContentText(getString(R.string.sound_notification_message, duration))

                .setSmallIcon(R.drawable.ic_notification_sound)

                .setColor(ContextCompat.getColor(this, R.color.colorAccent))

                .setContentIntent(pi);



        if (mIsPaused) {
@@ -509,7 +508,6 @@ public class SoundRecorderService extends Service { 
                .setContentTitle(getString(R.string.sound_notification_title))

                .setContentText(getString(R.string.sound_notification_message, duration))

                .setSmallIcon(R.drawable.ic_notification_sound)

                .setColor(ContextCompat.getColor(this, R.color.colorAccent))

                .addAction(R.drawable.ic_play, getString(R.string.play), playPIntent)

                .addAction(R.drawable.ic_share, getString(R.string.share), sharePIntent)

                .addAction(R.drawable.ic_delete, getString(R.string.delete), deletePIntent)