diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index d75cf3ea82018687b32ac0a9b103a605b00d0db4..5c4f440ecdd6ede39f5a169b8a7e85521b9df99a 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.** diff --git a/app/src/main/Android.bp b/app/src/main/Android.bp index 843cc7ad33ccf6bc4b13a3f209af43c529dedf18..cd95cf40775c6515e2979d5cc1ec876aea11426d 100644 --- a/app/src/main/Android.bp +++ b/app/src/main/Android.bp @@ -33,8 +33,9 @@ android_app { "androidx.appcompat_appcompat", "androidx.recyclerview_recyclerview", "com.google.android.material_material", + "org.lineageos.platform.sdk", ], - sdk_version: "current", + platform_apis: true, } diff --git a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java index e418d05b1f5c5b635080de8ede89371aabb81fd4..42a9def09fd3188bf67b1a9171224e8f4c005c68 100644 --- a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java +++ b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java @@ -291,7 +291,7 @@ public class RecorderActivity extends AppCompatActivity implements } } else { mRecordingText.setText(getString(R.string.main_sound_action)); - mSoundFab.setImageResource(R.drawable.ic_action_record); + mSoundFab.setImageResource(lineageos.platform.R.drawable.ic_mic); mSoundFab.setSelected(false); mRecordingVisualizer.setVisibility(View.INVISIBLE); mPauseResume.setVisibility(View.GONE); diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 2e28e2a2b26818cf507ea372b9dcec0943136c40..95139f2a9c0d3bfb0b7a555365a4a68bfb21bffe 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 6d5b5b7c9c10a0e5f7aec3891bec31f793e17731..ba63f38a509652985d7c79813744fc0dea2daaea 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 4e5d106c14e83ccf5df8545faa12855a6d26219c..4cdb765cc296c529916aed626c2ebdc51aca48ab 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 d4b3745dd30d3d34831840b2867b87603a702ebc..8b1eebe4009c1fdb2ef0a89a3dbf41827b276e3b 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 bc20cc5905c3c1045a736d5f24fca47053923fe1..2a32bbfa5bf5ea6b15514db29ac9d07219f0db20 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 e12f455dd4f2e920147deb30217f12e17fd69649..112d6f65ab72ecca995dda74c3d9d418b9dceac2 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 d399c1b96712073136affd9b663b032a71373853..9f4bd30de8c1f8088389eca0677b715c59b818d9 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 af172279dab09ae75d517a4d485158a64cc681e8..4b7d359a41ad94f5ba071c3bda7cf7e01c359d5c 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 80449023c0a8ae55cdaf334c69930fcde0375db8..77f877c67c1861dc5960f75836014db465f422f0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -51,7 +51,8 @@ style="@style/AppTheme.RecordFab" android:layout_gravity="center" android:contentDescription="@null" - android:src="@drawable/ic_action_record" /> + android:src="@lineageos.platform:drawable/ic_mic" + app:tint="@android:color/white" /> - - - #121212 - #000000 - #F2B077 - - #12FFFFFF - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 05b64bf30335cd59a69929d3dc1fbba68498045a..69fb8dfb8f93147dac26fc30387d74635012aefc 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,11 +14,15 @@ limitations under the License. --> - #f8f8f8 - #e0e0e0 - #f19645 + @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 #fafafa - #12000000 + @color/colorAccent diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 633f10585f842f43e244df71594fd20db0f15191..f880583aa30bd8ee927cc71c79d3636aab519de2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -19,6 +19,9 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + @color/color_default_background + @color/color_default_primary_text + @color/color_default_secondary_text true true @@ -32,8 +35,9 @@