From 5645d99dd316d95fcffb7f4074e1c034183c49ab Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Tue, 14 Dec 2021 14:12:31 +0000 Subject: [PATCH 1/2] Recorder: Revert back to Linage state --- app/proguard-rules.pro | 1 - app/src/main/Android.bp | 3 +-- .../lineageos/recorder/RecorderActivity.java | 2 +- app/src/main/res/drawable/ic_delete.xml | 2 +- app/src/main/res/drawable/ic_edit.xml | 2 +- app/src/main/res/drawable/ic_last_sound.xml | 2 +- app/src/main/res/drawable/ic_menu.xml | 2 +- app/src/main/res/drawable/ic_pause.xml | 2 +- .../res/drawable/ic_play_circle_outline.xml | 2 +- app/src/main/res/drawable/ic_settings.xml | 2 +- app/src/main/res/drawable/ic_share.xml | 2 +- app/src/main/res/layout/activity_main.xml | 5 ++--- app/src/main/res/values-night/colors.xml | 22 +++++++++++++++++++ app/src/main/res/values/colors.xml | 12 ++++------ app/src/main/res/values/styles.xml | 8 ++----- 15 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 app/src/main/res/values-night/colors.xml diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5c4f440e..d75cf3ea 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,4 +15,3 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} --dontwarn lineageos.** diff --git a/app/src/main/Android.bp b/app/src/main/Android.bp index cd95cf40..843cc7ad 100644 --- a/app/src/main/Android.bp +++ b/app/src/main/Android.bp @@ -33,9 +33,8 @@ android_app { "androidx.appcompat_appcompat", "androidx.recyclerview_recyclerview", "com.google.android.material_material", - "org.lineageos.platform.sdk", ], - platform_apis: true, + sdk_version: "current", } diff --git a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java index 3ca5825e..82b6063b 100644 --- a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java +++ b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java @@ -296,7 +296,7 @@ public class RecorderActivity extends AppCompatActivity implements } } else { mRecordingText.setText(getString(R.string.main_sound_action)); - mSoundFab.setImageResource(lineageos.platform.R.drawable.ic_mic); + mSoundFab.setImageResource(R.drawable.ic_action_record); mRecordingVisualizer.setVisibility(View.INVISIBLE); mPauseResume.setVisibility(View.GONE); if (mSoundService != null) { diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 95139f2a..2e28e2a2 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -19,6 +19,6 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml index ba63f38a..6d5b5b7c 100644 --- a/app/src/main/res/drawable/ic_edit.xml +++ b/app/src/main/res/drawable/ic_edit.xml @@ -19,6 +19,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_last_sound.xml b/app/src/main/res/drawable/ic_last_sound.xml index 4cdb765c..4e5d106c 100644 --- a/app/src/main/res/drawable/ic_last_sound.xml +++ b/app/src/main/res/drawable/ic_last_sound.xml @@ -19,6 +19,6 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml index 8b1eebe4..d4b3745d 100644 --- a/app/src/main/res/drawable/ic_menu.xml +++ b/app/src/main/res/drawable/ic_menu.xml @@ -18,6 +18,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml index 2a32bbfa..bc20cc59 100644 --- a/app/src/main/res/drawable/ic_pause.xml +++ b/app/src/main/res/drawable/ic_pause.xml @@ -19,6 +19,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_play_circle_outline.xml b/app/src/main/res/drawable/ic_play_circle_outline.xml index 112d6f65..e12f455d 100644 --- a/app/src/main/res/drawable/ic_play_circle_outline.xml +++ b/app/src/main/res/drawable/ic_play_circle_outline.xml @@ -21,6 +21,6 @@ android:viewportWidth="24"> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 9f4bd30d..d399c1b9 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -17,6 +17,6 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml index 4b7d359a..af172279 100644 --- a/app/src/main/res/drawable/ic_share.xml +++ b/app/src/main/res/drawable/ic_share.xml @@ -19,6 +19,6 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b6ad5095..998e6a0d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -41,12 +41,11 @@ android:layout_marginBottom="16dp" android:clipToPadding="false" android:contentDescription="@string/main_sound_action" - android:src="@lineageos.platform:drawable/ic_mic" + android:src="@drawable/ic_action_record" app:fabCustomSize="96dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:tint="@android:color/white" /> + app:layout_constraintStart_toStartOf="parent" /> + + + #121212 + #000000 + #F2B077 + + #12FFFFFF + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 69fb8dfb..05b64bf3 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,15 +14,11 @@ limitations under the License. --> - @lineageos.platform:color/color_default_primary - @lineageos.platform:color/color_default_primary_dark - @lineageos.platform:color/color_default_accent - - @lineageos.platform:color/color_default_background - @lineageos.platform:color/color_default_primary_text - @lineageos.platform:color/color_default_secondary_text + #f8f8f8 + #e0e0e0 + #f19645 #fafafa - @color/colorAccent + #12000000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0391a06d..cfa64af1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -19,9 +19,6 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent - @color/color_default_background - @color/color_default_primary_text - @color/color_default_secondary_text true true @@ -36,9 +33,8 @@ -- GitLab From accb88faf331e6dea01063cb6212d989a0257be1 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Tue, 14 Dec 2021 09:10:10 +0000 Subject: [PATCH 2/2] Recorder: Revamp UI --- .../org/lineageos/recorder/DialogActivity.java | 10 +++++----- app/src/main/res/layout/activity_main.xml | 3 +++ .../main/res/layout/dialog_content_settings.xml | 4 ++-- app/src/main/res/layout/list_item.xml | 2 ++ app/src/main/res/menu/menu_list_action_mode.xml | 2 ++ app/src/main/res/menu/menu_list_item.xml | 3 +++ app/src/main/res/values-night/colors.xml | 12 ++++++++---- app/src/main/res/values/colors.xml | 14 ++++++++++---- app/src/main/res/values/styles.xml | 14 ++++++++++++-- 9 files changed, 47 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/org/lineageos/recorder/DialogActivity.java b/app/src/main/java/org/lineageos/recorder/DialogActivity.java index 821ebe6a..67b8a42a 100644 --- a/app/src/main/java/org/lineageos/recorder/DialogActivity.java +++ b/app/src/main/java/org/lineageos/recorder/DialogActivity.java @@ -18,19 +18,19 @@ package org.lineageos.recorder; import android.Manifest; import android.content.pm.PackageManager; import android.os.Bundle; +import android.widget.Switch; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.SwitchCompat; import org.lineageos.recorder.utils.Utils; public class DialogActivity extends AppCompatActivity { private static final int REQUEST_LOCATION_PERMS = 214; - private SwitchCompat mLocationSwitch; + private Switch mLocationSwitch; @Override protected void onCreate(@Nullable Bundle savedInstance) { @@ -51,7 +51,7 @@ public class DialogActivity extends AppCompatActivity { if (mLocationSwitch != null) { setupLocationSwitch(mLocationSwitch, isRecording); } - final SwitchCompat highQualitySwitch = dialog.findViewById( + final Switch highQualitySwitch = dialog.findViewById( R.id.dialog_content_settings_high_quality_switch); if (highQualitySwitch != null) { setupHighQualitySwitch(highQualitySwitch, isRecording); @@ -101,7 +101,7 @@ public class DialogActivity extends AppCompatActivity { overridePendingTransition(0, android.R.anim.fade_out); } - private void setupLocationSwitch(@NonNull SwitchCompat locationSwitch, + private void setupLocationSwitch(@NonNull Switch locationSwitch, boolean isRecording) { final boolean tagWithLocation; if (Utils.getTagWithLocation(this)) { @@ -135,7 +135,7 @@ public class DialogActivity extends AppCompatActivity { } } - private void setupHighQualitySwitch(@NonNull SwitchCompat highQualitySwitch, + private void setupHighQualitySwitch(@NonNull Switch highQualitySwitch, boolean isRecording) { final boolean highQuality = Utils.getRecordInHighQuality(this); highQualitySwitch.setChecked(highQuality); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 998e6a0d..2b9ae984 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -66,6 +66,7 @@ android:layout_marginEnd="16dp" android:contentDescription="@null" android:visibility="gone" + android:tint="@color/colorAccent" app:layout_constraintBottom_toBottomOf="@id/sound_fab" app:layout_constraintEnd_toStartOf="@id/sound_fab" app:layout_constraintTop_toTopOf="@id/sound_fab" @@ -78,6 +79,7 @@ android:layout_marginStart="16dp" android:contentDescription="@string/sound_last_title" android:src="@drawable/ic_last_sound" + android:tint="@color/colorAccent" app:layout_constraintBottom_toBottomOf="@id/sound_fab" app:layout_constraintStart_toEndOf="@id/sound_settings" app:layout_constraintTop_toTopOf="@id/sound_fab" /> @@ -88,6 +90,7 @@ android:layout_marginStart="16dp" android:contentDescription="@string/sound_last_title" android:src="@drawable/ic_settings" + android:tint="@color/colorAccent" app:layout_constraintBottom_toBottomOf="@id/sound_fab" app:layout_constraintStart_toEndOf="@id/sound_fab" app:layout_constraintTop_toTopOf="@id/sound_fab" /> diff --git a/app/src/main/res/layout/dialog_content_settings.xml b/app/src/main/res/layout/dialog_content_settings.xml index 1ea8d1b5..08c0a283 100644 --- a/app/src/main/res/layout/dialog_content_settings.xml +++ b/app/src/main/res/layout/dialog_content_settings.xml @@ -22,13 +22,13 @@ android:paddingBottom="?dialogPreferredPadding" android:orientation="vertical"> - - diff --git a/app/src/main/res/menu/menu_list_action_mode.xml b/app/src/main/res/menu/menu_list_action_mode.xml index 8b1d25c1..442da372 100644 --- a/app/src/main/res/menu/menu_list_action_mode.xml +++ b/app/src/main/res/menu/menu_list_action_mode.xml @@ -18,10 +18,12 @@ diff --git a/app/src/main/res/menu/menu_list_item.xml b/app/src/main/res/menu/menu_list_item.xml index f68776e0..987802f6 100644 --- a/app/src/main/res/menu/menu_list_item.xml +++ b/app/src/main/res/menu/menu_list_item.xml @@ -21,17 +21,20 @@ android:id="@+id/action_rename" android:title="@string/rename" android:icon="@drawable/ic_edit" + app:iconTint="@color/colorAccent" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 12fdb928..003ff198 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -14,9 +14,13 @@ limitations under the License. --> - #121212 - #000000 - #F2B077 + #272727 + #272727 + #5DB2FF - #12FFFFFF + #121212 + #CCFFFFFF + #8CFFFFFF + + #394456 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 05b64bf3..6443268c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,11 +14,17 @@ limitations under the License. --> - #f8f8f8 - #e0e0e0 - #f19645 + #FFFFFF + #FFFFFF + #007FFF + + #FAFAFA + #CC000000 + #8C000000 + + #EAF5FD #fafafa - #12000000 + @color/colorAccent diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cfa64af1..901c8da9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -19,8 +19,17 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + @color/color_default_background + @color/color_default_primary_text + @color/color_default_secondary_text true true + @color/selection_color + @style/actionModeCloseButtonStyle + + + -- GitLab