diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index d75cf3ea82018687b32ac0a9b103a605b00d0db4..0ba250e7674b625324731c5c43f2409ad74b0c8b 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 diff --git a/app/src/main/Android.bp b/app/src/main/Android.bp index 17375a7693e461eae60f1ddf642c5f807021eae7..df2a598a91c8df3690a4e304ee0001f962db890a 100644 --- a/app/src/main/Android.bp +++ b/app/src/main/Android.bp @@ -31,8 +31,9 @@ android_app { "androidx.cardview_cardview", "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 380b09adc65cca1f9d199b4f4a92227e583b15b6..6deb347ce6791113774a76fa36a3858aca870d7f 100644 --- a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java +++ b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java @@ -325,8 +325,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); diff --git a/app/src/main/res/layout/activty_constraint.xml b/app/src/main/res/layout/activty_constraint.xml index 5130f72f693c0ebfff9b95aed26349cc57ebc11a..16a609548396e2cc1024cbd0c9006432b121a8e4 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"/> + 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"/> - #f8f8f8 - #e0e0e0 - #167c80 + @lineageos.platform:color/color_default_primary + @lineageos.platform:color/color_default_primary_dark + @lineageos.platform:color/color_default_accent + + @lineageos.platform:color/color_default_foreground #fafafa #333333 - #4e888a - #f19645 + @lineageos.platform:color/color_default_primary_text + @lineageos.platform:color/color_default_secondary_text + + @lineageos.platform:color/color_default_background + @lineageos.platform:color/color_default_background #56000000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7d3dfe178041826878fc0a48c7f44ffcb268d3c5..462d73c1d00ae70f72fa523b45544382482cbb6e 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 @@ -57,7 +57,7 @@ wrap_content 16dp @animator/lift_on_touch - @color/white + @color/colorAccent true