From 62bc4d36fec86eea6e33f55103cabdbc6ed57e26 Mon Sep 17 00:00:00 2001
From: LikDev-256 <81100289+LikDev-256@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:37:01 +0530
Subject: [PATCH 01/11] Create release
---
.github/workflows/Debugrelease.yml | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 .github/workflows/Debugrelease.yml
diff --git a/.github/workflows/Debugrelease.yml b/.github/workflows/Debugrelease.yml
new file mode 100644
index 00000000..99d71e49
--- /dev/null
+++ b/.github/workflows/Debugrelease.yml
@@ -0,0 +1,2 @@
+- name: Build & Publish Debug APK
+ uses: ShaunLWM/action-release-debugapk@0.0.7
From 6cca687bce77ea754622dbfe98f1a346103f0c4e Mon Sep 17 00:00:00 2001
From: LikDev-256 <81100289+LikDev-256@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:38:43 +0530
Subject: [PATCH 02/11] Delete debug action file
---
.github/workflows/Debugrelease.yml | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 .github/workflows/Debugrelease.yml
diff --git a/.github/workflows/Debugrelease.yml b/.github/workflows/Debugrelease.yml
deleted file mode 100644
index 99d71e49..00000000
--- a/.github/workflows/Debugrelease.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-- name: Build & Publish Debug APK
- uses: ShaunLWM/action-release-debugapk@0.0.7
From f80b675efd102ad9d347becd88189588b88b5b5b Mon Sep 17 00:00:00 2001
From: LikDev-256 <81100289+LikDev-256@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:45:15 +0530
Subject: [PATCH 03/11] Create GitHub actions for automated publishing
---
.github/workflows/main.yml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 .github/workflows/main.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..dacb8092
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,28 @@
+name: Build & Publish Debug APK
+
+on:
+ push:
+ branches:
+ - master
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v1
+ - name: set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - name: Make Gradle executable
+ run: chmod +x ./gradlew
+ - name: Build with Gradle
+ run: ./gradlew build
+ - name: Build Debug APK
+ run: ./gradlew assembleDebug
+ - name: Releasing using Hub
+ uses: ShaunLWM/action-release-debugapk@master
+ env:
+ GITHUB_TOKEN: ${{ secrets.TOKEN }}
+ APP_FOLDER: app
+ RELEASE_TITLE: Prerelease
From 40591e466fc8df1689234a8d3decfbb65a9467a7 Mon Sep 17 00:00:00 2001
From: LikDev-256 <81100289+LikDev-256@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:55:32 +0530
Subject: [PATCH 04/11] Update action
---
.github/workflows/main.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dacb8092..2aaa7525 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,16 +10,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- - name: set up JDK 1.8
- uses: actions/setup-java@v1
+ - name: Set up JDK 11
+ uses: actions/setup-java@v2
with:
- java-version: 1.8
- - name: Make Gradle executable
- run: chmod +x ./gradlew
- - name: Build with Gradle
- run: ./gradlew build
- - name: Build Debug APK
- run: ./gradlew assembleDebug
+ java-version: '11'
+ distribution: 'adopt'
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+ - name: Run Gradle
+ run: |
+ ./gradlew assembleDebug
- name: Releasing using Hub
uses: ShaunLWM/action-release-debugapk@master
env:
From 63c713fc6830df7c7d7bb42a8b2bdc183eeb09f9 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 14 Oct 2022 20:18:32 +0200
Subject: [PATCH 05/11] Changed home selection sheet to fully open and allow
upwards scrolling :)
---
.../java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt | 2 ++
app/src/main/res/layout/home_select_mainpage.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 520b6b99..0d571b76 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -23,6 +23,7 @@ import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearSnapHelper
import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.button.MaterialButton
import com.lagradost.cloudstream3.*
@@ -280,6 +281,7 @@ class HomeFragment : Fragment() {
val builder =
BottomSheetDialog(this)
+ builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
builder.setContentView(R.layout.home_select_mainpage)
builder.show()
builder.let { dialog ->
diff --git a/app/src/main/res/layout/home_select_mainpage.xml b/app/src/main/res/layout/home_select_mainpage.xml
index ca9fa517..8546d9b1 100644
--- a/app/src/main/res/layout/home_select_mainpage.xml
+++ b/app/src/main/res/layout/home_select_mainpage.xml
@@ -10,7 +10,7 @@
android:id="@+id/listview1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
-
+ android:nestedScrollingEnabled="true"
android:layout_rowWeight="1"
android:layout_marginTop="10dp"
android:layout_marginBottom="60dp"
From e67d248f7f18f13fa67f668b85ae1c6e96350592 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Fri, 14 Oct 2022 23:56:21 +0200
Subject: [PATCH 06/11] Fix searching in repos & search provider selection
bottom sheet
---
.../cloudstream3/ui/search/SearchFragment.kt | 2 ++
.../ui/settings/extensions/PluginsFragment.kt | 13 ++++---------
.../ui/settings/extensions/PluginsViewModel.kt | 2 +-
app/src/main/res/menu/repository.xml | 14 +++++++++-----
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 69f8a274..5f108cd1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -17,6 +17,7 @@ import androidx.fragment.app.activityViewModels
import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.button.MaterialButton
import com.lagradost.cloudstream3.*
@@ -232,6 +233,7 @@ class SearchFragment : Fragment() {
val builder =
BottomSheetDialog(ctx)
+ builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
builder.setContentView(R.layout.home_select_mainpage)
builder.show()
builder.let { dialog ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index e4435fff..aa302c5a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -1,27 +1,22 @@
package com.lagradost.cloudstream3.ui.settings.extensions
import android.os.Bundle
-import android.view.*
-import android.widget.SearchView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.SearchView
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.map
-import com.lagradost.cloudstream3.AcraApplication
-import com.lagradost.cloudstream3.CommonActivity
import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.mvvm.observe
import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.getPairList
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
import com.lagradost.cloudstream3.ui.settings.appLanguages
-import com.lagradost.cloudstream3.ui.settings.getCurrentLocale
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
import com.lagradost.cloudstream3.utils.SubtitleHelper
import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
import kotlinx.android.synthetic.main.fragment_plugins.*
const val PLUGINS_BUNDLE_NAME = "name"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index b0e253be..536dc33b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -210,7 +210,7 @@ class PluginsViewModel : ViewModel() {
// Return list to base state if no query
this.sortedBy { it.plugin.second.name }
} else {
- this.sortedBy { -FuzzySearch.ratio(it.plugin.second.name, query) }
+ this.sortedBy { -FuzzySearch.partialRatio(it.plugin.second.name.lowercase(), query.lowercase()) }
}
}
diff --git a/app/src/main/res/menu/repository.xml b/app/src/main/res/menu/repository.xml
index d44c9764..be99b1a8 100644
--- a/app/src/main/res/menu/repository.xml
+++ b/app/src/main/res/menu/repository.xml
@@ -1,13 +1,17 @@
-