diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5c4f440ecdd6ede39f5a169b8a7e85521b9df99a..d75cf3ea82018687b32ac0a9b103a605b00d0db4 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 cd95cf40775c6515e2979d5cc1ec876aea11426d..843cc7ad33ccf6bc4b13a3f209af43c529dedf18 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/DialogActivity.java b/app/src/main/java/org/lineageos/recorder/DialogActivity.java index 821ebe6aabc0b457bbe2f5a0ca8f3d76192a4655..67b8a42a0f8107a49d9d8febfed38f657f3c12a3 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/java/org/lineageos/recorder/RecorderActivity.java b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java index 3ca5825ec186ed7ede9800a1ed2e538e9ae727f1..82b6063b5eb5f9d158b2fbc9dafb3f110ec0db98 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 95139f2a9c0d3bfb0b7a555365a4a68bfb21bffe..2e28e2a2b26818cf507ea372b9dcec0943136c40 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 ba63f38a509652985d7c79813744fc0dea2daaea..6d5b5b7c9c10a0e5f7aec3891bec31f793e17731 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 4cdb765cc296c529916aed626c2ebdc51aca48ab..4e5d106c14e83ccf5df8545faa12855a6d26219c 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 8b1eebe4009c1fdb2ef0a89a3dbf41827b276e3b..d4b3745dd30d3d34831840b2867b87603a702ebc 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 2a32bbfa5bf5ea6b15514db29ac9d07219f0db20..bc20cc5905c3c1045a736d5f24fca47053923fe1 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 112d6f65ab72ecca995dda74c3d9d418b9dceac2..e12f455dd4f2e920147deb30217f12e17fd69649 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 9f4bd30de8c1f8088389eca0677b715c59b818d9..d399c1b96712073136affd9b663b032a71373853 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 4b7d359a41ad94f5ba071c3bda7cf7e01c359d5c..af172279dab09ae75d517a4d485158a64cc681e8 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 b6ad5095336a83951dcd078b5cc3250682926b4c..2b9ae984a4f97a04b776a7f619bb533209277ad0 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" /> @@ -89,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 1ea8d1b5dbbcd70642f65c7aaf7fa5406b536dda..08c0a283c4a0e07bbc03798ce0a34e3b9432c9ea 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 8b1d25c18ac270e5a56581671640da69c6443741..442da372c0294ec4648ac4317c902092ff1ee8ee 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 f68776e0753fffef71f7da6c43cf5557e4262228..987802f6033c908aeaee1b0b747522fa12ab632d 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 new file mode 100644 index 0000000000000000000000000000000000000000..003ff198c0e2cd4677cbaad5f8b75b5aced50b61 --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,26 @@ + + + + #272727 + #272727 + #5DB2FF + + #121212 + #CCFFFFFF + #8CFFFFFF + + #394456 + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 69fb8dfb8f93147dac26fc30387d74635012aefc..6443268c653ea6c5f87c629e3aad23c7f4c36286 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,13 +14,15 @@ limitations under the License. --> - @lineageos.platform:color/color_default_primary - @lineageos.platform:color/color_default_primary_dark - @lineageos.platform:color/color_default_accent + #FFFFFF + #FFFFFF + #007FFF - @lineageos.platform:color/color_default_background - @lineageos.platform:color/color_default_primary_text - @lineageos.platform:color/color_default_secondary_text + #FAFAFA + #CC000000 + #8C000000 + + #EAF5FD #fafafa diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0391a06d058b1a0ee0202c0caf7e2efb833cdb3c..901c8da925ba4013323e59fffa07fd4d2043932d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,6 +24,12 @@ @color/color_default_secondary_text true true + @color/selection_color + @style/actionModeCloseButtonStyle + + +