Revert "TEST - Added transition animations"

This reverts commit 451e13c5
This commit is contained in:
CappielloAntonio 2021-08-24 11:21:03 +02:00
parent cd1a3d8c30
commit 4d5cf704fe
2 changed files with 33 additions and 95 deletions

3
.idea/misc.xml generated
View file

@ -15,7 +15,6 @@
<entry key="app/src/main/res/drawable/ic_downloading.xml" value="0.2722222222222222" /> <entry key="app/src/main/res/drawable/ic_downloading.xml" value="0.2722222222222222" />
<entry key="app/src/main/res/drawable/ic_drag_handle.xml" value="0.27685185185185185" /> <entry key="app/src/main/res/drawable/ic_drag_handle.xml" value="0.27685185185185185" />
<entry key="app/src/main/res/drawable/ic_file_download.xml" value="0.2722222222222222" /> <entry key="app/src/main/res/drawable/ic_file_download.xml" value="0.2722222222222222" />
<entry key="app/src/main/res/drawable/ic_home.xml" value="0.28055555555555556" />
<entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.2814814814814815" /> <entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.2814814814814815" />
<entry key="app/src/main/res/drawable/ic_play.xml" value="0.27685185185185185" /> <entry key="app/src/main/res/drawable/ic_play.xml" value="0.27685185185185185" />
<entry key="app/src/main/res/drawable/ic_refresh.xml" value="0.18958333333333333" /> <entry key="app/src/main/res/drawable/ic_refresh.xml" value="0.18958333333333333" />
@ -32,7 +31,7 @@
<entry key="app/src/main/res/layout/fragment_album_catalogue.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/fragment_album_catalogue.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/layout/fragment_album_page.xml" value="0.2769409038238702" /> <entry key="app/src/main/res/layout/fragment_album_page.xml" value="0.2769409038238702" />
<entry key="app/src/main/res/layout/fragment_artist_page.xml" value="0.1" /> <entry key="app/src/main/res/layout/fragment_artist_page.xml" value="0.1" />
<entry key="app/src/main/res/layout/fragment_home.xml" value="0.264" /> <entry key="app/src/main/res/layout/fragment_home.xml" value="0.2212962962962963" />
<entry key="app/src/main/res/layout/fragment_login.xml" value="0.3166496424923391" /> <entry key="app/src/main/res/layout/fragment_login.xml" value="0.3166496424923391" />
<entry key="app/src/main/res/layout/fragment_player_bottom_sheet.xml" value="0.3166496424923391" /> <entry key="app/src/main/res/layout/fragment_player_bottom_sheet.xml" value="0.3166496424923391" />
<entry key="app/src/main/res/layout/fragment_playlist_catalogue.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/fragment_playlist_catalogue.xml" value="0.3229166666666667" />

View file

