diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt index 0925c658b..572322e1a 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt @@ -30,8 +30,6 @@ import org.mozilla.javascript.NativeObject import java.net.URL import java.util.Locale import java.util.regex.Pattern -import kotlin.collections.component1 -import kotlin.collections.component2 import kotlin.coroutines.ContinuationInterceptor import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext @@ -653,7 +651,7 @@ class AnalyzeRule( jsEval is String -> infoVal.insert(0, jsEval) jsEval is Double && jsEval % 1.0 == 0.0 -> infoVal.insert( 0, - String.format(Locale.getDefault(), "%.0f", jsEval) + String.format(Locale.ROOT, "%.0f", jsEval) ) else -> infoVal.insert(0, jsEval.toString()) diff --git a/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesActivity.kt b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesActivity.kt index e5db6eec1..827e54b04 100644 --- a/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesActivity.kt @@ -46,7 +46,7 @@ class RssFavoritesActivity : BaseActivity() { } override fun onCompatCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.main_explore, menu) + menuInflater.inflate(R.menu.rss_favorites, menu) groupsMenu = menu.findItem(R.id.menu_group)?.subMenu upGroupsMenu() return super.onCompatCreateOptionsMenu(menu) diff --git a/app/src/main/res/menu/rss_favorites.xml b/app/src/main/res/menu/rss_favorites.xml new file mode 100644 index 000000000..159adcb41 --- /dev/null +++ b/app/src/main/res/menu/rss_favorites.xml @@ -0,0 +1,15 @@ + + + + + + + + + +