Commit 4fdf2375 authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'e-theme-q' into 'v1-q'

e theme and icon implementation

See merge request !10
parents 2d8c9244 866d5c28
......@@ -15,3 +15,4 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
-dontwarn lineageos.**
\ No newline at end of file
......@@ -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
}
......@@ -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);
......
......@@ -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"/>
<org.lineageos.recorder.ui.SoundVisualizer
android:id="@+id/main_recording_visualizer"
......@@ -66,7 +68,8 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/sound_fab"
style="@style/AppTheme.RecordFab"
android:src="@drawable/ic_action_sound_record" />
android:src="@lineageos.platform:drawable/ic_mic"
app:tint="@color/color_default_foreground"/>
<TextView
style="@style/AppTheme.RecordTitle"
......@@ -97,7 +100,8 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/screen_fab"
style="@style/AppTheme.RecordFab"
android:src="@drawable/ic_action_screen_record" />
android:src="@lineageos.platform:drawable/ic_camera_video"
app:tint="@color/color_default_foreground"/>
<TextView
style="@style/AppTheme.RecordTitle"
......
......@@ -14,14 +14,19 @@
limitations under the License.
-->
<resources>
<color name="colorPrimary">#f8f8f8</color>
<color name="colorPrimaryDark">#e0e0e0</color>
<color name="colorAccent">#167c80</color>
<color name="colorPrimary">@lineageos.platform:color/color_default_primary</color>
<color name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</color>
<color name="colorAccent">@lineageos.platform:color/color_default_accent</color>
<color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
<color name="white">#fafafa</color>
<color name="black">#333333</color>
<color name="screen">#4e888a</color>
<color name="sound">#f19645</color>
<color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
<color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
<color name="screen">@lineageos.platform:color/color_default_background</color>
<color name="sound">@lineageos.platform:color/color_default_background</color>
<color name="icon">#56000000</color>
</resources>
......@@ -46,7 +46,7 @@
<item name="android:layout_marginRight">16dp</item>
<item name="android:layout_marginBottom">24dp</item>
<item name="android:layout_marginLeft">16dp</item>
<item name="android:textColor">@color/icon</item>
<item name="android:textColor">@color/color_default_primary_text</item>
<item name="android:textSize">18sp</item>
<item name="android:maxLines">1</item>
<item name="android:layout_alignParentBottom">true</item>
......@@ -57,7 +57,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_margin">16dp</item>
<item name="android:stateListAnimator">@animator/lift_on_touch</item>
<item name="backgroundTint">@color/white</item>
<item name="backgroundTint">@color/colorAccent</item>
<item name="android:layout_centerInParent">true</item>
</style>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment