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

Commit 7283568d authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

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

e theme and icons implementation

See merge request !12
parents 1a8b1674 01f51e20

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

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
        <android.support.design.widget.FloatingActionButton

            android:id="@+id/sound_fab"

            style="@style/AppTheme.RecordFab"

            android:src="@drawable/ic_action_sound_record" />

            android:src="@lineageos.platform:drawable/ic_mic" />



        <TextView

            style="@style/AppTheme.RecordTitle"
@@ -96,7 +96,7 @@ 
        <android.support.design.widget.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" />



        <TextView

            style="@style/AppTheme.RecordTitle"

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

+5 −5
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 
     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="white">#fafafa</color>

    <color name="black">#333333</color>



    <color name="screen">#4e888a</color>

    <color name="sound">#f19645</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>

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

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