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

Commit 93fffd6a authored by Joey Rizzoli's avatar Joey Rizzoli Committed by Bruno Martins
Browse files

Recorder: update UI 

* Deprecate 2-tabs layout, use a simple single-screen interface
* Make screen-recorder overlay interface rounded
* Show screen recorder settings and last item in a dialog
* OnBoarding

Ticket: LINN-31

Read more: https://medium.com/@jrizzoli/recording-awesomeness-bc1c5ffe2826



Change-Id: I910af7454eedfd52ec0f1904a52990d2d6f890e7
Signed-off-by: default avatarJoey Rizzoli <joey@lineageos.org>
parent 1221ebb2

app/build.gradle

+7 −5
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ apply plugin: 'com.android.application' 


android {

    compileSdkVersion 25

    buildToolsVersion "25.0.2"

    buildToolsVersion "26.0.2"

    defaultConfig {

        applicationId "org.lineageos.recorder"

        minSdkVersion 25

        targetSdkVersion 25

        versionCode 1

        versionName "1.1"

        jackOptions.enabled true

    }

    buildTypes {

        release {
@@ -25,7 +24,10 @@ android { 


dependencies {

    compile fileTree(dir: 'libs', include: ['*.jar'])

    compile 'com.android.support:appcompat-v7:25.3.0'

    compile 'com.android.support:design:25.3.0'

    compile 'com.android.support:cardview-v7:25.3.0'

    compile 'com.android.support:appcompat-v7:25.4.0'

    compile 'com.android.support:design:25.4.0'

    compile 'com.android.support:cardview-v7:25.4.0'

    // Beta3 breaks ConstraintSets

    //noinspection GradleDependency

    compile 'com.android.support.constraint:constraint-layout:1.1.0-beta2'

}

app/src/main/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
        android:label="@string/app_name"

        android:supportsRtl="true"

        android:theme="@style/AppTheme">



        <activity

            android:name=".RecorderActivity"

            android:label="@string/app_name"
@@ -45,11 +46,17 @@ 
                <action android:name="android.intent.action.PHONE_STATE" />

                <action android:name="android.provider.MediaStore.RECORD_SOUND" />

                <action android:name="org.lineageos.recorder.server.display.SCAN" />



                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>



        <activity

            android:name=".DialogActivity"

            android:excludeFromRecents="true"

            android:theme="@style/AppTheme.DialogActivity" />



        <!-- Sound recorder -->

        <service android:name=".sounds.SoundRecorderService" />

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

0 → 100644
+210 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */

package org.lineageos.recorder;



import android.Manifest;

import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.os.Bundle;

import android.support.annotation.LayoutRes;

import android.support.annotation.NonNull;

import android.support.v7.app.AlertDialog;

import android.support.v7.app.AppCompatActivity;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.Switch;

import android.widget.TextView;



import org.lineageos.recorder.utils.LastRecordHelper;

import org.lineageos.recorder.utils.Utils;



public class DialogActivity extends AppCompatActivity implements

        SharedPreferences.OnSharedPreferenceChangeListener {

    public static final String EXTRA_TITLE = "dialogTitle";

    public static final String EXTRA_LAST_SCREEN = "lastScreenItem";

    public static final String EXTRA_LAST_SOUND = "lastSoundItem";

    public static final String EXTRA_SETTINGS_SCREEN = "settingsScreen";

    private static final int REQUEST_RECORD_AUDIO_PERMS = 213;

    private static final String TYPE_AUDIO = "audio/wav";

    private static final String TYPE_VIDEO = "video/mp4";



    private LinearLayout mRootView;

    private FrameLayout mContent;

    private Switch mAudioSwitch;



    private SharedPreferences mPrefs;



    @Override

    protected void onCreate(Bundle savedInstance) {

        super.onCreate(savedInstance);



        setContentView(R.layout.dialog_base);

        setFinishOnTouchOutside(true);



        mRootView = (LinearLayout) findViewById(R.id.dialog_root);

        TextView title = (TextView) findViewById(R.id.dialog_title);

        mContent = (FrameLayout) findViewById(R.id.dialog_content);



        mPrefs = getSharedPreferences(Utils.PREFS, 0);

        mPrefs.registerOnSharedPreferenceChangeListener(this);



        Intent intent = getIntent();

        int dialogTitle = intent.getIntExtra(EXTRA_TITLE, 0);

        boolean isLastScreen = intent.getBooleanExtra(EXTRA_LAST_SCREEN, false);

        boolean isLastSound = intent.getBooleanExtra(EXTRA_LAST_SOUND, false);

        boolean isSettingsScreen = intent.getBooleanExtra(EXTRA_SETTINGS_SCREEN, false);



        getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.WRAP_CONTENT);



        if (dialogTitle != 0) {

            title.setText(dialogTitle);

        }



        if (isLastScreen) {

            setupAsLastItem(false);

        } else if (isLastSound) {

            setupAsLastItem(true);

        } else if (isSettingsScreen) {

            setupAsSettingsScreen();

        }



        animateAppareance();

    }



    @Override

    public void onDestroy() {

        mPrefs.unregisterOnSharedPreferenceChangeListener(this);

        super.onDestroy();

    }



    @Override

    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,

                                           @NonNull int[] results) {

        if (requestCode != REQUEST_RECORD_AUDIO_PERMS) {

            return;

        }



        mAudioSwitch.setChecked(hasAudioPermission());

        setScreenWithAudio(hasAudioPermission());

    }



    @Override

    public void onBackPressed() {

        finish();

    }



    @Override

    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {

        if (key.equals(Utils.PREF_SCREEN_WITH_AUDIO)) {

            mAudioSwitch.setText(getString(getScreenWithAudio() ?

                    R.string.screen_audio_message_on : R.string.screen_audio_message_off));

        }

    }



    private void animateAppareance() {

        mRootView.setAlpha(0f);

        mRootView.animate()

                .alpha(1f)

                .setStartDelay(250)

                .start();

    }



    private void setupAsLastItem(boolean isSound) {

        View view = createContentView(R.layout.dialog_content_last_item);

        TextView description = (TextView) view.findViewById(R.id.dialog_content_last_description);

        ImageView play = (ImageView) view.findViewById(R.id.dialog_content_last_play);

        ImageView delete = (ImageView) view.findViewById(R.id.dialog_content_last_delete);

        ImageView share = (ImageView) view.findViewById(R.id.dialog_content_last_share);



        description.setText(LastRecordHelper.getLastItemDescription(this, isSound));



        play.setOnClickListener(v -> playLastItem(isSound));

        delete.setOnClickListener(v -> deleteLastItem(isSound));

        share.setOnClickListener(v -> shareLastItem(isSound));

    }



    private void playLastItem(boolean isSound) {

        String type = isSound ? TYPE_AUDIO : TYPE_VIDEO;

        String path = LastRecordHelper.getLastItemPath(this, isSound);

        startActivityForResult(LastRecordHelper.getOpenIntent(this, path, type), 0);

    }



    private void deleteLastItem(boolean isSound) {

        String path = LastRecordHelper.getLastItemPath(this, isSound);

        AlertDialog dialog = LastRecordHelper.deleteFile(this, path, isSound);

        dialog.setOnDismissListener(d -> finish());

        dialog.show();

    }



    private void shareLastItem(boolean isSound) {

        String type = isSound ? TYPE_AUDIO : TYPE_VIDEO;

        String path = LastRecordHelper.getLastItemPath(this, isSound);

        startActivity(LastRecordHelper.getShareIntent(this, path, type));

    }



    private void setupAsSettingsScreen() {

        View view = createContentView(R.layout.dialog_content_screen_settings);

        mAudioSwitch = (Switch) view.findViewById(R.id.dialog_content_screen_settings_switch);

        mAudioSwitch.setOnCheckedChangeListener((button, isChecked) -> {

            if (hasAudioPermission()) {

                setScreenWithAudio(isChecked);

            } else if (isChecked) {

                askAudioPermission();

            } else {

                setScreenWithAudio(false);

            }

        });



        boolean isEnabled = getScreenWithAudio();

        mAudioSwitch.setChecked(isEnabled);

        mAudioSwitch.setText(getString(isEnabled ?

                R.string.screen_audio_message_on : R.string.screen_audio_message_off));



        if (Utils.isScreenRecording(this)) {

            mAudioSwitch.setEnabled(false);

            mAudioSwitch.setText(getString(R.string.screen_audio_message_disabled));

        }

    }



    private View createContentView(@LayoutRes int layout) {

        LayoutInflater inflater = getLayoutInflater();

        return inflater.inflate(layout, mContent);

    }



    private boolean hasAudioPermission() {

        int result = checkSelfPermission(Manifest.permission.RECORD_AUDIO);

        return result == PackageManager.PERMISSION_GRANTED;

    }



    private void askAudioPermission() {

        requestPermissions(new String[]{ Manifest.permission.RECORD_AUDIO },

                REQUEST_RECORD_AUDIO_PERMS);

    }



    private void setScreenWithAudio(boolean enabled) {

        mPrefs.edit().putBoolean(Utils.PREF_SCREEN_WITH_AUDIO, enabled).apply();

    }



    private boolean getScreenWithAudio() {

        return mPrefs.getBoolean(Utils.PREF_SCREEN_WITH_AUDIO, false);

    }

}
 
 No newline at end of file