From 14ddf379885f5341fa75fdac9097a46193499f29 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Fri, 15 Jan 2021 12:13:47 +0530
Subject: [PATCH] Combine the two Constants files into one file.

---
 .../org/schabi/newpipe/util/Constants.java    | 17 ----------------
 .../java/org/schabi/newpipe/util/Constants.kt | 20 +++++++++++++++++++
 .../org/schabi/newpipe/util/ConstantsKt.kt    |  6 ------
 3 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/util/Constants.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/util/Constants.kt
 delete mode 100644 app/src/main/java/org/schabi/newpipe/util/ConstantsKt.kt

diff --git a/app/src/main/java/org/schabi/newpipe/util/Constants.java b/app/src/main/java/org/schabi/newpipe/util/Constants.java
deleted file mode 100644
index e71dd16f9..000000000
--- a/app/src/main/java/org/schabi/newpipe/util/Constants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.schabi.newpipe.util;
-
-public final class Constants {
-    public static final String KEY_SERVICE_ID = "key_service_id";
-    public static final String KEY_URL = "key_url";
-    public static final String KEY_TITLE = "key_title";
-    public static final String KEY_LINK_TYPE = "key_link_type";
-    public static final String KEY_OPEN_SEARCH = "key_open_search";
-    public static final String KEY_SEARCH_STRING = "key_search_string";
-
-    public static final String KEY_THEME_CHANGE = "key_theme_change";
-    public static final String KEY_MAIN_PAGE_CHANGE = "key_main_page_change";
-
-    public static final int NO_SERVICE_ID = -1;
-
-    private Constants() { }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/util/Constants.kt b/app/src/main/java/org/schabi/newpipe/util/Constants.kt
new file mode 100644
index 000000000..054aadd70
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/Constants.kt
@@ -0,0 +1,20 @@
+@file:JvmName("Constants")
+
+package org.schabi.newpipe.util
+
+/**
+ * Default duration when using throttle functions across the app, in milliseconds.
+ */
+const val DEFAULT_THROTTLE_TIMEOUT = 120L
+
+const val KEY_SERVICE_ID = "key_service_id"
+const val KEY_URL = "key_url"
+const val KEY_TITLE = "key_title"
+const val KEY_LINK_TYPE = "key_link_type"
+const val KEY_OPEN_SEARCH = "key_open_search"
+const val KEY_SEARCH_STRING = "key_search_string"
+
+const val KEY_THEME_CHANGE = "key_theme_change"
+const val KEY_MAIN_PAGE_CHANGE = "key_main_page_change"
+
+const val NO_SERVICE_ID = -1
diff --git a/app/src/main/java/org/schabi/newpipe/util/ConstantsKt.kt b/app/src/main/java/org/schabi/newpipe/util/ConstantsKt.kt
deleted file mode 100644
index 8d24cb04e..000000000
--- a/app/src/main/java/org/schabi/newpipe/util/ConstantsKt.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.schabi.newpipe.util
-
-/**
- * Default duration when using throttle functions across the app, in milliseconds.
- */
-const val DEFAULT_THROTTLE_TIMEOUT = 120L