From 5d81358c1518890e907653bce63c35a49e5fe7f2 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Sun, 22 Jan 2017 13:48:50 +0100 Subject: [PATCH] rename Themer to ThemableActivity --- app/src/main/java/org/schabi/newpipe/MainActivity.java | 10 +--------- .../newpipe/{Themer.java => ThemableActivity.java} | 2 +- .../schabi/newpipe/detail/VideoItemDetailActivity.java | 5 ++--- .../org/schabi/newpipe/download/DownloadActivity.java | 5 ++--- .../java/org/schabi/newpipe/report/ErrorActivity.java | 5 ++--- 5 files changed, 8 insertions(+), 19 deletions(-) rename app/src/main/java/org/schabi/newpipe/{Themer.java => ThemableActivity.java} (91%) diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index 9472d5903..0d6893ebe 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -1,24 +1,16 @@ package org.schabi.newpipe; -import android.app.Activity; import android.content.Intent; import android.media.AudioManager; -import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.support.v4.app.NavUtils; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import android.widget.Toast; -import org.schabi.newpipe.settings.NewPipeSettings; import org.schabi.newpipe.settings.SettingsActivity; -import java.util.Objects; -import java.util.prefs.Preferences; - /** * Created by Christian Schabesberger on 02.08.16. * @@ -39,7 +31,7 @@ import java.util.prefs.Preferences; * along with NewPipe. If not, see . */ -public class MainActivity extends Themer { +public class MainActivity extends ThemableActivity { private Fragment mainFragment = null; diff --git a/app/src/main/java/org/schabi/newpipe/Themer.java b/app/src/main/java/org/schabi/newpipe/ThemableActivity.java similarity index 91% rename from app/src/main/java/org/schabi/newpipe/Themer.java rename to app/src/main/java/org/schabi/newpipe/ThemableActivity.java index 048837cec..425801676 100644 --- a/app/src/main/java/org/schabi/newpipe/Themer.java +++ b/app/src/main/java/org/schabi/newpipe/ThemableActivity.java @@ -8,7 +8,7 @@ import java.util.Objects; import static org.schabi.newpipe.R.attr.theme; -public class Themer extends AppCompatActivity { +public class ThemableActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java index 05895fef4..e969ba2d5 100644 --- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java +++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java @@ -5,7 +5,6 @@ import android.media.AudioManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.NavUtils; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -14,7 +13,7 @@ import android.widget.Toast; import org.schabi.newpipe.App; import org.schabi.newpipe.MainActivity; import org.schabi.newpipe.R; -import org.schabi.newpipe.Themer; +import org.schabi.newpipe.ThemableActivity; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.StreamingService; @@ -40,7 +39,7 @@ import java.util.HashSet; * along with NewPipe. If not, see . */ -public class VideoItemDetailActivity extends Themer { +public class VideoItemDetailActivity extends ThemableActivity { /** * Removes invisible separators (\p{Z}) and punctuation characters including diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java index 2f77cadb2..e7ff154fe 100644 --- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java +++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java @@ -13,7 +13,6 @@ import android.os.IBinder; import android.preference.PreferenceManager; 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.view.LayoutInflater; import android.view.Menu; @@ -28,7 +27,7 @@ import android.widget.SeekBar; import android.widget.TextView; import android.widget.Toast; -import org.schabi.newpipe.Themer; +import org.schabi.newpipe.ThemableActivity; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.R; import org.schabi.newpipe.settings.SettingsActivity; @@ -43,7 +42,7 @@ import us.shandian.giga.ui.fragment.MissionsFragment; import us.shandian.giga.util.CrashHandler; import us.shandian.giga.util.Utility; -public class DownloadActivity extends Themer implements AdapterView.OnItemClickListener{ +public class DownloadActivity extends ThemableActivity implements AdapterView.OnItemClickListener{ public static final String INTENT_DOWNLOAD = "us.shandian.giga.intent.DOWNLOAD"; diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java index b87fa8af8..039ed8eaa 100644 --- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java +++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java @@ -14,7 +14,6 @@ import android.preference.PreferenceManager; import android.support.design.widget.Snackbar; import android.support.v4.app.NavUtils; import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.os.Handler; import android.util.Log; @@ -35,7 +34,7 @@ import org.schabi.newpipe.BuildConfig; import org.schabi.newpipe.Downloader; import org.schabi.newpipe.MainActivity; import org.schabi.newpipe.R; -import org.schabi.newpipe.Themer; +import org.schabi.newpipe.ThemableActivity; import org.schabi.newpipe.extractor.Parser; import java.io.PrintWriter; @@ -66,7 +65,7 @@ import java.util.Vector; * along with NewPipe. If not, see . */ -public class ErrorActivity extends Themer { +public class ErrorActivity extends ThemableActivity { public static class ErrorInfo implements Parcelable { public int userAction; public String request;