@ -31,9 +31,7 @@
android:id="@+id/action_loginFragment_to_homeFragment" android:id="@+id/action_loginFragment_to_homeFragment"
app:destination="@id/homeFragment" app:destination="@id/homeFragment"
app:popUpTo="@id/loginFragment" app:popUpTo="@id/loginFragment"
app:popUpToInclusive="true" app:popUpToInclusive="true" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
@ -43,34 +41,22 @@
tools:layout="@layout/fragment_home"> tools:layout="@layout/fragment_home">
<action <action
android:id="@+id/action_homeFragment_to_songListPageFragment" android:id="@+id/action_homeFragment_to_songListPageFragment"
app:destination="@id/songListPageFragment" app:destination="@id/songListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim" />
<action <action
android:id="@+id/action_homeFragment_to_albumListPageFragment" android:id="@+id/action_homeFragment_to_albumListPageFragment"
app:destination="@id/albumListPageFragment" app:destination="@id/albumListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_homeFragment_to_artistListPageFragment" android:id="@+id/action_homeFragment_to_artistListPageFragment"
app:destination="@id/artistListPageFragment" app:destination="@id/artistListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_homeFragment_to_settingsFragment" android:id="@+id/action_homeFragment_to_settingsFragment"
app:destination="@id/settingsFragment" app:destination="@id/settingsFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_homeFragment_to_albumPageFragment" android:id="@+id/action_homeFragment_to_albumPageFragment"
app:destination="@id/albumPageFragment" app:destination="@id/albumPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_homeFragment_to_artistPageFragment" android:id="@+id/action_homeFragment_to_artistPageFragment"
app:destination="@id/artistPageFragment" app:destination="@id/artistPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/libraryFragment" android:id="@+id/libraryFragment"
@ -79,44 +65,28 @@
tools:layout="@layout/fragment_library"> tools:layout="@layout/fragment_library">
<action <action
android:id="@+id/action_libraryFragment_to_artistCatalogueFragment" android:id="@+id/action_libraryFragment_to_artistCatalogueFragment"
app:destination="@id/artistCatalogueFragment" app:destination="@id/artistCatalogueFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_libraryFragment_to_albumCatalogueFragment" android:id="@+id/action_libraryFragment_to_albumCatalogueFragment"
app:destination="@id/albumCatalogueFragment" app:destination="@id/albumCatalogueFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_libraryFragment_to_genreCatalogueFragment" android:id="@+id/action_libraryFragment_to_genreCatalogueFragment"
app:destination="@id/genreCatalogueFragment" app:destination="@id/genreCatalogueFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_libraryFragment_to_playlistCatalogueFragment" android:id="@+id/action_libraryFragment_to_playlistCatalogueFragment"
app:destination="@id/playlistCatalogueFragment" app:destination="@id/playlistCatalogueFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_libraryFragment_to_artistPageFragment" android:id="@+id/action_libraryFragment_to_artistPageFragment"
app:destination="@id/artistPageFragment" app:destination="@id/artistPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_libraryFragment_to_albumPageFragment" android:id="@+id/action_libraryFragment_to_albumPageFragment"
app:destination="@id/albumPageFragment" app:destination="@id/albumPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_libraryFragment_to_songListPageFragment" android:id="@+id/action_libraryFragment_to_songListPageFragment"
app:destination="@id/songListPageFragment" app:destination="@id/songListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_libraryFragment_to_playlistPageFragment" android:id="@+id/action_libraryFragment_to_playlistPageFragment"
app:destination="@id/playlistPageFragment" app:destination="@id/playlistPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/settingsFragment" android:id="@+id/settingsFragment"
@ -126,9 +96,8 @@
<action <action
android:id="@+id/action_settingsFragment_to_loginFragment" android:id="@+id/action_settingsFragment_to_loginFragment"
app:destination="@id/loginFragment" app:destination="@id/loginFragment"
app:popUpTo="@id/settingsFragment" app:popUpTo="@id/homeFragment"
app:popUpToInclusive="true" app:popUpToInclusive="true" />
app:enterAnim="@anim/nav_default_enter_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/searchFragment" android:id="@+id/searchFragment"
@ -137,19 +106,13 @@
tools:layout="@layout/fragment_search"> tools:layout="@layout/fragment_search">
<action <action
android:id="@+id/action_searchFragment_to_artistPageFragment" android:id="@+id/action_searchFragment_to_artistPageFragment"
app:destination="@id/artistPageFragment" app:destination="@id/artistPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_searchFragment_to_albumPageFragment" android:id="@+id/action_searchFragment_to_albumPageFragment"
app:destination="@id/albumPageFragment" app:destination="@id/albumPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_searchFragment_to_songListPageFragment" android:id="@+id/action_searchFragment_to_songListPageFragment"
app:destination="@id/songListPageFragment" app:destination="@id/songListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/filterFragment" android:id="@+id/filterFragment"
@ -158,9 +121,7 @@
tools:layout="@layout/fragment_filter"> tools:layout="@layout/fragment_filter">
<action <action
android:id="@+id/action_filterFragment_to_songListPageFragment" android:id="@+id/action_filterFragment_to_songListPageFragment"
app:destination="@id/songListPageFragment" app:destination="@id/songListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/artistCatalogueFragment" android:id="@+id/artistCatalogueFragment"
@ -169,9 +130,7 @@
tools:layout="@layout/fragment_artist_catalogue"> tools:layout="@layout/fragment_artist_catalogue">
<action <action
android:id="@+id/action_artistCatalogueFragment_to_artistPageFragment" android:id="@+id/action_artistCatalogueFragment_to_artistPageFragment"
app:destination="@id/artistPageFragment" app:destination="@id/artistPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/albumCatalogueFragment" android:id="@+id/albumCatalogueFragment"
@ -180,9 +139,7 @@
tools:layout="@layout/fragment_album_catalogue"> tools:layout="@layout/fragment_album_catalogue">
<action <action
android:id="@+id/action_albumCatalogueFragment_to_albumPageFragment" android:id="@+id/action_albumCatalogueFragment_to_albumPageFragment"
app:destination="@id/albumPageFragment" app:destination="@id/albumPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/genreCatalogueFragment" android:id="@+id/genreCatalogueFragment"
@ -191,14 +148,10 @@
tools:layout="@layout/fragment_genre_catalogue"> tools:layout="@layout/fragment_genre_catalogue">
<action <action
android:id="@+id/action_genreCatalogueFragment_to_songListPageFragment" android:id="@+id/action_genreCatalogueFragment_to_songListPageFragment"
app:destination="@id/songListPageFragment" app:destination="@id/songListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_genreCatalogueFragment_to_filterFragment" android:id="@+id/action_genreCatalogueFragment_to_filterFragment"
app:destination="@id/filterFragment" app:destination="@id/filterFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/playlistCatalogueFragment" android:id="@+id/playlistCatalogueFragment"
@ -207,9 +160,7 @@
tools:layout="@layout/fragment_playlist_catalogue"> tools:layout="@layout/fragment_playlist_catalogue">
<action <action
android:id="@+id/action_playlistCatalogueFragment_to_playlistPageFragment" android:id="@+id/action_playlistCatalogueFragment_to_playlistPageFragment"
app:destination="@id/playlistPageFragment" app:destination="@id/playlistPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
@ -219,14 +170,10 @@
tools:layout="@layout/fragment_artist_page"> tools:layout="@layout/fragment_artist_page">
<action <action
android:id="@+id/action_artistPageFragment_to_albumPageFragment" android:id="@+id/action_artistPageFragment_to_albumPageFragment"
app:destination="@id/albumPageFragment" app:destination="@id/albumPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_artistPageFragment_to_songListPageFragment" android:id="@+id/action_artistPageFragment_to_songListPageFragment"
app:destination="@id/songListPageFragment" app:destination="@id/songListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/albumPageFragment" android:id="@+id/albumPageFragment"
@ -235,14 +182,10 @@
tools:layout="@layout/fragment_album_page"> tools:layout="@layout/fragment_album_page">
<action <action
android:id="@+id/action_albumPageFragment_to_artistPageFragment" android:id="@+id/action_albumPageFragment_to_artistPageFragment"
app:destination="@id/artistPageFragment" app:destination="@id/artistPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
<action <action
android:id="@+id/action_albumPageFragment_to_songListPageFragment" android:id="@+id/action_albumPageFragment_to_songListPageFragment"
app:destination="@id/songListPageFragment" app:destination="@id/songListPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/songListPageFragment" android:id="@+id/songListPageFragment"
@ -256,9 +199,7 @@
tools:layout="@layout/fragment_album_list_page"> tools:layout="@layout/fragment_album_list_page">
<action <action
android:id="@+id/action_albumListPageFragment_to_albumPageFragment" android:id="@+id/action_albumListPageFragment_to_albumPageFragment"
app:destination="@id/albumPageFragment" app:destination="@id/albumPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/artistListPageFragment" android:id="@+id/artistListPageFragment"
@ -267,9 +208,7 @@
tools:layout="@layout/fragment_artist_list_page"> tools:layout="@layout/fragment_artist_list_page">
<action <action
android:id="@+id/action_artistListPageFragment_to_artistPageFragment" android:id="@+id/action_artistListPageFragment_to_artistPageFragment"
app:destination="@id/artistPageFragment" app:destination="@id/artistPageFragment" />
app:enterAnim="@anim/nav_default_pop_enter_anim"
app:exitAnim="@anim/nav_default_pop_exit_anim"/>
</fragment> </fragment>
<fragment <fragment
android:id="@+id/playlistPageFragment" android:id="@+id/playlistPageFragment"