Skip to content

Commit

Permalink
Clean up pre-Lollipop theming
Browse files Browse the repository at this point in the history
  • Loading branch information
TacoTheDank committed Jul 19, 2022
1 parent 306e18d commit 29aee3d
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 55 deletions.
5 changes: 0 additions & 5 deletions app/src/main/res/drawable-v21/circle_for_activity_icon.xml

This file was deleted.

This file was deleted.

5 changes: 2 additions & 3 deletions app/src/main/res/drawable/circle_for_activity_icon.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"
android:tint="?attr/colorPrimaryDark">
<solid android:color="#000" />
android:shape="oval">
<solid android:color="?attr/colorPrimaryDark" />
</shape>
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
android:tint="?attr/colorAccent">
<solid android:color="#000" />
android:shape="rectangle">
<solid android:color="?attr/colorAccent" />
<corners
android:bottomLeftRadius="90dp"
android:bottomRightRadius="90dp"
Expand Down
24 changes: 0 additions & 24 deletions app/src/main/res/values-v21/styles.xml

This file was deleted.

31 changes: 21 additions & 10 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Base application theme. -->
<style name="AppTheme" parent="AppTheme.Base" />
<style name="AppTheme" parent="AppTheme.Base">
<item name="android:windowContentTransitions">true</item>

<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>

<item name="android:statusBarColor">@color/primaryDark</item>

<item name="android:windowEnterTransition">@android:transition/slide_right</item>
<item name="android:windowExitTransition">@android:transition/slide_left</item>

<item name="android:windowSharedElementEnterTransition">@transition/change_image_transform
</item>
<item name="android:windowSharedElementExitTransition">@transition/change_image_transform
</item>
</style>

<style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:windowNoTitle">true</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item>
Expand Down Expand Up @@ -278,16 +293,12 @@
</style>

<style name="text_settings">
<item name="android:layout_marginEnd" tools:targetApi="jelly_bean_mr1">
@dimen/settings_text_right_margin
</item>
<item name="android:layout_marginEnd">@dimen/settings_text_right_margin</item>
<item name="android:layout_marginRight">@dimen/settings_text_right_margin</item>
<item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">
@dimen/settings_text_left_margin
</item>
<item name="android:layout_marginStart">@dimen/settings_text_left_margin</item>
<item name="android:layout_marginLeft">@dimen/settings_text_left_margin</item>
<item name="android:layout_centerInParent">true</item>
<item name="android:layout_alignParentStart" tools:targetApi="jelly_bean_mr1">true</item>
<item name="android:layout_alignParentStart">true</item>
<item name="android:layout_alignParentLeft">true</item>
</style>

Expand Down

0 comments on commit 29aee3d

Please sign in to comment.