Merge pull request #30 from ranobe-org/fix/cleanups

Fix/cleanups
ranobe-org · Aug 19, 2023 · 7fea938 · 7fea938
2 parents 3b5766e + 803536a
commit 7fea938
Show file tree

Hide file tree

Showing 37 changed files with 162 additions and 155 deletions.
diff --git a/app/src/main/java/org/ranobe/ranobe/database/converters/DateConverter.java b/app/src/main/java/org/ranobe/ranobe/database/converters/DateConverter.java
@@ -6,12 +6,12 @@
 
 public class DateConverter {
     @TypeConverter
-    public static Date toDate(Long dateLong){
-        return dateLong == null ? null: new Date(dateLong);
+    public static Date toDate(Long dateLong) {
+        return dateLong == null ? null : new Date(dateLong);
     }
 
     @TypeConverter
-    public static Long fromDate(Date date){
+    public static Long fromDate(Date date) {
         return date == null ? null : date.getTime();
     }
 }
diff --git a/app/src/main/java/org/ranobe/ranobe/models/Chapter.java b/app/src/main/java/org/ranobe/ranobe/models/Chapter.java
@@ -10,6 +10,17 @@
 
 @Entity
 public class Chapter implements Parcelable {
+    public static final Creator<Chapter> CREATOR = new Creator<Chapter>() {
+        @Override
+        public Chapter createFromParcel(Parcel in) {
+            return new Chapter(in);
+        }
+
+        @Override
+        public Chapter[] newArray(int size) {
+            return new Chapter[size];
+        }
+    };
     @PrimaryKey
     @NonNull
     public String url;
@@ -39,18 +50,6 @@ protected Chapter(Parcel in) {
         id = in.readFloat();
     }
 
-    public static final Creator<Chapter> CREATOR = new Creator<Chapter>() {
-        @Override
-        public Chapter createFromParcel(Parcel in) {
-            return new Chapter(in);
-        }
-
-        @Override
-        public Chapter[] newArray(int size) {
-            return new Chapter[size];
-        }
-    };
-
     @NonNull
     @Override
     public String toString() {

diff --git a/app/src/main/java/org/ranobe/ranobe/models/Novel.java b/app/src/main/java/org/ranobe/ranobe/models/Novel.java
@@ -14,13 +14,23 @@
 
 @Entity
 public class Novel implements Parcelable {
+    public static final Creator<Novel> CREATOR = new Creator<Novel>() {
+        @Override
+        public Novel createFromParcel(Parcel in) {
+            return new Novel(in);
+        }
+
+        @Override
+        public Novel[] newArray(int size) {
+            return new Novel[size];
+        }
+    };
     @PrimaryKey
     public long id;
     public int sourceId;
     public String name;
     public String cover;
     public String url;
-
     public String status;
     public String summary;
     public List<String> alternateNames;
@@ -49,18 +59,6 @@ protected Novel(Parcel in) {
         year = in.readInt();
     }
 
-    public static final Creator<Novel> CREATOR = new Creator<Novel>() {
-        @Override
-        public Novel createFromParcel(Parcel in) {
-            return new Novel(in);
-        }
-
-        @Override
-        public Novel[] newArray(int size) {
-            return new Novel[size];
-        }
-    };
-
     @NonNull
     @Override
     public String toString() {

diff --git a/app/src/main/java/org/ranobe/ranobe/network/repository/GithubRepo.java b/app/src/main/java/org/ranobe/ranobe/network/repository/GithubRepo.java
@@ -16,16 +16,10 @@ public class GithubRepo {
     }};
     private final Executor executor;
 
-    public GithubRepo(){
+    public GithubRepo() {
         this.executor = Executors.newCachedThreadPool();
     }
 
-    public interface Callback<T> {
-        void onComplete(T result);
-
-        void onError(Exception e);
-    }
-
     public void getLatestRelease(Callback<GithubRelease> callback) {
         this.executor.execute(() -> {
             try {
@@ -45,18 +39,24 @@ private GithubRelease fetchLatestRelease() throws Exception {
         Version latestVersion = new Version(Version.extractVersionNumber(tag));
         Version currentVersion = new Version(Version.extractVersionNumber(BuildConfig.VERSION_NAME));
 
-        if(latestVersion.get().equals(currentVersion.get())) {
+        if (latestVersion.get().equals(currentVersion.get())) {
             return new GithubRelease(false, currentVersion.get(), null);
         }
 
-        if(latestVersion.compareTo(currentVersion) > 0) {
+        if (latestVersion.compareTo(currentVersion) > 0) {
             String url = response.getString("html_url");
             return new GithubRelease(true, tag, url);
         }
 
         return new GithubRelease(false, currentVersion.get(), null);
     }
 
+    public interface Callback<T> {
+        void onComplete(T result);
+
+        void onError(Exception e);
+    }
+
     public static class GithubRelease {
         public boolean updateAvailable;
         public String newReleaseVersion;

diff --git a/app/src/main/java/org/ranobe/ranobe/sources/en/LightNovelBtt.java b/app/src/main/java/org/ranobe/ranobe/sources/en/LightNovelBtt.java
@@ -1,7 +1,5 @@
 package org.ranobe.ranobe.sources.en;
 
-import android.util.Log;
-
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.ranobe.ranobe.models.Chapter;

diff --git a/app/src/main/java/org/ranobe/ranobe/sources/en/Neovel.java b/app/src/main/java/org/ranobe/ranobe/sources/en/Neovel.java
@@ -44,24 +44,27 @@ private String getCoverImage(String bookId) {
 
     private String getStatus(int completion) {
         switch (completion) {
-            case 1: return "Ongoing";
-            case 3: return "Completed";
-            default: return "N.A.";
+            case 1:
+                return "Ongoing";
+            case 3:
+                return "Completed";
+            default:
+                return "N.A.";
         }
     }
 
     private int getYear(String date) {
         Pattern pattern = Pattern.compile("/\\d{4}/gm");
         Matcher m = pattern.matcher(date);
-        if(m.find()) {
+        if (m.find()) {
             return Integer.parseInt(m.group());
         }
         return 0;
     }
 
     private List<String> jsonArrayToString(JSONArray arr) throws JSONException {
         List<String> values = new ArrayList<>();
-        for(int i = 0; i < arr.length(); i++) {
+        for (int i = 0; i < arr.length(); i++) {
             values.add(arr.getString(0));
         }
         return values;
@@ -74,15 +77,15 @@ private String encodeKeyword(String keyword) {
 
     @Override
     public List<Novel> novels(int page) throws Exception {
-        String web = BASE_URL +"/V2/books/search?language=EN&filter=0&name=&sort=6&page=".concat(String.valueOf(page)) + "&onlyOffline=true&genreIds=0&genreCombining=0&tagIds=0&tagCombining=0&minChapterCount=0&maxChapterCount=9999&completion=5&onlyPremium=false&blacklistedTagIds=&onlyMature=false";
+        String web = BASE_URL + "/V2/books/search?language=EN&filter=0&name=&sort=6&page=".concat(String.valueOf(page)) + "&onlyOffline=true&genreIds=0&genreCombining=0&tagIds=0&tagCombining=0&minChapterCount=0&maxChapterCount=9999&completion=5&onlyPremium=false&blacklistedTagIds=&onlyMature=false";
         return parseNovels(web);
     }
 
     private List<Novel> parseNovels(String web) throws Exception {
         List<Novel> items = new ArrayList<>();
         JSONArray data = new JSONArray(HttpClient.GET(web, new HashMap<>()));
 
-        for(int i = 0; i < data.length(); i++) {
+        for (int i = 0; i < data.length(); i++) {
             JSONObject d = data.getJSONObject(i);
             String url = BASE_URL + "/" + d.getString("id");
 
@@ -122,7 +125,7 @@ public List<Chapter> chapters(Novel novel) throws Exception {
         String url = String.format("https://neovel.io/V5/chapters?bookId=%s&language=EN", bookId);
         JSONArray data = new JSONArray(HttpClient.GET(url, new HashMap<>()));
 
-        for(int i = 0; i < data.length(); i++) {
+        for (int i = 0; i < data.length(); i++) {
             JSONObject o = data.getJSONObject(i);
             String u = BASE_URL + "/chapter/" + o.getString("chapterId");
 
@@ -145,7 +148,7 @@ public Chapter chapter(Chapter chapter) throws Exception {
         Element doc = Jsoup.parse(data.getString("chapterContent"));
         List<String> paras = new ArrayList<>();
 
-        for(String bits: doc.wholeText().split("\n")){
+        for (String bits : doc.wholeText().split("\n")) {
             String text = bits.trim();
             if (text.length() > 0) {
                 paras.add(text);
@@ -162,7 +165,7 @@ public List<Novel> search(Filter filters, int page) throws Exception {
 
         if (filters.hashKeyword()) {
             String encodedKeyword = encodeKeyword(filters.getKeyword()).trim();
-            String web = BASE_URL +"/V2/books/search?language=EN&filter=0&name=" + encodedKeyword + "&sort=6&page=".concat(String.valueOf(page - 1)) + "&onlyOffline=true&genreIds=0&genreCombining=0&tagIds=0&tagCombining=0&minChapterCount=0&maxChapterCount=9999&completion=5&onlyPremium=false&blacklistedTagIds=&onlyMature=false";
+            String web = BASE_URL + "/V2/books/search?language=EN&filter=0&name=" + encodedKeyword + "&sort=6&page=".concat(String.valueOf(page - 1)) + "&onlyOffline=true&genreIds=0&genreCombining=0&tagIds=0&tagCombining=0&minChapterCount=0&maxChapterCount=9999&completion=5&onlyPremium=false&blacklistedTagIds=&onlyMature=false";
             return parseNovels(web);
         }
 

diff --git a/app/src/main/java/org/ranobe/ranobe/sources/en/Ranobe.java b/app/src/main/java/org/ranobe/ranobe/sources/en/Ranobe.java
@@ -12,7 +12,6 @@
 import org.ranobe.ranobe.util.NumberUtils;
 import org.ranobe.ranobe.util.SourceUtils;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -54,6 +53,7 @@ public List<Novel> novels(int page) throws Exception {
 
         return items;
     }
+
     @Override
     public Novel details(Novel novel) throws Exception {
         Element doc = Jsoup.parse(HttpClient.GET(novel.url, new HashMap<>()));

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/browse/Browse.java b/app/src/main/java/org/ranobe/ranobe/ui/browse/Browse.java
@@ -1,7 +1,6 @@
 package org.ranobe.ranobe.ui.browse;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/browse/viewmodel/BrowseViewModel.java b/app/src/main/java/org/ranobe/ranobe/ui/browse/viewmodel/BrowseViewModel.java
@@ -1,11 +1,8 @@
 package org.ranobe.ranobe.ui.browse.viewmodel;
 
-import android.util.Log;
-
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-import org.ranobe.ranobe.config.Ranobe;
 import org.ranobe.ranobe.models.Novel;
 import org.ranobe.ranobe.network.repository.Repository;
 

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/chapters/adapter/ChapterAdapter.java b/app/src/main/java/org/ranobe/ranobe/ui/chapters/adapter/ChapterAdapter.java
@@ -14,8 +14,8 @@
 
 public class ChapterAdapter extends RecyclerView.Adapter<ChapterAdapter.MyViewHolder> {
     private final List<Chapter> items;
-    private List<String> readingList;
     private final OnChapterItemClickListener listener;
+    private List<String> readingList;
 
     public ChapterAdapter(List<Chapter> items, OnChapterItemClickListener listener) {
         this.items = items;

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/chapters/viewmodel/ChaptersViewModel.java b/app/src/main/java/org/ranobe/ranobe/ui/chapters/viewmodel/ChaptersViewModel.java
@@ -3,7 +3,6 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-import org.ranobe.ranobe.models.Chapter;
 import org.ranobe.ranobe.models.Chapter;
 import org.ranobe.ranobe.models.Novel;
 import org.ranobe.ranobe.network.repository.Repository;
@@ -12,6 +11,7 @@
 
 public class ChaptersViewModel extends ViewModel {
     private MutableLiveData<String> error = new MutableLiveData<>();
+
     public MutableLiveData<String> getError() {
         return error = new MutableLiveData<>();
     }

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/details/Details.java b/app/src/main/java/org/ranobe/ranobe/ui/details/Details.java
@@ -74,7 +74,7 @@ private void setUpError(String error) {
     }
 
     private void navigateToChapterList() {
-        if(novel == null) return;
+        if (novel == null) return;
         Bundle bundle = new Bundle();
         bundle.putParcelable(Ranobe.KEY_NOVEL, novel);
         Chapters chapters = new Chapters();
@@ -117,7 +117,7 @@ private void addChips(List<String> genres) {
 
     private void addToLibrary(Novel novel) {
         if (novel == null) return;
-        RanobeDatabase.databaseExecutor.execute( () -> RanobeDatabase.database().novels().save(novel));
+        RanobeDatabase.databaseExecutor.execute(() -> RanobeDatabase.database().novels().save(novel));
         Snackbar.make(binding.getRoot(), "Added novel to library", Snackbar.LENGTH_SHORT).show();
     }
 }
diff --git a/app/src/main/java/org/ranobe/ranobe/ui/details/viewmodel/DetailsViewModel.java b/app/src/main/java/org/ranobe/ranobe/ui/details/viewmodel/DetailsViewModel.java
@@ -8,9 +8,11 @@
 
 public class DetailsViewModel extends ViewModel {
     private MutableLiveData<String> error = new MutableLiveData<>();
+
     public MutableLiveData<String> getError() {
         return error = new MutableLiveData<>();
     }
+
     public MutableLiveData<Novel> details(Novel novel) {
         MutableLiveData<Novel> details = new MutableLiveData<>();
         new Repository().details(novel, new Repository.Callback<Novel>() {

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/library/Library.java b/app/src/main/java/org/ranobe/ranobe/ui/library/Library.java
@@ -61,7 +61,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     private void setNovels(List<Novel> novels) {
         binding.progress.hide();
-        if (novels.size() == 0)  {
+        if (novels.size() == 0) {
             showNoNovels();
             return;
         }

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/reader/viewmodel/ReaderViewModel.java b/app/src/main/java/org/ranobe/ranobe/ui/reader/viewmodel/ReaderViewModel.java
@@ -3,7 +3,6 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-import org.ranobe.ranobe.models.Chapter;
 import org.ranobe.ranobe.models.Chapter;
 import org.ranobe.ranobe.models.Novel;
 import org.ranobe.ranobe.network.repository.Repository;

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/search/viewmodel/SearchViewModel.java b/app/src/main/java/org/ranobe/ranobe/ui/search/viewmodel/SearchViewModel.java
@@ -12,9 +12,9 @@
 import java.util.List;
 
 public class SearchViewModel extends ViewModel {
+    private final MutableLiveData<LinkedHashMap<DataSource, List<Novel>>> results = new MutableLiveData<>();
     private MutableLiveData<String> error = new MutableLiveData<>();
     private Filter filter = new Filter();
-    private final MutableLiveData<LinkedHashMap<DataSource, List<Novel>>> results = new MutableLiveData<>();
 
     public MutableLiveData<String> getError() {
         return error = new MutableLiveData<>();
@@ -30,7 +30,7 @@ public MutableLiveData<LinkedHashMap<DataSource, List<Novel>>> search(List<DataS
         }
 
         this.filter = filter;
-        for(DataSource source: sources) {
+        for (DataSource source : sources) {
             new Repository(source.sourceId).search(filter, page, new Repository.Callback<List<Novel>>() {
                 @Override
                 public void onComplete(List<Novel> result) {

diff --git a/app/src/main/java/org/ranobe/ranobe/ui/settings/viewmodel/SettingsViewModel.java b/app/src/main/java/org/ranobe/ranobe/ui/settings/viewmodel/SettingsViewModel.java
@@ -1,4 +1,5 @@
 package org.ranobe.ranobe.ui.settings.viewmodel;
+
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;