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

Commit 710e7bbf authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'e-theme-pie-textcolor' into 'v1-pie' 

E theme pie textcolor

See merge request !15
parents 50ccaf1f 5d0e26ed

app/build.gradle

+19 −7
Original line number Diff line number Diff line 
apply plugin: 'com.android.application'



android {

    compileSdkVersion 28

    buildToolsVersion '28.0.3'

    compileSdkVersion 29



    defaultConfig {

        applicationId "org.lineageos.recorder"

        minSdkVersion 24

        targetSdkVersion 27

        minSdkVersion 28

        targetSdkVersion 29

        versionCode 1

        versionName "1.1"

    }
@@ -15,18 +15,30 @@ android { 
            minifyEnabled false

            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }



        debug{

            applicationIdSuffix ".debug"

        }

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

    productFlavors {

    }



    aaptOptions {

        additionalParameters '-I', 'e-ui-sdk.jar'

    }



}



dependencies {

    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'

    implementation 'com.google.android.material:material:1.1.0-alpha02'

    compileOnly files("../e-ui-sdk.jar")

    implementation 'androidx.appcompat:appcompat:1.1.0'

    implementation 'com.google.android.material:material:1.1.0-alpha10'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'

    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'



}

app/proguard-rules.pro

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ 
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {

#   public *;

#}

-dontwarn lineageos.**
 
 No newline at end of file

app/src/main/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -34,10 +34,13 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \ 
    androidx.recyclerview_recyclerview \

    com.google.android.material_material \



LOCAL_STATIC_JAVA_LIBRARIES := \

     org.lineageos.platform.sdk \



LOCAL_PACKAGE_NAME := Recorder

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true

#LOCAL_PROGUARD_FLAG_FILES := $(LOCAL_PATH)/../../proguard-rules.pro

LOCAL_PROGUARD_FLAG_FILES := ../../proguard-rules.pro



LOCAL_PRIVATE_PLATFORM_APIS := true

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

+2 −2
Original line number Diff line number Diff line
@@ -314,8 +314,8 @@ public class RecorderActivity extends AppCompatActivity implements 
                set.clone(this, R.layout.constraint_sound);

            }

        } else {

            mScreenFab.setImageResource(R.drawable.ic_action_screen_record);

            mSoundFab.setImageResource(R.drawable.ic_action_sound_record);

            mScreenFab.setImageResource(lineageos.platform.R.drawable.ic_camera_video);

            mSoundFab.setImageResource(lineageos.platform.R.drawable.ic_mic);

            mScreenFab.setSelected(false);

            mSoundFab.setSelected(false);

            mRecordingVisualizer.setVisibility(View.GONE);

app/src/main/res/layout/activty_constraint.xml

+8 −4
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ 
            android:paddingEnd="16dp"

            android:paddingStart="16dp"

            android:textAlignment="center"

            android:textColor="@color/white"

            android:textSize="28sp" />

            android:textColor="@color/color_default_primary_text"

            android:textSize="24sp"

            android:textStyle="bold"

            android:text="@string/sound_recording_title_working" />



        <org.lineageos.recorder.ui.SoundVisualizer

            android:id="@+id/main_recording_visualizer"
@@ -65,7 +67,8 @@ 
        <com.google.android.material.floatingactionbutton.FloatingActionButton

            android:id="@+id/sound_fab"

            style="@style/AppTheme.RecordFab"

            android:src="@lineageos.platform:drawable/ic_mic" />

            android:src="@lineageos.platform:drawable/ic_mic"

            app:tint="@color/color_default_foreground"/>



        <TextView

            style="@style/AppTheme.RecordTitle"
@@ -96,7 +99,8 @@ 
        <com.google.android.material.floatingactionbutton.FloatingActionButton

            android:id="@+id/screen_fab"

            style="@style/AppTheme.RecordFab"

            android:src="@lineageos.platform:drawable/ic_camera_video" />

            android:src="@lineageos.platform:drawable/ic_camera_video"

            app:tint="@color/color_default_foreground"/>



        <TextView

            style="@style/AppTheme.RecordTitle"