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

Unverified Commit f4f2a9fb authored by Sebastiano Barezzi's avatar Sebastiano Barezzi
Browse files

Recorder: Redrop icons 

Make sure they don't have hardcoded colors inside them

Change-Id: Ieca29c36aaa810c40e17b90721bcee2d0b0845f6
parent bd8726e4

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

+2 −2
Original line number Diff line number Diff line
@@ -285,12 +285,12 @@ public class RecorderActivity extends AppCompatActivity { 


        if (UiStatus.READY == status) {

            mRecordingText.setText(getString(R.string.main_sound_action));

            mSoundFab.setImageResource(R.drawable.ic_action_record);

            mSoundFab.setImageResource(R.drawable.ic_mic);

            mElapsedTimeText.setVisibility(View.GONE);

            mRecordingVisualizer.setVisibility(View.GONE);

            mPauseResume.setVisibility(View.GONE);

        } else {

            mSoundFab.setImageResource(R.drawable.ic_action_stop);

            mSoundFab.setImageResource(R.drawable.ic_stop);

            mElapsedTimeText.setVisibility(View.VISIBLE);

            mRecordingVisualizer.setVisibility(View.VISIBLE);

            mRecordingVisualizer.setAmplitude(0);

app/src/main/java/org/lineageos/recorder/list/RecordingItemViewHolder.java

+3 −3
Original line number Diff line number Diff line
@@ -72,13 +72,13 @@ public class RecordingItemViewHolder extends RecyclerView.ViewHolder { 


        switch (selection) {

            case ListItemStatus.DEFAULT:

                mIconView.setImageResource(R.drawable.ic_play_circle_outline);

                mIconView.setImageResource(R.drawable.ic_play_circle);

                break;

            case ListItemStatus.UNCHECKED:

                mIconView.setImageResource(R.drawable.ic_list_unchecked);

                mIconView.setImageResource(R.drawable.ic_radio_button_unchecked);

                break;

            case ListItemStatus.CHECKED:

                mIconView.setImageResource(R.drawable.ic_list_checked);

                mIconView.setImageResource(R.drawable.ic_check_circle);

                break;

        }

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ public class SoundRecorderService extends Service { 
        NotificationCompat.Builder nb = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL)

                .setOngoing(true)

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

                .setSmallIcon(R.drawable.ic_notification_sound)

                .setSmallIcon(R.drawable.ic_mic)

                .setContentIntent(pi);



        if (mIsPaused) {
@@ -471,7 +471,7 @@ public class SoundRecorderService extends Service { 
                            .setAction(ACTION_RESUME),

                    PendingIntent.FLAG_IMMUTABLE);

            nb.setContentTitle(getString(R.string.sound_recording_title_paused));

            nb.addAction(R.drawable.ic_resume, getString(R.string.resume), resumePIntent);

            nb.addAction(R.drawable.ic_play_arrow, getString(R.string.resume), resumePIntent);

        } else {

            PendingIntent pausePIntent = PendingIntent.getService(this, 0,

                    new Intent(this, SoundRecorderService.class)
@@ -507,8 +507,8 @@ public class SoundRecorderService extends Service { 
                .setWhen(System.currentTimeMillis())

                .setContentTitle(getString(R.string.sound_notification_title))

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

                .setSmallIcon(R.drawable.ic_notification_sound)

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

                .setSmallIcon(R.drawable.ic_mic)

                .addAction(R.drawable.ic_play_arrow, 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)

                .setContentIntent(pi)

app/src/main/res/drawable/ic_action_record.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (c) 2017 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="24"

    android:viewportWidth="24">

    <path

        android:fillColor="?attr/colorPrimary"

        android:pathData="M12,14c1.66,0 3,-1.34 3,-3V5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6C9,12.66 10.34,14 12,14z"/>

    <path

        android:fillColor="?attr/colorPrimary"

        android:pathData="M17.91,11c-0.49,0 -0.9,0.36 -0.98,0.85C16.52,14.2 14.47,16 12,16s-4.52,-1.8 -4.93,-4.15C6.99,11.36 6.58,11 6.09,11h0c-0.61,0 -1.09,0.54 -1,1.14c0.49,3 2.89,5.35 5.91,5.78V20c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1v-2.08c3.02,-0.43 5.42,-2.78 5.91,-5.78C19.01,11.54 18.52,11 17.91,11L17.91,11z"/>

</vector>

app/src/main/res/drawable/ic_action_stop.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (c) 2017 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="24"

    android:viewportWidth="24">

    <path

        android:fillColor="?attr/colorPrimary"

        android:pathData="M8,6h8c1.1,0 2,0.9 2,2v8c0,1.1 -0.9,2 -2,2H8c-1.1,0 -2,-0.9 -2,-2V8C6,6.9 6.9,6 8,6z"/>

</vector>