From 0833ec3460058b049714a0fac4fc2654dc9d0e20 Mon Sep 17 00:00:00 2001
From: Benojir Sultana <124562791+Benojir@users.noreply.github.com>
Date: Tue, 10 Sep 2024 00:32:42 +0530
Subject: [PATCH] modified
---
.idea/deploymentTargetSelector.xml | 8 +
app/build.gradle | 2 +-
app/src/main/AndroidManifest.xml | 47 ++---
.../fogplix/tv/activities/MainActivity.java | 122 ++++---------
.../tv/activities/SettingsActivity.java | 39 ++++
.../tv/adapters/EpisodesButtonsAdapter.java | 9 +-
.../fogplix/tv/adapters/ItemsListAdapter.java | 10 +-
.../tv/fragments/RecentUploadsFragment.java | 10 +-
.../java/com/fogplix/tv/helpers/Scraper.java | 73 ++++++--
.../com/fogplix/tv/helpers/ViewDialog.java | 157 ----------------
app/src/main/res/drawable/action_bar_logo.png | Bin 8057 -> 5017 bytes
app/src/main/res/drawable/button_default.xml | 9 +
app/src/main/res/drawable/button_focused.xml | 21 +++
.../round_transparent_ripple_button.xml | 13 ++
app/src/main/res/layout/activity_main.xml | 168 ++++++++----------
app/src/main/res/layout/own_toolbar.xml | 20 ++-
.../res/layout/sample_item_card_design.xml | 2 +-
app/src/main/res/layout/settings_activity.xml | 47 +++++
.../main/res/menu/top_right_popup_menu.xml | 4 +
app/src/main/res/values/arrays.xml | 12 ++
app/src/main/res/values/strings.xml | 36 ++--
app/src/main/res/xml/root_preferences.xml | 21 +++
22 files changed, 418 insertions(+), 412 deletions(-)
create mode 100644 app/src/main/java/com/fogplix/tv/activities/SettingsActivity.java
create mode 100644 app/src/main/res/drawable/button_default.xml
create mode 100644 app/src/main/res/drawable/button_focused.xml
create mode 100644 app/src/main/res/drawable/round_transparent_ripple_button.xml
create mode 100644 app/src/main/res/layout/settings_activity.xml
create mode 100644 app/src/main/res/values/arrays.xml
create mode 100644 app/src/main/res/xml/root_preferences.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..dd1eb1c 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 1370597..bcdb8b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,10 +34,10 @@ android {
}
dependencies {
-
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ implementation 'androidx.preference:preference:1.2.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e93a5b..bd1366a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,10 +13,12 @@
android:name="android.hardware.touchscreen"
android:required="false" />
-
+
-
+
@@ -30,22 +32,26 @@
+ tools:targetApi="31">
+
+ android:name=".activities.FavoriteActivity"
+ android:configChanges="orientation|uiMode|screenSize|keyboardHidden"
+ android:exported="true">
+ android:name=".activities.GenreViewActivity"
+ android:configChanges="orientation|uiMode|screenSize|keyboardHidden"
+ android:exported="false">
-
+ android:screenOrientation="sensorLandscape">
@@ -110,8 +115,8 @@
-
-
diff --git a/app/src/main/java/com/fogplix/tv/activities/MainActivity.java b/app/src/main/java/com/fogplix/tv/activities/MainActivity.java
index ca94713..3501a2c 100644
--- a/app/src/main/java/com/fogplix/tv/activities/MainActivity.java
+++ b/app/src/main/java/com/fogplix/tv/activities/MainActivity.java
@@ -1,12 +1,9 @@
package com.fogplix.tv.activities;
-import android.annotation.SuppressLint;
import android.content.Intent;
import android.graphics.PorterDuff;
-import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
-import android.os.Looper;
import android.view.View;
import android.widget.ImageButton;
import android.widget.PopupMenu;
@@ -17,8 +14,6 @@
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.splashscreen.SplashScreen;
-import androidx.core.view.GravityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager2.widget.ViewPager2;
@@ -26,23 +21,17 @@
import com.fogplix.tv.R;
import com.fogplix.tv.adapters.FragmentAdapter;
import com.fogplix.tv.helpers.CustomMethods;
-import com.google.android.material.navigation.NavigationView;
-import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.tabs.TabLayout;
import java.util.Objects;
public class MainActivity extends AppCompatActivity {
- private DrawerLayout drawerLayout;
private ViewPager2 viewPager2;
private TabLayout tabLayout;
private TextView importantNoticeTV;
- private NavigationView navigationView;
private boolean keepSplashScreen = true;
- private boolean doubleBackPressed = false;
- @SuppressLint("SetTextI18n")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -61,35 +50,55 @@ protected void onCreate(Bundle savedInstanceState) {
View ownToolbar = findViewById(R.id.ownToolbar);
- ImageButton navLeftBtn = ownToolbar.findViewById(R.id.navbarLeftBtn);
+ ImageButton favoritePageBtn = ownToolbar.findViewById(R.id.navbarLeftBtn);
+ ImageButton searchBtn = ownToolbar.findViewById(R.id.navbarRightBtn);
+ ImageButton navInfoBtn = ownToolbar.findViewById(R.id.navInfoBtn);
- navLeftBtn.setImageDrawable(AppCompatResources.getDrawable(MainActivity.this, R.drawable.favorite_48));
- navLeftBtn.setOnClickListener(v -> startActivity(new Intent(MainActivity.this, FavoriteActivity.class)));
+ favoritePageBtn.setImageDrawable(AppCompatResources.getDrawable(MainActivity.this, R.drawable.favorite_48));
+ favoritePageBtn.setOnClickListener(v -> startActivity(new Intent(MainActivity.this, FavoriteActivity.class)));
+ favoritePageBtn.setOnFocusChangeListener((v, hasFocus) -> {
+ if (hasFocus){
+ favoritePageBtn.setBackgroundResource(R.drawable.button_focused);
+ } else {
+ favoritePageBtn.setBackgroundResource(R.drawable.button_default);
+ }
+ });
- ownToolbar.findViewById(R.id.navbarRightBtn).setOnClickListener(v -> startActivity(new Intent(MainActivity.this, SearchActivity.class)));
+ searchBtn.setOnClickListener(v -> startActivity(new Intent(MainActivity.this, SearchActivity.class)));
+ searchBtn.setOnFocusChangeListener((v, hasFocus) -> {
+ if (hasFocus){
+ searchBtn.setBackgroundResource(R.drawable.button_focused);
+ } else {
+ searchBtn.setBackgroundResource(R.drawable.button_default);
+ }
+ });
- ImageButton navInfoBtn = ownToolbar.findViewById(R.id.navInfoBtn);
navInfoBtn.setOnClickListener(v -> {
-
PopupMenu popupMenu = new PopupMenu(MainActivity.this, navInfoBtn);
popupMenu.getMenuInflater().inflate(R.menu.top_right_popup_menu, popupMenu.getMenu());
-
- // Set up the click listener for the menu items
popupMenu.setOnMenuItemClickListener(item -> {
-
- if (item.getItemId() == R.id.show_version){
+ if (item.getItemId() == R.id.open_settings){
+ startActivity(new Intent(MainActivity.this, SettingsActivity.class));
+ return true;
+ } else if (item.getItemId() == R.id.show_version){
Toast.makeText(this, BuildConfig.VERSION_NAME, Toast.LENGTH_SHORT).show();
return true;
} else {
return false;
}
});
-
- // Show the popup menu
popupMenu.show();
});
+ navInfoBtn.setOnFocusChangeListener((v, hasFocus) -> {
+ if (hasFocus){
+ navInfoBtn.setBackgroundResource(R.drawable.button_focused);
+ } else {
+ navInfoBtn.setBackgroundResource(R.drawable.button_default);
+ }
+ });
+
////////////////////////////////////////////////////////////////////////////////////////////
CustomMethods.checkForUpdateOnStartApp(this);
@@ -98,22 +107,11 @@ protected void onCreate(Bundle savedInstanceState) {
if (!CustomMethods.isInternetOn(this)) {
Toast.makeText(this, "No internet connection.", Toast.LENGTH_LONG).show();
- doubleBackPressed = true;
- onBackPressed();
+ finish();
}
////////////////////////////////////////////////////////////////////////////////////////////
- View headView = navigationView.getHeaderView(0);
-
- ((TextView) headView.findViewById(R.id.header_layout_version_tv)).setText("Version: " + BuildConfig.VERSION_NAME);
-
- headView.findViewById(R.id.closeDrawerBtn).setOnClickListener(v -> drawerLayout.closeDrawers());
-
- navigationViewItemClickedActions(navigationView);
-
- ////////////////////////////////////////////////////////////////////////////////////////////
-
FragmentManager fragmentManager = getSupportFragmentManager();
FragmentAdapter fragmentAdapter = new FragmentAdapter(fragmentManager, getLifecycle(), tabLayout.getTabCount());
viewPager2.setAdapter(fragmentAdapter);
@@ -149,65 +147,11 @@ public void onPageSelected(int position) {
});
}
-
-// ----------------------------------------------------------------------------------------------
-
- private void navigationViewItemClickedActions(NavigationView navigationView) {
-
- navigationView.setNavigationItemSelectedListener(item -> {
-
- if (item.getItemId() == R.id.favorite_anime_menu_item) {
-
- startActivity(new Intent(getApplicationContext(), FavoriteActivity.class));
-
- new Handler().postDelayed(() -> {
- if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
- drawerLayout.closeDrawer(GravityCompat.START);
- }
- }, 500);
- } else if (item.getItemId() == R.id.report_bug_action) {
- startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.official_telegram_group))));
- } else if (item.getItemId() == R.id.share_action) {
- Intent intent1 = new Intent(Intent.ACTION_SEND);
- intent1.setType("text/plain");
- intent1.putExtra(Intent.EXTRA_TEXT, getResources().getString(R.string.app_sharing_message) + "\n" + getString(R.string.official_website));
- startActivity(Intent.createChooser(intent1, "Share via"));
- } else if (item.getItemId() == R.id.more_apps_action) {
- startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.more_apps))));
- } else if (item.getItemId() == R.id.visit_website) {
- startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.official_website))));
- } else if (item.getItemId() == R.id.visit_telegram) {
- startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.official_telegram_channel))));
- }
- return false;
- });
- }
-
-// ----------------------------------------------------------------------------------------------
-
- @Override
- public void onBackPressed() {
-
- if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
- drawerLayout.closeDrawer(GravityCompat.START);
- } else {
- if (doubleBackPressed) {
- super.onBackPressed();
- } else {
- this.doubleBackPressed = true;
- Snackbar.make(drawerLayout, "Double press to exit!", Snackbar.LENGTH_LONG).show();
-
- new Handler(Looper.getMainLooper()).postDelayed(() -> doubleBackPressed = false, 2000);
- }
- }
- }
// ----------------------------------------------------------------------------------------------
private void initVars() {
- drawerLayout = findViewById(R.id.home_page_drawerlayout);
viewPager2 = findViewById(R.id.fragmentContainerViewPager2Main);
tabLayout = findViewById(R.id.tabLayout);
- navigationView = findViewById(R.id.navigation_drawer);
importantNoticeTV = findViewById(R.id.important_notice_tv);
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/fogplix/tv/activities/SettingsActivity.java b/app/src/main/java/com/fogplix/tv/activities/SettingsActivity.java
new file mode 100644
index 0000000..b0794b0
--- /dev/null
+++ b/app/src/main/java/com/fogplix/tv/activities/SettingsActivity.java
@@ -0,0 +1,39 @@
+package com.fogplix.tv.activities;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageButton;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceFragmentCompat;
+
+import com.fogplix.tv.R;
+
+public class SettingsActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.settings_activity);
+ if (savedInstanceState == null) {
+ getSupportFragmentManager()
+ .beginTransaction()
+ .replace(R.id.settings, new SettingsFragment())
+ .commit();
+ }
+ ActionBar actionBar = getSupportActionBar();
+ if (actionBar != null) {
+ actionBar.setDisplayHomeAsUpEnabled(false);
+ }
+
+ findViewById(R.id.backButton).setOnClickListener(v -> onBackPressed());
+ }
+
+ public static class SettingsFragment extends PreferenceFragmentCompat {
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+ setPreferencesFromResource(R.xml.root_preferences, rootKey);
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/fogplix/tv/adapters/EpisodesButtonsAdapter.java b/app/src/main/java/com/fogplix/tv/adapters/EpisodesButtonsAdapter.java
index e32a6a4..61afa9d 100644
--- a/app/src/main/java/com/fogplix/tv/adapters/EpisodesButtonsAdapter.java
+++ b/app/src/main/java/com/fogplix/tv/adapters/EpisodesButtonsAdapter.java
@@ -2,6 +2,7 @@
import android.app.Activity;
import android.content.Context;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -64,11 +65,11 @@ public void onBindViewHolder(@NonNull MyCustomViewHolder holder, int position) {
holder.episodeButton.setBackgroundColor(context.getColor(R.color.black));
}
- holder.episodeButton.setOnFocusChangeListener((view, b) -> {
+ holder.episodeButton.setOnFocusChangeListener((view, hasFocus) -> {
- if (b){
+ if (hasFocus){
holder.episodeButton.setTextColor(context.getColor(R.color.white));
- holder.episodeButton.setBackgroundColor(context.getColor(R.color.orange));
+ holder.episodeButton.setBackgroundColor(context.getColor(R.color.red));
} else {
if (episodeId.equals(databaseHandler.getLastWatchedEpisodeId(animeId))){
holder.episodeButton.setTextColor(context.getColor(R.color.white));
@@ -81,7 +82,7 @@ public void onBindViewHolder(@NonNull MyCustomViewHolder holder, int position) {
});
}
catch (Exception e) {
- e.printStackTrace();
+ Log.e("MADARA", "onBindViewHolder: ", e);
}
}
diff --git a/app/src/main/java/com/fogplix/tv/adapters/ItemsListAdapter.java b/app/src/main/java/com/fogplix/tv/adapters/ItemsListAdapter.java
index c5ca0c6..038eb85 100644
--- a/app/src/main/java/com/fogplix/tv/adapters/ItemsListAdapter.java
+++ b/app/src/main/java/com/fogplix/tv/adapters/ItemsListAdapter.java
@@ -3,6 +3,7 @@
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -33,6 +34,7 @@
public class ItemsListAdapter extends RecyclerView.Adapter {
+ private static final String TAG = "MADARA";
private final JSONArray allAnime;
private final Activity activity;
@@ -92,7 +94,7 @@ public void onBindViewHolder(@NonNull MyCustomViewHolder holder, int position) {
holder.releaseDateTV.setText(allAnime.getJSONObject(holder.getBindingAdapterPosition()).getString("releasedDate"));
}
} catch (Exception e) {
- e.printStackTrace();
+ Log.e(TAG, "onBindViewHolder: ", e);
Toast.makeText(activity, "JSON Error", Toast.LENGTH_SHORT).show();
CustomMethods.errorAlert(activity, "Error", e.getMessage(), "Ok", true);
}
@@ -128,7 +130,7 @@ public void onBindViewHolder(@NonNull MyCustomViewHolder holder, int position) {
intent.putExtra("episodeId", allAnime.getJSONObject(holder.getBindingAdapterPosition()).getString("episodeId"));
activity.startActivity(intent);
} catch (Exception e) {
- e.printStackTrace();
+ Log.e(TAG, "onBindViewHolder: ", e);
Toast.makeText(activity, e.getMessage(), Toast.LENGTH_SHORT).show();
}
});
@@ -211,7 +213,7 @@ public void onBindViewHolder(@NonNull MyCustomViewHolder holder, int position) {
bottomSheetDialog.show();
}
} catch (Exception e) {
- e.printStackTrace();
+ Log.e(TAG, "onBindViewHolder: ", e);
}
return true;
});
@@ -231,7 +233,7 @@ public long getItemId(int position) {
// Return a unique and stable ID for the item.
return item.getLong("id");
} catch (JSONException e) {
- e.printStackTrace();
+ Log.e(TAG, "onBindViewHolder: ", e);
return RecyclerView.NO_ID;
}
}
diff --git a/app/src/main/java/com/fogplix/tv/fragments/RecentUploadsFragment.java b/app/src/main/java/com/fogplix/tv/fragments/RecentUploadsFragment.java
index b1dfae7..fa8dfeb 100644
--- a/app/src/main/java/com/fogplix/tv/fragments/RecentUploadsFragment.java
+++ b/app/src/main/java/com/fogplix/tv/fragments/RecentUploadsFragment.java
@@ -3,6 +3,7 @@
import android.app.Activity;
import android.content.res.Configuration;
import android.os.Bundle;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -22,6 +23,7 @@
import org.json.JSONArray;
public class RecentUploadsFragment extends Fragment {
+ private static final String TAG = "MADARA";
private FragmentRecentUploadsBinding binding;
private Activity activity;
private GridLayoutManager layoutManager;
@@ -75,9 +77,9 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
binding = FragmentRecentUploadsBinding.inflate(inflater, container, false);
- binding.loadMoreAnimeBtn.setOnFocusChangeListener((view, b) -> {
- if (b){
- binding.loadMoreAnimeBtn.setBackgroundColor(activity.getColor(R.color.orange));
+ binding.loadMoreAnimeBtn.setOnFocusChangeListener((view, hasFocus) -> {
+ if (hasFocus){
+ binding.loadMoreAnimeBtn.setBackgroundColor(activity.getColor(R.color.red));
} else {
binding.loadMoreAnimeBtn.setBackgroundColor(activity.getColor(R.color.fade_blue));
}
@@ -137,7 +139,7 @@ public void onScrapeComplete(JSONArray resultAnime) {
}
} catch (Exception e){
- e.printStackTrace();
+ Log.e(TAG, "onScrapeComplete: ", e);
CustomMethods.errorAlert(activity, "Json Error", e.getMessage(), "OK", true);
}
}
diff --git a/app/src/main/java/com/fogplix/tv/helpers/Scraper.java b/app/src/main/java/com/fogplix/tv/helpers/Scraper.java
index 34f5a23..dced549 100644
--- a/app/src/main/java/com/fogplix/tv/helpers/Scraper.java
+++ b/app/src/main/java/com/fogplix/tv/helpers/Scraper.java
@@ -1,10 +1,13 @@
package com.fogplix.tv.helpers;
import android.app.Activity;
+import android.content.SharedPreferences;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
+import androidx.preference.PreferenceManager;
+
import com.fogplix.tv.R;
import com.fogplix.tv.callbacks.AnimeScraperCallback;
import com.fogplix.tv.callbacks.DetailsScraperCallback;
@@ -18,6 +21,8 @@
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.Objects;
public class Scraper {
@@ -26,20 +31,32 @@ public class Scraper {
private RecentScraperCallback recentScraperCallback = null;
private DetailsScraperCallback detailsScraperCallback = null;
private AnimeScraperCallback animeScraperCallback = null;
+ private final SharedPreferences sharedPreferences;
+ private final boolean isProxyEnabled;
+ private final String proxyBrowserLink;
public Scraper(Activity activity, RecentScraperCallback recentScraperCallback) {
this.activity = activity;
this.recentScraperCallback = recentScraperCallback;
+ sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+ isProxyEnabled = sharedPreferences.getBoolean("use_proxy", false);
+ proxyBrowserLink = activity.getString(R.string.proxy_browser_link);
}
public Scraper(Activity activity, DetailsScraperCallback detailsScraperCallback) {
this.activity = activity;
this.detailsScraperCallback = detailsScraperCallback;
+ sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+ isProxyEnabled = sharedPreferences.getBoolean("use_proxy", false);
+ proxyBrowserLink = activity.getString(R.string.proxy_browser_link);
}
public Scraper(Activity activity, AnimeScraperCallback animeScraperCallback) {
this.activity = activity;
this.animeScraperCallback = animeScraperCallback;
+ sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+ isProxyEnabled = sharedPreferences.getBoolean("use_proxy", false);
+ proxyBrowserLink = activity.getString(R.string.proxy_browser_link);
}
public void scrapeRecent(int page, int type) {
@@ -79,10 +96,10 @@ public void scrapeRecent(int page, int type) {
animeImg = Objects.requireNonNull(allListTag.select("img").first()).attr("src").trim();
- if (document.getElementsByClass("ic-DUB").size() > 0) {
+ if (!document.getElementsByClass("ic-DUB").isEmpty()) {
subOrDub = "DUB";
}
- if (document.getElementsByClass("ic-SUB").size() > 0) {
+ if (!document.getElementsByClass("ic-SUB").isEmpty()) {
subOrDub = "SUB";
}
@@ -103,21 +120,27 @@ public void scrapeRecent(int page, int type) {
new Handler(Looper.getMainLooper()).post(() -> recentScraperCallback.onScrapeComplete(allAnime));
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
new Handler(Looper.getMainLooper()).post(() -> recentScraperCallback.onScrapeFailed(e.getMessage()));
}
}).start();
}
- public void scrapeAnime(String url){
+ public void scrapeAnime(String url) {
new Thread(() -> {
try {
JSONArray allAnime = new JSONArray();
- Document document = Jsoup.connect(url)
+ String finalUrl = url;
+
+ if (isProxyEnabled){
+ finalUrl = proxyBrowserLink + URLEncoder.encode(finalUrl, "UTF-8");
+ }
+
+ Document document = Jsoup.connect(finalUrl)
.userAgent(activity.getString(R.string.user_agent))
.get();
@@ -130,7 +153,7 @@ public void scrapeAnime(String url){
String animeRelease = liTag.select(".released").text().toLowerCase();
animeRelease = animeRelease.replace("released:", "").trim();
String animeId = Objects.requireNonNull(liTag.select("a").first()).attr("href").trim();
- animeId = animeId.replace("/category/","");
+ animeId = animeId.replace("/category/", "");
String episodeId = animeId + "-episode-1";
JSONObject object = new JSONObject();
@@ -145,8 +168,8 @@ public void scrapeAnime(String url){
new Handler(Looper.getMainLooper()).post(() -> animeScraperCallback.onScrapeComplete(allAnime));
- } catch (Exception e){
- e.printStackTrace();
+ } catch (Exception e) {
+// e.printStackTrace();
new Handler(Looper.getMainLooper()).post(() -> animeScraperCallback.onScrapeFailed(e.getMessage()));
}
}).start();
@@ -158,9 +181,9 @@ public void scrapeDetails(String animeId, String episodeID) {
String episodeId2;
- if (episodeID == null || episodeID.isEmpty()){
+ if (episodeID == null || episodeID.isEmpty()) {
episodeId2 = animeId + "-episode-1";
- } else{
+ } else {
episodeId2 = episodeID;
}
@@ -168,6 +191,14 @@ public void scrapeDetails(String animeId, String episodeID) {
Connection.Response response;
String detailsUrl = activity.getString(R.string.gogoanime_url) + "/category/" + animeId;
+ if (isProxyEnabled){
+ try {
+ detailsUrl = proxyBrowserLink + URLEncoder.encode(detailsUrl, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ detailsUrl = proxyBrowserLink + detailsUrl;
+ }
+ }
+
try {
response = Jsoup.connect(detailsUrl)
.userAgent(activity.getString(R.string.user_agent))
@@ -178,13 +209,21 @@ public void scrapeDetails(String animeId, String episodeID) {
String episodePageUrl = activity.getString(R.string.gogoanime_url) + "/" + episodeId2;
+ if (isProxyEnabled){
+ try {
+ episodePageUrl = proxyBrowserLink + URLEncoder.encode(episodePageUrl, "UTF-8");
+ } catch (UnsupportedEncodingException ex) {
+ episodePageUrl = proxyBrowserLink + episodePageUrl;
+ }
+ }
+
try {
Document episodePageDoc = Jsoup.connect(episodePageUrl)
.userAgent(activity.getString(R.string.user_agent))
.header("Accept-Language", "en-GB,en;q=0.5")
.get();
- Element animeIdContainerDiv = episodePageDoc.getElementsByClass("tv-info").first();
+ Element animeIdContainerDiv = episodePageDoc.getElementsByClass("anime-info").first();
assert animeIdContainerDiv != null;
Element aTag = animeIdContainerDiv.getElementsByTag("a").first();
@@ -198,7 +237,7 @@ public void scrapeDetails(String animeId, String episodeID) {
.execute();
} catch (Exception ex) {
- Log.d("Uchiha", "onCreate ex: " + ex.getMessage());
+ Log.e("MADARA", "scrapeDetails: ", ex);
response = null;
}
}
@@ -233,7 +272,7 @@ public void scrapeDetails(String animeId, String episodeID) {
JSONArray episodesArray = new JSONArray();
- for (Element liTag: liTags) {
+ for (Element liTag : liTags) {
String episodeId = Objects.requireNonNull(liTag.select("a").first()).attr("href").replace("/", "").trim();
String episodeNum = CustomMethods.extractEpisodeNumberFromId(episodeId);
@@ -258,6 +297,7 @@ public void scrapeDetails(String animeId, String episodeID) {
String status = "";
String synopsis = innerHtml.select("div.description").text();
+
JSONArray genresArray = new JSONArray();
Elements allPTags = innerHtml.select(".type");
@@ -271,6 +311,7 @@ public void scrapeDetails(String animeId, String episodeID) {
if (spanTagValue.toLowerCase().contains("type")) {
type = pTagDoc.text().replace(spanTagValue, "").trim();
}
+
if (spanTagValue.toLowerCase().contains("genre")) {
Elements genres = pTagDoc.getElementsByTag("a");
@@ -297,10 +338,10 @@ public void scrapeDetails(String animeId, String episodeID) {
animeInfoJObj.put("totalEpisodes", lastEpisode);
animeInfoJObj.put("episodesList", episodesArray);
- new Handler(Looper.getMainLooper()).post(()->detailsScraperCallback.onScrapingComplete(animeInfoJObj));
+ new Handler(Looper.getMainLooper()).post(() -> detailsScraperCallback.onScrapingComplete(animeInfoJObj));
}
- } catch (Exception e){
- new Handler(Looper.getMainLooper()).post(()->detailsScraperCallback.onScrapingFailed(e.getMessage()));
+ } catch (Exception e) {
+ new Handler(Looper.getMainLooper()).post(() -> detailsScraperCallback.onScrapingFailed(e.getMessage()));
}
}).start();
}
diff --git a/app/src/main/java/com/fogplix/tv/helpers/ViewDialog.java b/app/src/main/java/com/fogplix/tv/helpers/ViewDialog.java
index 6022461..013357d 100644
--- a/app/src/main/java/com/fogplix/tv/helpers/ViewDialog.java
+++ b/app/src/main/java/com/fogplix/tv/helpers/ViewDialog.java
@@ -146,163 +146,6 @@ public void onFailed(String error) {
Toast.makeText(activity, "This server is not working currently. Try another server.", Toast.LENGTH_SHORT).show();
}
});
-
-// ------------------------------------------------------------------------------------------
-
- server_2_btn.setOnClickListener(view -> {
-
- HPSharedPreference hpSharedPreference = new HPSharedPreference(activity);
-
- boolean server_status = hpSharedPreference.getPlayableServersStatus("server_2");
-
- if (server_status) {
-
- String consumet_api = activity.getString(R.string.consumet_streaming_link_api) + episodeId;
-
- ProgressDialog pd = new ProgressDialog(activity);
- pd.setMessage("Generating playable link...");
- pd.setCancelable(false);
- pd.show();
-
-
- StringRequest objectRequest1 = new StringRequest(Request.Method.GET, consumet_api, response -> {
-
- try {
-
- JSONObject object = new JSONObject(response);
-
- if (object.has("message")) {
- pd.dismiss();
- CustomMethods.errorAlert(activity, "Error", object.getString("error"), "Ok", true);
- } else {
-
- String refererUrl = object.getJSONObject("headers").getString("Referer");
- String videoHLSUrl = "";
- String videoHLSUrl2 = "";
-
- JSONArray sources = object.getJSONArray("sources");
-
- for (int i = 0; i < sources.length(); i++) {
-
- JSONObject source_obj = sources.getJSONObject(i);
-
- if (source_obj.getString("quality").equalsIgnoreCase("default")) {
- videoHLSUrl = source_obj.getString("url");
- }
-
- if (source_obj.getString("quality").equalsIgnoreCase("backup")) {
- videoHLSUrl2 = source_obj.getString("url");
- }
- }
-
- pd.dismiss();
-
- Intent intent = new Intent(activity, PlayerActivity.class);
- intent.putExtra("episodeId", episodeId);
- intent.putExtra("animeId", animeId);
- intent.putExtra("animeTitle", animeTitle);
- intent.putExtra("refererUrl", refererUrl);
- intent.putExtra("videoHLSUrl", videoHLSUrl);
- intent.putExtra("videoHLSUrl2", videoHLSUrl2);
- activity.startActivity(intent);
-
- dialog.dismiss();
- }
- } catch (Exception e) {
- e.printStackTrace();
- Toast.makeText(activity, "Error: " + e.getMessage(), Toast.LENGTH_LONG).show();
- CustomMethods.errorAlert(activity, "Error (Try another server)", e.getMessage() + "\n", "Ok", false);
- }
- }, error -> {
- pd.dismiss();
- CustomMethods.errorAlert(activity, "Error (Try another server.)", error.getMessage(), "Ok", false);
- });
-
- Cache cache = new DiskBasedCache(activity.getCacheDir(), 1024 * 1024); // 1MB cap
- Network network = new BasicNetwork(new HurlStack());
-
-
- RequestQueue queue = new RequestQueue(cache, network);
- objectRequest1.setRetryPolicy((new DefaultRetryPolicy(0, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT)));
- queue.add(objectRequest1);
- queue.start();
-
- dialog.dismiss();
- } else {
- Toast.makeText(activity, "This server is not working currently. Try another server.", Toast.LENGTH_SHORT).show();
- }
- });
-
-// ------------------------------------------------------------------------------------------
-
- server_3_btn.setOnClickListener(v -> {
-
- HPSharedPreference hpSharedPreference = new HPSharedPreference(activity);
-
- boolean server_status = hpSharedPreference.getPlayableServersStatus("server_3");
-
- if (server_status) {
-
- String vidcdn_api = activity.getString(R.string.VIDCDN_API_URL) + episodeId;
-
- ProgressDialog pd = new ProgressDialog(activity);
- pd.setMessage("Generating playable link...");
- pd.setCancelable(false);
- pd.show();
-
- StringRequest objectRequest1 = new StringRequest(Request.Method.GET, vidcdn_api, response -> {
-
- try {
-
- JSONObject object = new JSONObject(response);
-
- if (object.has("error")) {
- pd.dismiss();
- CustomMethods.errorAlert(activity, "Error", object.getString("error"), "Ok", true);
- } else {
-
- String refererUrl = object.getString("Referer");
- String videoHLSUrl = object.getJSONArray("sources").getJSONObject(0).getString("file");
- String videoHLSUrl2 = object.getJSONArray("sources_bk").getJSONObject(0).getString("file");
-
- pd.dismiss();
-
- Intent intent = new Intent(activity, PlayerActivity.class);
- intent.putExtra("episodeId", episodeId);
- intent.putExtra("animeId", animeId);
- intent.putExtra("animeTitle", animeTitle);
- intent.putExtra("refererUrl", refererUrl);
- intent.putExtra("videoHLSUrl", videoHLSUrl);
- intent.putExtra("videoHLSUrl2", videoHLSUrl2);
- activity.startActivity(intent);
-
- dialog.dismiss();
- }
- } catch (Exception e) {
- e.printStackTrace();
- Toast.makeText(activity, "Error: " + e.getMessage(), Toast.LENGTH_LONG).show();
- CustomMethods.errorAlert(activity, "Error (Try another server)", e.getMessage() + "\n", "Ok", true);
- }
- }, error -> {
- pd.dismiss();
- CustomMethods.errorAlert(activity, "Error (Try another server.)", error.getMessage(), "Ok", true);
- });
-
- Cache cache = new DiskBasedCache(activity.getCacheDir(), 1024 * 1024); // 1MB cap
- Network network = new BasicNetwork(new HurlStack());
-
-
- RequestQueue queue = new RequestQueue(cache, network);
- objectRequest1.setRetryPolicy((new DefaultRetryPolicy(0, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT)));
- queue.add(objectRequest1);
- queue.start();
-
- dialog.dismiss();
- } else {
- Toast.makeText(activity, "This server is not working currently. Try another server.", Toast.LENGTH_SHORT).show();
- }
- });
-
// ------------------------------------------------------------------------------------------
dialog.show();
diff --git a/app/src/main/res/drawable/action_bar_logo.png b/app/src/main/res/drawable/action_bar_logo.png
index 6052cbefaa9a1ceaa9b7d053b2dda19b44e9263a..534a6e365b8fedd1c4a39e0f352d391fe8a36435 100644
GIT binary patch
delta 3997
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
Jg!%3F{{l*aEPwz2
delta 7065
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
iTlo>rwt6Iv8x+pHOIZbk;z^y_t
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_focused.xml b/app/src/main/res/drawable/button_focused.xml
new file mode 100644
index 0000000..4bdff9b
--- /dev/null
+++ b/app/src/main/res/drawable/button_focused.xml
@@ -0,0 +1,21 @@
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
diff --git a/app/src/main/res/drawable/round_transparent_ripple_button.xml b/app/src/main/res/drawable/round_transparent_ripple_button.xml
new file mode 100644
index 0000000..199ce26
--- /dev/null
+++ b/app/src/main/res/drawable/round_transparent_ripple_button.xml
@@ -0,0 +1,13 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c9c231b..06f7c7b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,121 +1,97 @@
-
+
+
+
+
-
-
+ android:layout_below="@+id/important_notice_tv">
-
-
-
-
-
+
+
-
-
+ android:icon="@drawable/subtitles_24"
+ android:text="@string/subbed" />
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/own_toolbar.xml b/app/src/main/res/layout/own_toolbar.xml
index 2e048de..93f7a3a 100644
--- a/app/src/main/res/layout/own_toolbar.xml
+++ b/app/src/main/res/layout/own_toolbar.xml
@@ -10,7 +10,11 @@
+ android:backgroundTint="@color/red">
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/top_right_popup_menu.xml b/app/src/main/res/menu/top_right_popup_menu.xml
index a4f1c5c..a091ea3 100644
--- a/app/src/main/res/menu/top_right_popup_menu.xml
+++ b/app/src/main/res/menu/top_right_popup_menu.xml
@@ -1,6 +1,10 @@