From 21e7aa32271c6ce2c3feba58b2e5bfc0f831b74b Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Tue, 15 Dec 2020 16:18:26 +0530 Subject: [PATCH 1/8] Merge branch 'v1-pie' of /home/hp-pc/StudioProjects/android_packages_apps_Recorder with conflicts. --- app/build.gradle | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 509179f4..92562772 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ 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' + } -- GitLab From 02c6442b60e50cce955c216927e73b3f3cdad634 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Tue, 15 Dec 2020 16:22:25 +0530 Subject: [PATCH 2/8] e theme implementation change text color pie --- app/src/main/res/layout/activty_constraint.xml | 6 ++++-- app/src/main/res/values/colors.xml | 3 +++ app/src/main/res/values/styles.xml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activty_constraint.xml b/app/src/main/res/layout/activty_constraint.xml index 00d5e001..5071727e 100644 --- a/app/src/main/res/layout/activty_constraint.xml +++ b/app/src/main/res/layout/activty_constraint.xml @@ -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" /> @lineageos.platform:color/color_default_primary_dark @lineageos.platform:color/color_default_accent + @lineageos.platform:color/color_default_primary_text + @lineageos.platform:color/color_default_secondary_text + #fafafa #333333 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a284e167..462d73c1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -46,7 +46,7 @@ 16dp 24dp 16dp - @color/icon + @color/color_default_primary_text 18sp 1 true -- GitLab From 55c75053c52d0b54ff21ee85f5267dedb632a28c Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Mon, 21 Dec 2020 16:00:23 +0530 Subject: [PATCH 3/8] e theme implementation change icons pie --- .../main/java/org/lineageos/recorder/RecorderActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java index 4ef7fa91..621bcddd 100644 --- a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java +++ b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java @@ -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); -- GitLab From c20d9b03faa6acc68bdf96ba3b8f37173e53e9cd Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Wed, 23 Dec 2020 11:59:18 +0530 Subject: [PATCH 4/8] Adding changes in Android.mk file --- app/src/main/Android.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/Android.mk b/app/src/main/Android.mk index 265b22cf..165bbef6 100644 --- a/app/src/main/Android.mk +++ b/app/src/main/Android.mk @@ -34,6 +34,9 @@ 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 -- GitLab From bde5716622793e9726ccf0bf52ed5ebd581311fe Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Tue, 29 Dec 2020 15:30:40 +0530 Subject: [PATCH 5/8] Changes in proguard-rules.pro --- app/proguard-rules.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index d75cf3ea..0ba250e7 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,3 +15,4 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} +-dontwarn lineageos.** \ No newline at end of file -- GitLab From a638fb38280bfa5d5e49c18c5f7e74ea0e99f969 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Tue, 29 Dec 2020 17:11:51 +0530 Subject: [PATCH 6/8] Change on Android.mk --- app/src/main/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/Android.mk b/app/src/main/Android.mk index 165bbef6..097f47cc 100644 --- a/app/src/main/Android.mk +++ b/app/src/main/Android.mk @@ -40,7 +40,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_PACKAGE_NAME := Recorder LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true -#LOCAL_PROGUARD_FLAG_FILES := $(LOCAL_PATH)/../../proguard-rules.pro +LOCAL_PROGUARD_FLAG_FILES := $(LOCAL_PATH)/../../proguard-rules.pro LOCAL_PRIVATE_PLATFORM_APIS := true -- GitLab From 4f08048bab1440b34867d78727c772071178a28d Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Wed, 30 Dec 2020 13:02:08 +0530 Subject: [PATCH 7/8] change in Android.mk --- app/src/main/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/Android.mk b/app/src/main/Android.mk index 097f47cc..4f00729c 100644 --- a/app/src/main/Android.mk +++ b/app/src/main/Android.mk @@ -40,7 +40,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 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 -- GitLab From b345c3023754de98145de226e99572f15d72d3a8 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Wed, 30 Dec 2020 14:49:34 +0530 Subject: [PATCH 8/8] Change floating action button tint --- app/src/main/res/layout/activty_constraint.xml | 6 ++++-- app/src/main/res/values/colors.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activty_constraint.xml b/app/src/main/res/layout/activty_constraint.xml index 5071727e..d59e8da9 100644 --- a/app/src/main/res/layout/activty_constraint.xml +++ b/app/src/main/res/layout/activty_constraint.xml @@ -67,7 +67,8 @@ + android:src="@lineageos.platform:drawable/ic_mic" + app:tint="@color/color_default_foreground"/> + android:src="@lineageos.platform:drawable/ic_camera_video" + app:tint="@color/color_default_foreground"/> @lineageos.platform:color/color_default_primary_text @lineageos.platform:color/color_default_secondary_text + @lineageos.platform:color/color_default_foreground #fafafa #333333 -- GitLab