فهرست منبع

Revert "Added window transitions flag to app theme"

This reverts commit 76a73719d10de1f10102d812341c048e1e118fe8.
Vadik Sirekanyan 7 سال پیش
والد
کامیت
21b7bfe255

+ 0 - 4
app/src/main/java/com/sirekanyan/knigopis/common/extensions/View.kt

@@ -57,8 +57,4 @@ fun View.startCollapseAnimation() {
     animate().alpha(0f).setDuration(200)
         .setInterpolator(FastOutLinearInInterpolator())
         .scaleX(0f).scaleY(0f)
-}
-
-fun View.setTransitionNameCompat(name: String) {
-    ViewCompat.setTransitionName(this, name)
 }

+ 1 - 6
app/src/main/java/com/sirekanyan/knigopis/common/extensions/ViewGroup.kt

@@ -1,14 +1,9 @@
 package com.sirekanyan.knigopis.common.extensions
 
 import android.support.annotation.LayoutRes
-import android.support.v4.view.ViewGroupCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 
 fun ViewGroup.inflate(@LayoutRes layout: Int): View =
-    LayoutInflater.from(context).inflate(layout, this, false)
-
-fun ViewGroup.setTransitionGroupCompat(isGroup: Boolean) {
-    ViewGroupCompat.setTransitionGroup(this, isGroup)
-}
+    LayoutInflater.from(context).inflate(layout, this, false)

+ 0 - 2
app/src/main/res/values/styles.xml

@@ -11,7 +11,6 @@
     </style>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
         <item name="colorPrimary">@color/light.color_primary</item>
         <item name="colorPrimaryDark">@color/light.color_primary_dark</item>
         <item name="colorAccent">@color/light.color_accent</item>
@@ -28,7 +27,6 @@
     </style>
 
     <style name="DarkAppTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
         <item name="colorPrimary">@color/dark.color_primary</item>
         <item name="colorPrimaryDark">@color/dark.color_primary_dark</item>
         <item name="colorAccent">@color/dark.color_accent</item>