Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

app/proguard-rules.pro

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ 
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {

#   public *;

#}

-dontwarn lineageos.**
 
 No newline at end of file

app/src/main/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -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



}

app/src/main/java/org/lineageos/recorder/RecorderActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

app/src/main/res/layout/activty_constraint.xml

+8 −4
Original line number Diff line number Diff line
@@ -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"

app/src/main/res/values/colors.xml

+10 −5
Original line number Diff line number Diff line
@@ -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>