From 81073375660fe09dfa312858e8c7d9c82902c5cc Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 2 Aug 2016 21:17:54 +0200
Subject: [PATCH] restructure ui

---
 app/src/main/AndroidManifest.xml                      |  4 ++--
 app/src/main/java/org/schabi/newpipe/App.java         |  4 ++--
 .../main/java/org/schabi/newpipe/MainActivity.java    |  5 +----
 .../org/schabi/newpipe/StreamInfoItemViewCreator.java |  2 ++
 .../schabi/newpipe/{ => detail}/ActionBarHandler.java |  5 +++--
 .../newpipe/{ => detail}/VideoItemDetailActivity.java |  5 ++++-
 .../newpipe/{ => detail}/VideoItemDetailFragment.java | 11 +++++++++--
 .../org/schabi/newpipe/download/DownloadDialog.java   |  1 -
 .../org/schabi/newpipe/download/MainActivity.java     |  4 +---
 .../services/youtube/YoutubeSearchEngine.java         |  1 -
 .../org/schabi/newpipe/player/BackgroundPlayer.java   |  4 ++--
 .../search_fragment/SearchInfoItemFragment.java       |  5 ++---
 .../newpipe/{ => settings}/NewPipeSettings.java       |  4 +++-
 .../newpipe/{ => settings}/SettingsActivity.java      |  9 +++------
 .../newpipe/{ => settings}/SettingsFragment.java      |  5 ++++-
 .../us/shandian/giga/get/DownloadManagerImpl.java     |  2 +-
 .../shandian/giga/service/DownloadManagerService.java |  2 +-
 app/src/main/java/us/shandian/giga/util/Utility.java  |  3 +--
 .../main/res/layout-v18/fragment_videoitem_detail.xml |  2 +-
 app/src/main/res/layout/activity_videoitem_detail.xml |  2 +-
 app/src/main/res/layout/fragment_videoitem_detail.xml |  2 +-
 app/src/main/res/layout/main_bg.xml                   |  2 +-
 22 files changed, 45 insertions(+), 39 deletions(-)
 rename app/src/main/java/org/schabi/newpipe/{ => detail}/ActionBarHandler.java (98%)
 rename app/src/main/java/org/schabi/newpipe/{ => detail}/VideoItemDetailActivity.java (98%)
 rename app/src/main/java/org/schabi/newpipe/{ => detail}/VideoItemDetailFragment.java (99%)
 rename app/src/main/java/org/schabi/newpipe/{ => settings}/NewPipeSettings.java (98%)
 rename app/src/main/java/org/schabi/newpipe/{ => settings}/SettingsActivity.java (96%)
 rename app/src/main/java/org/schabi/newpipe/{ => settings}/SettingsFragment.java (99%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2e4a502f..f2bb0e715 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".VideoItemDetailActivity"
+            android:name=".detail.VideoItemDetailActivity"
             android:label="@string/title_videoitem_detail"
             android:theme="@style/AppTheme">
             <meta-data
@@ -112,7 +112,7 @@
             android:label="@string/background_player_name" />
 
         <activity
-            android:name=".SettingsActivity"
+            android:name=".settings.SettingsActivity"
             android:label="@string/settings_activity_title" />
         <activity
             android:name=".PanicResponderActivity"
diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index c56893fc8..f0604f16f 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -2,12 +2,12 @@ package org.schabi.newpipe;
 
 import android.app.Application;
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 
+import org.schabi.newpipe.settings.SettingsActivity;
+
 import info.guardianproject.netcipher.NetCipher;
 import info.guardianproject.netcipher.proxy.OrbotHelper;
 
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 634b12e15..e8f7189a4 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -6,14 +6,11 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import org.schabi.newpipe.extractor.ServiceList;
-
-import java.util.Vector;
+import org.schabi.newpipe.settings.SettingsActivity;
 
 /**
  * Created by Christian Schabesberger on 02.08.16.
diff --git a/app/src/main/java/org/schabi/newpipe/StreamInfoItemViewCreator.java b/app/src/main/java/org/schabi/newpipe/StreamInfoItemViewCreator.java
index ec2463a99..1aba6aa1f 100644
--- a/app/src/main/java/org/schabi/newpipe/StreamInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/StreamInfoItemViewCreator.java
@@ -13,6 +13,8 @@ import android.widget.TextView;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.extractor.AbstractVideoInfo;
 import org.schabi.newpipe.extractor.StreamPreviewInfo;
 
diff --git a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java b/app/src/main/java/org/schabi/newpipe/detail/ActionBarHandler.java
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
rename to app/src/main/java/org/schabi/newpipe/detail/ActionBarHandler.java
index 80c149885..feed040d1 100644
--- a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/ActionBarHandler.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.detail;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -11,8 +11,9 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;
 
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.StreamInfo;
 import org.schabi.newpipe.extractor.VideoStream;
 
 import java.util.List;
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
rename to app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
index dc073de57..04649bf4d 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.detail;
 
 import android.content.Intent;
 import android.media.AudioManager;
@@ -11,6 +11,9 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
similarity index 99%
rename from app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
rename to app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
index 3adaa3cf8..60e4610d3 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.detail;
 
 import android.app.Activity;
 import android.content.Context;
@@ -46,7 +46,14 @@ import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import java.util.ArrayList;
 import java.util.Vector;
 
-
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.ChannelActivity;
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.ErrorActivity;
+import org.schabi.newpipe.ImageErrorLoadingListener;
+import org.schabi.newpipe.Localization;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.StreamInfoItemViewCreator;
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.AudioStream;
 import org.schabi.newpipe.extractor.MediaFormat;
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index b9c5a7439..c7018ae1d 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -25,7 +25,6 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import org.schabi.newpipe.App;
-import org.schabi.newpipe.NewPipeSettings;
 import org.schabi.newpipe.R;
 
 import java.io.File;
diff --git a/app/src/main/java/org/schabi/newpipe/download/MainActivity.java b/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
index a3075f2e8..a62d645f7 100644
--- a/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/MainActivity.java
@@ -8,14 +8,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -30,7 +28,7 @@ import android.widget.Toast;
 
 import org.schabi.newpipe.ErrorActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.SettingsActivity;
+import org.schabi.newpipe.settings.SettingsActivity;
 
 import java.io.File;
 import java.util.Vector;
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index 547635097..5e84eac77 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -91,7 +91,6 @@ public class YoutubeSearchEngine extends SearchEngine {
             site = downloader.download(url);
         }
 
-
         Document doc = Jsoup.parse(site, url);
         Element list = doc.select("ol[class=\"item-section\"]").first();
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
index e283d5e05..5b4f246d0 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -23,8 +23,8 @@ import android.widget.Toast;
 import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.VideoItemDetailActivity;
-import org.schabi.newpipe.VideoItemDetailFragment;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
index 07198b3ce..746836111 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
@@ -15,13 +15,12 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import org.schabi.newpipe.ErrorActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.VideoItemDetailActivity;
-import org.schabi.newpipe.VideoItemDetailFragment;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.extractor.SearchResult;
 import org.schabi.newpipe.extractor.ServiceList;
 
diff --git a/app/src/main/java/org/schabi/newpipe/NewPipeSettings.java b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/NewPipeSettings.java
rename to app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
index 6a8cd7e84..0c3d29e59 100644
--- a/app/src/main/java/org/schabi/newpipe/NewPipeSettings.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java
@@ -18,7 +18,7 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.schabi.newpipe;
+package org.schabi.newpipe.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -26,6 +26,8 @@ import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 
+import org.schabi.newpipe.R;
+
 import java.io.File;
 
 import us.shandian.giga.util.Utility;
diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/SettingsActivity.java
rename to app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index 3eb982f06..e62f90c45 100644
--- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -1,13 +1,8 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.settings;
 
-import android.app.Activity;
-import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.annotation.LayoutRes;
@@ -19,6 +14,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.schabi.newpipe.R;
+
 
 /**
  * Created by Christian Schabesberger on 31.08.15.
diff --git a/app/src/main/java/org/schabi/newpipe/SettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
similarity index 99%
rename from app/src/main/java/org/schabi/newpipe/SettingsFragment.java
rename to app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
index be44e164a..401cef551 100644
--- a/app/src/main/java/org/schabi/newpipe/SettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.settings;
 
 import android.app.Activity;
 import android.content.ClipData;
@@ -16,6 +16,9 @@ import android.preference.PreferenceScreen;
 
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.R;
+
 import java.util.ArrayList;
 
 import info.guardianproject.netcipher.proxy.OrbotHelper;
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
index 2dc123ce8..558602ca3 100755
--- a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
@@ -5,7 +5,7 @@ import android.util.Log;
 
 import com.google.gson.Gson;
 
-import org.schabi.newpipe.NewPipeSettings;
+import org.schabi.newpipe.settings.NewPipeSettings;
 
 import java.io.File;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index f28c2d19f..ca85ae727 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -14,7 +14,7 @@ import android.os.Message;
 import android.support.v4.app.NotificationCompat.Builder;
 import android.util.Log;
 
-import org.schabi.newpipe.NewPipeSettings;
+import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.R;
 import us.shandian.giga.get.DownloadManager;
 import us.shandian.giga.get.DownloadManagerImpl;
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index cdec3e03d..d38958b4b 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -17,9 +17,8 @@ import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.schabi.newpipe.NewPipeSettings;
+import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.R;
-import us.shandian.giga.get.DownloadMission;
 
 import com.nononsenseapps.filepicker.FilePickerActivity;
 import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
diff --git a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
index 78f52961d..62bd955a9 100644
--- a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
@@ -3,7 +3,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".VideoItemDetailFragment"
+    tools:context=".detail.VideoItemDetailFragment"
     android:textIsSelectable="true"
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_videoitem_detail.xml b/app/src/main/res/layout/activity_videoitem_detail.xml
index 4edf1611a..9edb96bcb 100644
--- a/app/src/main/res/layout/activity_videoitem_detail.xml
+++ b/app/src/main/res/layout/activity_videoitem_detail.xml
@@ -1,4 +1,4 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" android:id="@+id/videoitem_detail_container"
     android:layout_width="match_parent" android:layout_height="match_parent"
-    tools:context=".VideoItemDetailActivity" tools:ignore="MergeRootFrame" />
+    tools:context=".detail.VideoItemDetailActivity" tools:ignore="MergeRootFrame" />
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 1695bf441..3ba3168a2 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -3,7 +3,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".VideoItemDetailFragment"
+    tools:context=".detail.VideoItemDetailFragment"
     android:textIsSelectable="true"
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/main_bg.xml b/app/src/main/res/layout/main_bg.xml
index bfc722636..b1f3e0d4a 100644
--- a/app/src/main/res/layout/main_bg.xml
+++ b/app/src/main/res/layout/main_bg.xml
@@ -4,7 +4,7 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/mainBG"
-    tools:context=".VideoItemDetailActivity"
+    tools:context=".detail.VideoItemDetailActivity"
     tools:showIn="@layout/activity_videoitem_list">
 
     <TextView