![ryan.harg@mailbox.org](/assets/img/avatar_default.png)
78 changed files with 445 additions and 400 deletions
@ -1 +1 @@ |
|||||||
-keep class com.github.apognu.otter.** { *; } |
-keep class org.funkwhale.ffa.** { *; } |
||||||
|
@ -1,15 +1,15 @@ |
|||||||
package com.github.apognu.otter.adapters |
package org.funkwhale.ffa.adapters |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import android.view.LayoutInflater |
import android.view.LayoutInflater |
||||||
import android.view.View |
import android.view.View |
||||||
import android.view.ViewGroup |
import android.view.ViewGroup |
||||||
import androidx.recyclerview.widget.RecyclerView |
import androidx.recyclerview.widget.RecyclerView |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.fragments.OtterAdapter |
import org.funkwhale.ffa.fragments.OtterAdapter |
||||||
import com.github.apognu.otter.utils.Album |
import org.funkwhale.ffa.utils.Album |
||||||
import com.github.apognu.otter.utils.maybeLoad |
import org.funkwhale.ffa.utils.maybeLoad |
||||||
import com.github.apognu.otter.utils.maybeNormalizeUrl |
import org.funkwhale.ffa.utils.maybeNormalizeUrl |
||||||
import com.squareup.picasso.Picasso |
import com.squareup.picasso.Picasso |
||||||
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation |
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation |
||||||
import kotlinx.android.synthetic.main.row_album.view.* |
import kotlinx.android.synthetic.main.row_album.view.* |
@ -1,15 +1,15 @@ |
|||||||
package com.github.apognu.otter.adapters |
package org.funkwhale.ffa.adapters |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import android.view.LayoutInflater |
import android.view.LayoutInflater |
||||||
import android.view.View |
import android.view.View |
||||||
import android.view.ViewGroup |
import android.view.ViewGroup |
||||||
import androidx.recyclerview.widget.RecyclerView |
import androidx.recyclerview.widget.RecyclerView |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.fragments.OtterAdapter |
import org.funkwhale.ffa.fragments.OtterAdapter |
||||||
import com.github.apognu.otter.utils.Album |
import org.funkwhale.ffa.utils.Album |
||||||
import com.github.apognu.otter.utils.maybeLoad |
import org.funkwhale.ffa.utils.maybeLoad |
||||||
import com.github.apognu.otter.utils.maybeNormalizeUrl |
import org.funkwhale.ffa.utils.maybeNormalizeUrl |
||||||
import com.squareup.picasso.Picasso |
import com.squareup.picasso.Picasso |
||||||
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation |
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation |
||||||
import kotlinx.android.synthetic.main.row_album_grid.view.* |
import kotlinx.android.synthetic.main.row_album_grid.view.* |
@ -1,15 +1,15 @@ |
|||||||
package com.github.apognu.otter.adapters |
package org.funkwhale.ffa.adapters |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import android.view.LayoutInflater |
import android.view.LayoutInflater |
||||||
import android.view.View |
import android.view.View |
||||||
import android.view.ViewGroup |
import android.view.ViewGroup |
||||||
import androidx.recyclerview.widget.RecyclerView |
import androidx.recyclerview.widget.RecyclerView |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.fragments.OtterAdapter |
import org.funkwhale.ffa.fragments.OtterAdapter |
||||||
import com.github.apognu.otter.utils.Artist |
import org.funkwhale.ffa.utils.Artist |
||||||
import com.github.apognu.otter.utils.maybeLoad |
import org.funkwhale.ffa.utils.maybeLoad |
||||||
import com.github.apognu.otter.utils.maybeNormalizeUrl |
import org.funkwhale.ffa.utils.maybeNormalizeUrl |
||||||
import com.squareup.picasso.Picasso |
import com.squareup.picasso.Picasso |
||||||
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation |
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation |
||||||
import kotlinx.android.synthetic.main.row_artist.view.* |
import kotlinx.android.synthetic.main.row_artist.view.* |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.adapters |
package org.funkwhale.ffa.adapters |
||||||
|
|
||||||
import androidx.fragment.app.Fragment |
import androidx.fragment.app.Fragment |
||||||
import androidx.fragment.app.FragmentManager |
import androidx.fragment.app.FragmentManager |
||||||
import androidx.fragment.app.FragmentPagerAdapter |
import androidx.fragment.app.FragmentPagerAdapter |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.fragments.* |
import org.funkwhale.ffa.fragments.* |
||||||
|
|
||||||
class BrowseTabsAdapter(val context: Fragment, manager: FragmentManager) : FragmentPagerAdapter(manager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { |
class BrowseTabsAdapter(val context: Fragment, manager: FragmentManager) : FragmentPagerAdapter(manager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { |
||||||
var tabs = mutableListOf<Fragment>() |
var tabs = mutableListOf<Fragment>() |
@ -1,17 +1,17 @@ |
|||||||
package com.github.apognu.otter.adapters |
package org.funkwhale.ffa.adapters |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import android.view.LayoutInflater |
import android.view.LayoutInflater |
||||||
import android.view.View |
import android.view.View |
||||||
import android.view.ViewGroup |
import android.view.ViewGroup |
||||||
import androidx.recyclerview.widget.RecyclerView |
import androidx.recyclerview.widget.RecyclerView |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.fragments.OtterAdapter |
import org.funkwhale.ffa.fragments.OtterAdapter |
||||||
import com.github.apognu.otter.utils.AppContext |
import org.funkwhale.ffa.utils.AppContext |
||||||
import com.github.apognu.otter.utils.Event |
import org.funkwhale.ffa.utils.Event |
||||||
import com.github.apognu.otter.utils.EventBus |
import org.funkwhale.ffa.utils.EventBus |
||||||
import com.github.apognu.otter.utils.Radio |
import org.funkwhale.ffa.utils.Radio |
||||||
import com.github.apognu.otter.views.LoadingImageView |
import org.funkwhale.ffa.views.LoadingImageView |
||||||
import com.preference.PowerPreference |
import com.preference.PowerPreference |
||||||
import kotlinx.android.synthetic.main.row_radio.view.* |
import kotlinx.android.synthetic.main.row_radio.view.* |
||||||
import kotlinx.android.synthetic.main.row_radio_header.view.* |
import kotlinx.android.synthetic.main.row_radio_header.view.* |
@ -1,12 +1,12 @@ |
|||||||
package com.github.apognu.otter.fragments |
package org.funkwhale.ffa.fragments |
||||||
|
|
||||||
import android.os.Bundle |
import android.os.Bundle |
||||||
import android.view.LayoutInflater |
import android.view.LayoutInflater |
||||||
import android.view.View |
import android.view.View |
||||||
import android.view.ViewGroup |
import android.view.ViewGroup |
||||||
import androidx.fragment.app.Fragment |
import androidx.fragment.app.Fragment |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.adapters.BrowseTabsAdapter |
import org.funkwhale.ffa.adapters.BrowseTabsAdapter |
||||||
import kotlinx.android.synthetic.main.fragment_browse.view.* |
import kotlinx.android.synthetic.main.fragment_browse.view.* |
||||||
|
|
||||||
class BrowseFragment : Fragment() { |
class BrowseFragment : Fragment() { |
@ -1,13 +1,13 @@ |
|||||||
package com.github.apognu.otter.fragments |
package org.funkwhale.ffa.fragments |
||||||
|
|
||||||
import android.os.Bundle |
import android.os.Bundle |
||||||
import androidx.lifecycle.lifecycleScope |
import androidx.lifecycle.lifecycleScope |
||||||
import androidx.recyclerview.widget.RecyclerView |
import androidx.recyclerview.widget.RecyclerView |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.adapters.FavoritesAdapter |
import org.funkwhale.ffa.adapters.FavoritesAdapter |
||||||
import com.github.apognu.otter.repositories.FavoritesRepository |
import org.funkwhale.ffa.repositories.FavoritesRepository |
||||||
import com.github.apognu.otter.repositories.TracksRepository |
import org.funkwhale.ffa.repositories.TracksRepository |
||||||
import com.github.apognu.otter.utils.* |
import org.funkwhale.ffa.utils.* |
||||||
import com.google.android.exoplayer2.offline.Download |
import com.google.android.exoplayer2.offline.Download |
||||||
import kotlinx.android.synthetic.main.fragment_favorites.* |
import kotlinx.android.synthetic.main.fragment_favorites.* |
||||||
import kotlinx.coroutines.Dispatchers.IO |
import kotlinx.coroutines.Dispatchers.IO |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.fragments |
package org.funkwhale.ffa.fragments |
||||||
|
|
||||||
import android.app.AlertDialog |
import android.app.AlertDialog |
||||||
import android.app.Dialog |
import android.app.Dialog |
||||||
import android.os.Bundle |
import android.os.Bundle |
||||||
import androidx.fragment.app.DialogFragment |
import androidx.fragment.app.DialogFragment |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
|
|
||||||
class LoginDialog : DialogFragment() { |
class LoginDialog : DialogFragment() { |
||||||
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { |
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { |
@ -1,13 +1,13 @@ |
|||||||
package com.github.apognu.otter.fragments |
package org.funkwhale.ffa.fragments |
||||||
|
|
||||||
import android.os.Bundle |
import android.os.Bundle |
||||||
import androidx.core.view.forEach |
import androidx.core.view.forEach |
||||||
import androidx.lifecycle.lifecycleScope |
import androidx.lifecycle.lifecycleScope |
||||||
import androidx.recyclerview.widget.RecyclerView |
import androidx.recyclerview.widget.RecyclerView |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.adapters.RadiosAdapter |
import org.funkwhale.ffa.adapters.RadiosAdapter |
||||||
import com.github.apognu.otter.repositories.RadiosRepository |
import org.funkwhale.ffa.repositories.RadiosRepository |
||||||
import com.github.apognu.otter.utils.* |
import org.funkwhale.ffa.utils.* |
||||||
import kotlinx.android.synthetic.main.fragment_radios.* |
import kotlinx.android.synthetic.main.fragment_radios.* |
||||||
import kotlinx.coroutines.Dispatchers.Main |
import kotlinx.coroutines.Dispatchers.Main |
||||||
import kotlinx.coroutines.flow.collect |
import kotlinx.coroutines.flow.collect |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.playback |
package org.funkwhale.ffa.playback |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.repositories.FavoritedRepository |
import org.funkwhale.ffa.repositories.FavoritedRepository |
||||||
import com.github.apognu.otter.repositories.Repository |
import org.funkwhale.ffa.repositories.Repository |
||||||
import com.github.apognu.otter.utils.* |
import org.funkwhale.ffa.utils.* |
||||||
import com.github.kittinunf.fuel.Fuel |
import com.github.kittinunf.fuel.Fuel |
||||||
import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult |
import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult |
||||||
import com.github.kittinunf.fuel.coroutines.awaitObjectResult |
import com.github.kittinunf.fuel.coroutines.awaitObjectResult |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.repositories |
package org.funkwhale.ffa.repositories |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.utils.Album |
import org.funkwhale.ffa.utils.Album |
||||||
import com.github.apognu.otter.utils.AlbumsCache |
import org.funkwhale.ffa.utils.AlbumsCache |
||||||
import com.github.apognu.otter.utils.AlbumsResponse |
import org.funkwhale.ffa.utils.AlbumsResponse |
||||||
import com.github.apognu.otter.utils.OtterResponse |
import org.funkwhale.ffa.utils.OtterResponse |
||||||
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
||||||
import com.google.gson.reflect.TypeToken |
import com.google.gson.reflect.TypeToken |
||||||
import java.io.BufferedReader |
import java.io.BufferedReader |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.repositories |
package org.funkwhale.ffa.repositories |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.utils.OtterResponse |
import org.funkwhale.ffa.utils.OtterResponse |
||||||
import com.github.apognu.otter.utils.Track |
import org.funkwhale.ffa.utils.Track |
||||||
import com.github.apognu.otter.utils.TracksCache |
import org.funkwhale.ffa.utils.TracksCache |
||||||
import com.github.apognu.otter.utils.TracksResponse |
import org.funkwhale.ffa.utils.TracksResponse |
||||||
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
||||||
import com.google.gson.reflect.TypeToken |
import com.google.gson.reflect.TypeToken |
||||||
import java.io.BufferedReader |
import java.io.BufferedReader |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.repositories |
package org.funkwhale.ffa.repositories |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.utils.Artist |
import org.funkwhale.ffa.utils.Artist |
||||||
import com.github.apognu.otter.utils.ArtistsCache |
import org.funkwhale.ffa.utils.ArtistsCache |
||||||
import com.github.apognu.otter.utils.ArtistsResponse |
import org.funkwhale.ffa.utils.ArtistsResponse |
||||||
import com.github.apognu.otter.utils.OtterResponse |
import org.funkwhale.ffa.utils.OtterResponse |
||||||
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
||||||
import com.google.gson.reflect.TypeToken |
import com.google.gson.reflect.TypeToken |
||||||
import java.io.BufferedReader |
import java.io.BufferedReader |
@ -1,7 +1,7 @@ |
|||||||
package com.github.apognu.otter.repositories |
package org.funkwhale.ffa.repositories |
||||||
|
|
||||||
import android.net.Uri |
import android.net.Uri |
||||||
import com.github.apognu.otter.utils.* |
import org.funkwhale.ffa.utils.* |
||||||
import com.github.kittinunf.fuel.Fuel |
import com.github.kittinunf.fuel.Fuel |
||||||
import com.github.kittinunf.fuel.core.FuelError |
import com.github.kittinunf.fuel.core.FuelError |
||||||
import com.github.kittinunf.fuel.core.ResponseDeserializable |
import com.github.kittinunf.fuel.core.ResponseDeserializable |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.repositories |
package org.funkwhale.ffa.repositories |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.utils.OtterResponse |
import org.funkwhale.ffa.utils.OtterResponse |
||||||
import com.github.apognu.otter.utils.PlaylistTrack |
import org.funkwhale.ffa.utils.PlaylistTrack |
||||||
import com.github.apognu.otter.utils.PlaylistTracksCache |
import org.funkwhale.ffa.utils.PlaylistTracksCache |
||||||
import com.github.apognu.otter.utils.PlaylistTracksResponse |
import org.funkwhale.ffa.utils.PlaylistTracksResponse |
||||||
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
||||||
import com.google.gson.reflect.TypeToken |
import com.google.gson.reflect.TypeToken |
||||||
import kotlinx.coroutines.flow.map |
import kotlinx.coroutines.flow.map |
@ -1,7 +1,7 @@ |
|||||||
package com.github.apognu.otter.repositories |
package org.funkwhale.ffa.repositories |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.utils.* |
import org.funkwhale.ffa.utils.* |
||||||
import com.github.kittinunf.fuel.Fuel |
import com.github.kittinunf.fuel.Fuel |
||||||
import com.github.kittinunf.fuel.coroutines.awaitByteArrayResponseResult |
import com.github.kittinunf.fuel.coroutines.awaitByteArrayResponseResult |
||||||
import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult |
import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.repositories |
package org.funkwhale.ffa.repositories |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.utils.OtterResponse |
import org.funkwhale.ffa.utils.OtterResponse |
||||||
import com.github.apognu.otter.utils.Radio |
import org.funkwhale.ffa.utils.Radio |
||||||
import com.github.apognu.otter.utils.RadiosCache |
import org.funkwhale.ffa.utils.RadiosCache |
||||||
import com.github.apognu.otter.utils.RadiosResponse |
import org.funkwhale.ffa.utils.RadiosResponse |
||||||
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
import com.github.kittinunf.fuel.gson.gsonDeserializerOf |
||||||
import com.google.gson.reflect.TypeToken |
import com.google.gson.reflect.TypeToken |
||||||
import java.io.BufferedReader |
import java.io.BufferedReader |
@ -1,9 +1,9 @@ |
|||||||
package com.github.apognu.otter.repositories |
package org.funkwhale.ffa.repositories |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.utils.AppContext |
import org.funkwhale.ffa.utils.AppContext |
||||||
import com.github.apognu.otter.utils.Cache |
import org.funkwhale.ffa.utils.Cache |
||||||
import com.github.apognu.otter.utils.CacheItem |
import org.funkwhale.ffa.utils.CacheItem |
||||||
import kotlinx.coroutines.CoroutineScope |
import kotlinx.coroutines.CoroutineScope |
||||||
import kotlinx.coroutines.Dispatchers.IO |
import kotlinx.coroutines.Dispatchers.IO |
||||||
import kotlinx.coroutines.Job |
import kotlinx.coroutines.Job |
@ -1,7 +1,7 @@ |
|||||||
package com.github.apognu.otter.utils |
package org.funkwhale.ffa.utils |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import com.github.apognu.otter.activities.FwCredentials |
import org.funkwhale.ffa.activities.FwCredentials |
||||||
import com.github.kittinunf.fuel.Fuel |
import com.github.kittinunf.fuel.Fuel |
||||||
import com.github.kittinunf.fuel.core.FuelError |
import com.github.kittinunf.fuel.core.FuelError |
||||||
import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult |
import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult |
@ -1,10 +1,10 @@ |
|||||||
package com.github.apognu.otter.utils |
package org.funkwhale.ffa.utils |
||||||
|
|
||||||
import android.os.Build |
import android.os.Build |
||||||
import androidx.fragment.app.Fragment |
import androidx.fragment.app.Fragment |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
import com.github.apognu.otter.fragments.BrowseFragment |
import org.funkwhale.ffa.fragments.BrowseFragment |
||||||
import com.github.apognu.otter.repositories.Repository |
import org.funkwhale.ffa.repositories.Repository |
||||||
import com.github.kittinunf.fuel.core.Request |
import com.github.kittinunf.fuel.core.Request |
||||||
import com.google.android.exoplayer2.offline.Download |
import com.google.android.exoplayer2.offline.Download |
||||||
import com.google.gson.Gson |
import com.google.gson.Gson |
@ -1,4 +1,4 @@ |
|||||||
package com.github.apognu.otter.utils |
package org.funkwhale.ffa.utils |
||||||
|
|
||||||
import com.google.android.exoplayer2.offline.Download |
import com.google.android.exoplayer2.offline.Download |
||||||
import com.preference.PowerPreference |
import com.preference.PowerPreference |
@ -1,4 +1,4 @@ |
|||||||
package com.github.apognu.otter.utils |
package org.funkwhale.ffa.utils |
||||||
|
|
||||||
import com.github.kittinunf.fuel.Fuel |
import com.github.kittinunf.fuel.Fuel |
||||||
import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult |
import com.github.kittinunf.fuel.coroutines.awaitObjectResponseResult |
@ -1,4 +1,4 @@ |
|||||||
package com.github.apognu.otter.views |
package org.funkwhale.ffa.views |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import android.util.AttributeSet |
import android.util.AttributeSet |
@ -1,11 +1,11 @@ |
|||||||
package com.github.apognu.otter.views |
package org.funkwhale.ffa.views |
||||||
|
|
||||||
import android.animation.ObjectAnimator |
import android.animation.ObjectAnimator |
||||||
import android.content.Context |
import android.content.Context |
||||||
import android.graphics.drawable.Drawable |
import android.graphics.drawable.Drawable |
||||||
import android.view.View |
import android.view.View |
||||||
import android.widget.ImageView |
import android.widget.ImageView |
||||||
import com.github.apognu.otter.R |
import org.funkwhale.ffa.R |
||||||
|
|
||||||
object LoadingImageView { |
object LoadingImageView { |
||||||
fun start(context: Context?, image: ImageView): ObjectAnimator? { |
fun start(context: Context?, image: ImageView): ObjectAnimator? { |
@ -1,4 +1,4 @@ |
|||||||
package com.github.apognu.otter.views |
package org.funkwhale.ffa.views |
||||||
|
|
||||||
import android.content.Context |
import android.content.Context |
||||||
import android.util.AttributeSet |
import android.util.AttributeSet |
Loading…
Reference in new issue