Commit dd6cbd11 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Move view classes to org.videolan.vlc.gui.view

parent 1f430efe
......@@ -29,7 +29,7 @@ import org.videolan.vlc.MediaLibrary;
import org.videolan.vlc.MediaWrapper;
import org.videolan.vlc.PlaybackService;
import org.videolan.vlc.R;
import org.videolan.vlc.gui.DividerItemDecoration;
import org.videolan.vlc.gui.view.DividerItemDecoration;
import org.videolan.vlc.gui.preferences.PreferencesActivity;
import org.videolan.vlc.gui.audio.AudioUtil;
import org.videolan.vlc.gui.audio.MediaComparators;
......
......@@ -7,7 +7,7 @@
<include layout="@layout/tab_layout" />
<org.videolan.vlc.widget.SwipeRefreshLayout
<org.videolan.vlc.gui.view.SwipeRefreshLayout
android:id="@+id/swipeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -47,7 +47,7 @@
android:nextFocusRight="@id/songs"
style="@style/Theme.VLC.List" />
</android.support.v4.view.ViewPager>
</org.videolan.vlc.widget.SwipeRefreshLayout>
</org.videolan.vlc.gui.view.SwipeRefreshLayout>
<include layout="@layout/shadow_top"
android:layout_width="match_parent"
......
......@@ -17,7 +17,7 @@
android:textSize="20sp"
android:visibility="gone" />
<org.videolan.vlc.widget.SwipeRefreshLayout
<org.videolan.vlc.gui.view.SwipeRefreshLayout
android:id="@+id/swipeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -93,7 +93,7 @@
android:nextFocusLeft="@id/genres_list"
android:nextFocusRight="@+id/playlists_list" />
</android.support.v4.view.ViewPager>
</org.videolan.vlc.widget.SwipeRefreshLayout>
</org.videolan.vlc.gui.view.SwipeRefreshLayout>
<include layout="@layout/shadow_top"
android:layout_width="match_parent"
......
......@@ -41,7 +41,7 @@
android:contentDescription="@string/play_as_audio"
android:src="?attr/ic_playasaudio_off" />
<org.videolan.vlc.gui.audio.widget.HeaderMediaSwitcher
<org.videolan.vlc.gui.view.HeaderMediaSwitcher
android:id="@+id/audio_media_switcher"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
......@@ -132,7 +132,7 @@
android:clipToPadding="false"
android:paddingBottom="@dimen/listview_bottom_padding" />
<org.videolan.vlc.gui.audio.widget.CoverMediaSwitcher
<org.videolan.vlc.gui.view.CoverMediaSwitcher
android:id="@+id/cover_media_switcher"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
......
......@@ -4,14 +4,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.videolan.vlc.widget.SwipeRefreshLayout
<org.videolan.vlc.gui.view.SwipeRefreshLayout
android:id="@+id/swipeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.videolan.vlc.widget.ContextMenuRecyclerView
<org.videolan.vlc.gui.view.ContextMenuRecyclerView
android:id="@+id/network_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -23,7 +23,7 @@
android:gravity="center"
android:text="@string/network_connection_needed"/>
</FrameLayout>
</org.videolan.vlc.widget.SwipeRefreshLayout>
</org.videolan.vlc.gui.view.SwipeRefreshLayout>
<include layout="@layout/shadow_top"/>
......
......@@ -6,7 +6,7 @@
android:orientation="vertical" >
<!-- Be careful: the view is rotated by 90 degrees. -->
<org.videolan.vlc.widget.VerticalSeekBar
<org.videolan.vlc.gui.view.VerticalSeekBar
android:id="@+id/equalizer_seek"
android:layout_width="wrap_content"
android:layout_height="0dp"
......
<?xml version="1.0" encoding="utf-8"?>
<org.videolan.vlc.widget.SwipeRefreshLayout
<org.videolan.vlc.gui.view.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swipeLayout"
android:layout_width="@dimen/file_picker_width"
......@@ -8,7 +8,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.videolan.vlc.widget.ContextMenuRecyclerView
<org.videolan.vlc.gui.view.ContextMenuRecyclerView
android:id="@+id/network_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -20,4 +20,4 @@
android:layout_gravity="center"
android:text="@string/network_connection_needed"/>
</FrameLayout>
</org.videolan.vlc.widget.SwipeRefreshLayout>
\ No newline at end of file
</org.videolan.vlc.gui.view.SwipeRefreshLayout>
\ No newline at end of file
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.videolan.vlc.widget.SwipeRefreshLayout
<org.videolan.vlc.gui.view.SwipeRefreshLayout
android:id="@+id/swipeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -25,7 +25,7 @@
android:paddingTop="30dip"
android:text="@string/nohistory"
android:textSize="20sp" />
</org.videolan.vlc.widget.SwipeRefreshLayout>
</org.videolan.vlc.gui.view.SwipeRefreshLayout>
<include layout="@layout/shadow_top"/>
</FrameLayout>
\ No newline at end of file
......@@ -2,7 +2,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<org.videolan.vlc.widget.HackyDrawerLayout
<org.videolan.vlc.gui.view.HackyDrawerLayout
android:id="@+id/root_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -20,7 +20,7 @@
android:layout_height="match_parent"
vlc:overhangSize="60dp" >
<org.videolan.vlc.widget.ContentLinearLayout
<org.videolan.vlc.gui.view.ContentLinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
......@@ -68,7 +68,7 @@
android:layout_width="fill_parent"
android:layout_height="60dp"
android:visibility="gone" />
</org.videolan.vlc.widget.ContentLinearLayout>
</org.videolan.vlc.gui.view.ContentLinearLayout>
<FrameLayout
android:id="@+id/audio_player"
......@@ -87,7 +87,7 @@
app:itemTextColor="?attr/navigationview_item_color"
app:itemIconTint="?attr/navigationview_item_color" />
</org.videolan.vlc.widget.HackyDrawerLayout>
</org.videolan.vlc.gui.view.HackyDrawerLayout>
<include layout="@layout/toolbar"/>
</merge>
......@@ -9,7 +9,7 @@
android:layout_height="match_parent"
vlc:overhangSize="60dp" >
<org.videolan.vlc.widget.ContentLinearLayout
<org.videolan.vlc.gui.view.ContentLinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
......@@ -30,7 +30,7 @@
android:layout_width="fill_parent"
android:layout_height="60dp"
android:visibility="gone" />
</org.videolan.vlc.widget.ContentLinearLayout>
</org.videolan.vlc.gui.view.ContentLinearLayout>
<FrameLayout
android:id="@+id/audio_player"
......
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.videolan.vlc.widget.SwipeRefreshLayout
<org.videolan.vlc.gui.view.SwipeRefreshLayout
android:id="@+id/swipeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -24,7 +24,7 @@
android:nextFocusDown="@id/android:list"
android:nextFocusLeft="@id/android:list"
android:nextFocusRight="@id/android:list" />
</org.videolan.vlc.widget.SwipeRefreshLayout>
</org.videolan.vlc.gui.view.SwipeRefreshLayout>
<LinearLayout
android:id="@id/android:empty"
......
......@@ -53,7 +53,7 @@ import org.videolan.vlc.gui.browser.MediaBrowserFragment;
import org.videolan.vlc.interfaces.IRefreshable;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.WeakHandler;
import org.videolan.vlc.widget.HackyDrawerLayout;
import org.videolan.vlc.gui.view.HackyDrawerLayout;
public class AudioPlayerContainerActivity extends AppCompatActivity implements PlaybackService.Client.Callback {
......
......@@ -39,7 +39,7 @@ import org.videolan.libvlc.util.AndroidUtil;
import org.videolan.vlc.R;
import org.videolan.vlc.gui.browser.MediaBrowserFragment;
import org.videolan.vlc.interfaces.IRefreshable;
import org.videolan.vlc.widget.SwipeRefreshLayout;
import org.videolan.vlc.gui.view.SwipeRefreshLayout;
public class HistoryFragment extends MediaBrowserFragment implements IRefreshable, SwipeRefreshLayout.OnRefreshListener, AdapterView.OnItemClickListener {
public final static String TAG = "VLC/HistoryFragment";
......
......@@ -79,7 +79,7 @@ import org.videolan.vlc.util.AndroidDevices;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.VLCInstance;
import org.videolan.vlc.util.WeakHandler;
import org.videolan.vlc.widget.HackyDrawerLayout;
import org.videolan.vlc.gui.view.HackyDrawerLayout;
public class MainActivity extends AudioPlayerContainerActivity implements SearchSuggestionsAdapter.SuggestionDisplay, FilterQueryProvider, NavigationView.OnNavigationItemSelectedListener {
public final static String TAG = "VLC/MainActivity";
......
......@@ -58,7 +58,7 @@ import org.videolan.vlc.gui.SecondaryActivity;
import org.videolan.vlc.util.AndroidDevices;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.WeakHandler;
import org.videolan.vlc.widget.SwipeRefreshLayout;
import org.videolan.vlc.gui.view.SwipeRefreshLayout;
import java.io.File;
import java.util.ArrayList;
......
......@@ -65,7 +65,7 @@ import org.videolan.vlc.util.AndroidDevices;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.VLCInstance;
import org.videolan.vlc.util.WeakHandler;
import org.videolan.vlc.widget.SwipeRefreshLayout;
import org.videolan.vlc.gui.view.SwipeRefreshLayout;
import java.io.File;
import java.util.ArrayList;
......
......@@ -57,14 +57,14 @@ import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.gui.AudioPlayerContainerActivity;
import org.videolan.vlc.gui.PlaybackServiceFragment;
import org.videolan.vlc.gui.SwipeDragItemTouchHelperCallback;
import org.videolan.vlc.gui.audio.widget.CoverMediaSwitcher;
import org.videolan.vlc.gui.audio.widget.HeaderMediaSwitcher;
import org.videolan.vlc.gui.view.CoverMediaSwitcher;
import org.videolan.vlc.gui.view.HeaderMediaSwitcher;
import org.videolan.vlc.gui.dialogs.AdvOptionsDialog;
import org.videolan.vlc.gui.dialogs.SavePlaylistDialog;
import org.videolan.vlc.gui.preferences.PreferencesActivity;
import org.videolan.vlc.util.Strings;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.widget.AudioMediaSwitcher.AudioMediaSwitcherListener;
import org.videolan.vlc.gui.view.AudioMediaSwitcher.AudioMediaSwitcherListener;
import java.util.ArrayList;
import java.util.List;
......
......@@ -43,7 +43,7 @@ import org.videolan.vlc.R;
import org.videolan.vlc.gui.PlaybackServiceFragment;
import org.videolan.vlc.interfaces.OnEqualizerBarChangeListener;
import org.videolan.vlc.util.VLCOptions;
import org.videolan.vlc.widget.EqualizerBar;
import org.videolan.vlc.gui.view.EqualizerBar;
public class EqualizerFragment extends PlaybackServiceFragment {
......
......@@ -51,7 +51,7 @@ import org.videolan.libvlc.util.MediaBrowser;
import org.videolan.vlc.MediaWrapper;
import org.videolan.vlc.R;
import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.gui.DividerItemDecoration;
import org.videolan.vlc.gui.view.DividerItemDecoration;
import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.gui.SecondaryActivity;
import org.videolan.vlc.gui.dialogs.CommonDialogs;
......@@ -61,8 +61,8 @@ import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.VLCInstance;
import org.videolan.vlc.util.VLCRunnable;
import org.videolan.vlc.util.WeakHandler;
import org.videolan.vlc.widget.ContextMenuRecyclerView;
import org.videolan.vlc.widget.SwipeRefreshLayout;
import org.videolan.vlc.gui.view.ContextMenuRecyclerView;
import org.videolan.vlc.gui.view.SwipeRefreshLayout;
import java.util.ArrayList;
......
......@@ -27,7 +27,7 @@ import android.support.v7.app.AppCompatActivity;
import org.videolan.vlc.MediaLibrary;
import org.videolan.vlc.gui.PlaybackServiceFragment;
import org.videolan.vlc.widget.SwipeRefreshLayout;
import org.videolan.vlc.gui.view.SwipeRefreshLayout;
public abstract class MediaBrowserFragment extends PlaybackServiceFragment {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment