athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add back search filters from v3

Browse Source
This commit is contained in:
Rahul Kumar Patel
2021-04-05 04:28:09 +05:30
parent a76638af0d
commit ee8cde3f26
14 changed files with 575 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -169,7 +169,7 @@ dependencies {
implementation "com.github.topjohnwu.libsu:core:${versions.libsu}"
//Love <3
api("com.gitlab.AuroraOSS:gplayapi:efb14fa545")
api("com.gitlab.AuroraOSS:gplayapi:12bb682648")
}
Properties props = new Properties()

29
app/src/main/java/com/aurora/store/data/Filter.kt Normal file
View File

@@ -0,0 +1,29 @@
/*
* Aurora Store
* Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
*
* Aurora Store is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Aurora Store is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.aurora.store.data
class Filter {
var appsWithAds = true
var appsWithIAP = true
var paidApps = true
var gsfDependentApps = true
var rating = 0.0f
var downloads = 0
}

50
app/src/main/java/com/aurora/store/data/providers/FilterProvider.kt Normal file
View File

@@ -0,0 +1,50 @@
/*
* Aurora Store
* Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
*
* Aurora Store is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Aurora Store is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.aurora.store.data.providers
import android.content.Context
import com.aurora.store.data.Filter
import com.aurora.store.data.SingletonHolder
import com.aurora.store.util.Preferences
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import java.lang.reflect.Modifier
class FilterProvider private constructor(var context: Context) {
companion object : SingletonHolder<FilterProvider, Context>(::FilterProvider) {
const val PREFERENCE_FILTER = "PREFERENCE_FILTER"
}
private var gson: Gson = GsonBuilder()
.excludeFieldsWithModifiers(Modifier.TRANSIENT)
.create()
fun getSavedFilter(): Filter {
var rawFilter = Preferences.getString(context, PREFERENCE_FILTER)
if (rawFilter.isEmpty())
rawFilter = "{}"
return gson.fromJson(rawFilter, Filter::class.java)
}
fun saveFilter(filter: Filter) {
Preferences.putString(context, PREFERENCE_FILTER, gson.toJson(filter))
}
}

3
app/src/main/java/com/aurora/store/util/Preferences.kt
View File

@@ -40,6 +40,7 @@ object Preferences {
const val PREFERENCE_FILTER_GOOGLE = "PREFERENCE_FILTER_GOOGLE"
const val PREFERENCE_FILTER_FDROID = "PREFERENCE_FILTER_FDROID"
const val PREFERENCE_FILTER_SEARCH = "PREFERENCE_FILTER_SEARCH"
const val PREFERENCE_AUTO_INSTALL = "PREFERENCE_AUTO_INSTALL"
const val PREFERENCE_AUTO_DELETE = "PREFERENCE_AUTO_DELETE"
@@ -55,7 +56,7 @@ object Preferences {
const val PREFERENCE_INSECURE_ANONYMOUS = "PREFERENCE_INSECURE_ANONYMOUS"
private fun getPrefs(context: Context): SharedPreferences {
fun getPrefs(context: Context): SharedPreferences {
return PreferenceManager.getDefaultSharedPreferences(context)
}

2
app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
View File

@@ -37,6 +37,7 @@ import com.aurora.store.util.Preferences.PREFERENCE_DOWNLOAD_ACTIVE
import com.aurora.store.util.Preferences.PREFERENCE_DOWNLOAD_EXTERNAL
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_FDROID
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_GOOGLE
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_SEARCH
import com.aurora.store.util.Preferences.PREFERENCE_FOR_YOU
import com.aurora.store.util.Preferences.PREFERENCE_INSECURE_ANONYMOUS
import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID
@@ -155,6 +156,7 @@ class OnboardingActivity : BaseActivity() {
/*Filters*/
save(PREFERENCE_FILTER_FDROID, true)
save(PREFERENCE_FILTER_GOOGLE, false)
save(PREFERENCE_FILTER_SEARCH, true)
/*Downloader*/
save(PREFERENCE_DOWNLOAD_ACTIVE, 3)

140
app/src/main/java/com/aurora/store/view/ui/search/SearchResultsActivity.kt
View File

@@ -19,6 +19,8 @@
package com.aurora.store.view.ui.search
import android.content.SharedPreferences
import android.content.SharedPreferences.OnSharedPreferenceChangeListener
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
@@ -28,20 +30,27 @@ import android.view.inputmethod.EditorInfo
import android.widget.TextView
import androidx.lifecycle.ViewModelProvider
import com.aurora.Constants
import com.aurora.gplayapi.data.models.SearchBundle
import com.aurora.store.databinding.ActivitySearchResultBinding
import com.aurora.extensions.close
import com.aurora.extensions.open
import com.aurora.gplayapi.data.models.App
import com.aurora.gplayapi.data.models.SearchBundle
import com.aurora.store.R
import com.aurora.store.data.Filter
import com.aurora.store.data.providers.FilterProvider
import com.aurora.store.databinding.ActivitySearchResultBinding
import com.aurora.store.util.Preferences
import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
import com.aurora.store.view.epoxy.views.app.AppListViewModel_
import com.aurora.store.view.epoxy.views.AppProgressViewModel_
import com.aurora.store.view.epoxy.views.app.AppListViewModel_
import com.aurora.store.view.epoxy.views.app.NoAppViewModel_
import com.aurora.store.view.ui.commons.BaseActivity
import com.aurora.store.view.ui.downloads.DownloadActivity
import com.aurora.store.view.ui.sheets.FilterSheet
import com.aurora.store.viewmodel.search.SearchResultViewModel
import com.google.android.material.textfield.TextInputEditText
class SearchResultsActivity : BaseActivity() {
class SearchResultsActivity : BaseActivity(), OnSharedPreferenceChangeListener {
lateinit var B: ActivitySearchResultBinding
lateinit var VM: SearchResultViewModel
@@ -49,6 +58,9 @@ class SearchResultsActivity : BaseActivity() {
lateinit var endlessRecyclerOnScrollListener: EndlessRecyclerOnScrollListener
lateinit var searchView: TextInputEditText
lateinit var sharedPreferences: SharedPreferences
lateinit var filter: Filter
var query: String? = null
var searchBundle: SearchBundle = SearchBundle()
@@ -69,6 +81,10 @@ class SearchResultsActivity : BaseActivity() {
B = ActivitySearchResultBinding.inflate(layoutInflater)
VM = ViewModelProvider(this).get(SearchResultViewModel::class.java)
sharedPreferences = Preferences.getPrefs(this)
sharedPreferences.registerOnSharedPreferenceChangeListener(this)
filter = FilterProvider.with(this).getSavedFilter()
setContentView(B.root)
VM.liveData.observe(this, {
@@ -79,6 +95,7 @@ class SearchResultsActivity : BaseActivity() {
attachToolbar()
attachSearch()
attachRecycler()
attachFilter()
query = intent.getStringExtra(Constants.STRING_EXTRA)
query?.let {
@@ -86,6 +103,13 @@ class SearchResultsActivity : BaseActivity() {
}
}
override fun onDestroy() {
sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
if (Preferences.getBoolean(this, Preferences.PREFERENCE_FILTER_SEARCH))
FilterProvider.with(this).saveFilter(Filter())
super.onDestroy()
}
private fun attachToolbar() {
searchView = B.layoutViewToolbar.inputSearch
@@ -97,6 +121,12 @@ class SearchResultsActivity : BaseActivity() {
}
}
private fun attachFilter() {
B.filterFab.setOnClickListener {
FilterSheet.newInstance().show(supportFragmentManager, "")
}
}
private fun attachRecycler() {
endlessRecyclerOnScrollListener = object : EndlessRecyclerOnScrollListener() {
override fun onLoadMore(currentPage: Int) {
@@ -107,27 +137,63 @@ class SearchResultsActivity : BaseActivity() {
}
private fun updateController(searchBundle: SearchBundle) {
B.recycler
.withModels {
setFilterDuplicates(true)
searchBundle.appList.forEach { app ->
add(
AppListViewModel_()
.id(app.id)
.app(app)
.click(View.OnClickListener {
openDetailsActivity(app)
})
)
}
val filteredAppList = filter(searchBundle.appList)
if (searchBundle.subBundles.isNotEmpty()) {
if (filteredAppList.isEmpty()) {
if (searchBundle.subBundles.isNotEmpty()) {
VM.next(searchBundle.subBundles)
B.recycler.withModels {
setFilterDuplicates(true)
add(
AppProgressViewModel_()
.id("progress")
)
}
} else {
B.recycler.adapter?.let {
/*Show empty search list if nothing found or no app matches filter criterion*/
if (it.itemCount == 1 && searchBundle.subBundles.isEmpty()) {
B.recycler.withModels {
add(
NoAppViewModel_()
.id("no_app")
.message(getString(R.string.details_no_app_match))
.icon(R.drawable.ic_round_search)
)
}
}
}
}
} else {
B.recycler
.withModels {
setFilterDuplicates(true)
filteredAppList.forEach { app ->
add(
AppListViewModel_()
.id(app.id)
.app(app)
.click(View.OnClickListener {
openDetailsActivity(app)
})
)
}
if (searchBundle.subBundles.isNotEmpty()) {
add(
AppProgressViewModel_()
.id("progress")
)
}
}
B.recycler.adapter?.let {
if (it.itemCount < 10) {
VM.next(searchBundle.subBundles)
}
}
}
}
private fun attachSearch() {
@@ -137,12 +203,7 @@ class SearchResultsActivity : BaseActivity() {
}
override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
if (s.isNotEmpty()) {
/*val query = s.toString()
if (query.isNotEmpty()) {
VM.observeSearchResults(query)
}*/
}
}
override fun afterTextChanged(s: Editable) {}
@@ -150,9 +211,9 @@ class SearchResultsActivity : BaseActivity() {
searchView.setOnEditorActionListener { _: TextView?, actionId: Int, _: KeyEvent? ->
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
val query = searchView.text.toString()
if (query.isNotEmpty()) {
queryViewModel(query)
query = searchView.text.toString()
query?.let {
queryViewModel(it)
return@setOnEditorActionListener true
}
}
@@ -167,10 +228,29 @@ class SearchResultsActivity : BaseActivity() {
}
private fun queryViewModel(query: String) {
VM.observeSearchResults(query)
endlessRecyclerOnScrollListener.resetPageCount()
B.recycler.clear()
searchBundle.subBundles.clear()
searchBundle.appList.clear()
VM.observeSearchResults(query)
}
private fun filter(appList: MutableList<App>): List<App> {
filter = FilterProvider.with(this).getSavedFilter()
return appList
.asSequence()
.filter { if (!filter.paidApps) it.isFree else true }
.filter { if (!filter.appsWithAds) !it.containsAds else true }
.filter { if (!filter.gsfDependentApps) it.dependencies.dependentPackages.isEmpty() else true }
.filter { if (filter.rating > 0) it.rating.average >= filter.rating else true }
.filter { if (filter.downloads > 0) it.installs >= filter.downloads else true }
.toList()
}
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
if (key == FilterProvider.PREFERENCE_FILTER) {
filter = FilterProvider.with(this).getSavedFilter()
query?.let {
queryViewModel(it)
}
}
}
}

138
app/src/main/java/com/aurora/store/view/ui/sheets/FilterSheet.kt Normal file
View File

@@ -0,0 +1,138 @@
/*
* Aurora Store
* Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
*
* Aurora Store is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Aurora Store is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.aurora.store.view.ui.sheets
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.aurora.store.R
import com.aurora.store.data.Filter
import com.aurora.store.data.providers.FilterProvider
import com.aurora.store.databinding.SheetFilterBinding
import com.google.android.material.chip.Chip
class FilterSheet : BaseBottomSheet() {
private lateinit var B: SheetFilterBinding
private lateinit var filter: Filter
companion object {
const val TAG = "TOSSheet"
@JvmStatic
fun newInstance(): FilterSheet {
return FilterSheet().apply {
arguments = Bundle().apply {
}
}
}
}
override fun onCreateContentView(
inflater: LayoutInflater,
container: ViewGroup,
savedInstanceState: Bundle?
): View {
B = SheetFilterBinding.inflate(inflater, container, false)
filter = FilterProvider.with(requireContext()).getSavedFilter()
return B.root
}
override fun onContentViewCreated(view: View, savedInstanceState: Bundle?) {
attachSingleChips()
attachMultipleChips()
attachActions()
}
private fun attachActions() {
B.btnPositive.setOnClickListener {
FilterProvider.with(requireContext()).saveFilter(filter)
dismissAllowingStateLoss()
}
B.btnNegative.setOnClickListener {
dismissAllowingStateLoss()
}
}
private fun attachSingleChips() {
B.filterGfs.apply {
isChecked = filter.gsfDependentApps
setOnCheckedChangeListener { _, checked ->
isChecked = checked
filter.gsfDependentApps = checked
}
}
B.filterPaid.apply {
isChecked = filter.paidApps
setOnCheckedChangeListener { _, checked ->
isChecked = checked
filter.paidApps = checked
}
}
B.filterAds.apply {
isChecked = filter.appsWithAds
setOnCheckedChangeListener { _, checked ->
isChecked = checked
filter.appsWithAds = checked
}
}
}
private fun attachMultipleChips() {
val downloadLabels = resources.getStringArray(R.array.filterDownloadsLabels)
val downloadValues = resources.getStringArray(R.array.filterDownloadsValues)
val ratingLabels = resources.getStringArray(R.array.filterRatingLabels)
val ratingValues = resources.getStringArray(R.array.filterRatingValues)
var i = 0
for (downloadLabel in downloadLabels) {
val chip = Chip(requireContext())
chip.id = i
chip.text = downloadLabel
chip.isChecked = filter.downloads == downloadValues[i].toInt()
B.downloadChips.addView(chip)
i++
}
B.downloadChips.setOnCheckedChangeListener { _, id: Int ->
filter.downloads = downloadValues[id].toInt()
}
i = 0
for (ratingLabel in ratingLabels) {
val chip = Chip(requireContext())
chip.id = i
chip.text = ratingLabel
chip.isChecked = filter.rating == ratingValues[i].toFloat()
B.ratingChips.addView(chip)
i++
}
B.ratingChips.setOnCheckedChangeListener { _, id: Int ->
filter.rating = ratingValues[id].toFloat()
}
}
}

14
app/src/main/res/layout/activity_search_result.xml
View File

@@ -39,4 +39,18 @@
android:layout_below="@+id/layout_view_toolbar"
app:itemSpacing="@dimen/margin_normal" />
</RelativeLayout>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/filter_fab"
style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="@dimen/margin_normal"
android:text="@string/action_filter"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle.Alt"
android:textColor="@color/colorWhite"
app:backgroundTint="@color/colorAccent"
app:icon="@drawable/ic_filter"
app:iconTint="@color/colorWhite" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

168
app/src/main/res/layout/sheet_filter.xml Normal file
View File

@@ -0,0 +1,168 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Aurora Store
~ Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
~
~ Aurora Store is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 2 of the License, or
~ (at your option) any later version.
~
~ Aurora Store is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
~
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/margin_normal"
android:layout_marginBottom="@dimen/margin_small"
android:paddingHorizontal="@dimen/margin_normal"
android:text="@string/action_filter"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle.Alt" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/layout_bottom"
android:layout_below="@id/txt_title"
android:padding="@dimen/padding_medium"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:targetApi="o">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text="@string/action_filter_misc"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.ChipGroup
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
app:chipSpacingHorizontal="@dimen/margin_small"
app:chipSpacingVertical="@dimen/margin_normal">
<com.google.android.material.chip.Chip
android:id="@+id/filter_gfs"
style="@style/Widget.Aurora.Chip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_gsf_dependent_apps" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_paid"
style="@style/Widget.Aurora.Chip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_paid_apps" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_ads"
style="@style/Widget.Aurora.Chip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_apps_with_ads" />
</com.google.android.material.chip.ChipGroup>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text="@string/action_filter_rating"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.ChipGroup
android:id="@+id/rating_chips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
app:chipSpacingHorizontal="@dimen/margin_small"
app:chipSpacingVertical="@dimen/margin_xsmall"
app:selectionRequired="true"
app:singleSelection="true" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text="@string/action_filter_downloads"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.ChipGroup
android:id="@+id/download_chips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
app:chipSpacingHorizontal="@dimen/margin_small"
app:chipSpacingVertical="@dimen/margin_xsmall"
app:selectionRequired="true"
app:singleSelection="true" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true">
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_positive"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="0dp"
android:layout_height="@dimen/height_button"
android:text="@string/action_filter_apply"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_negative"
app:layout_constraintTop_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:rippleColor="@color/colorTransparent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_negative"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="0dp"
android:layout_height="@dimen/height_button"
android:text="@string/action_close"
android:textColor="@color/colorRed"
app:layout_constraintEnd_toStartOf="@id/btn_positive"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:rippleColor="@color/colorTransparent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>

6
app/src/main/res/layout/sheet_tos.xml
View File

@@ -71,14 +71,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="false"
android:text="@string/onboarding_tos" />
android:text="@string/onboarding_tos"
android:textAllCaps="false" />
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/checkbox_accept"
android:minHeight="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="0dp"
android:text="@string/onboarding_tos_confirmation"
android:textAppearance="@style/TextAppearance.Aurora.Line2" />
</LinearLayout>

45
app/src/main/res/values/arrays.xml
View File

@@ -172,4 +172,49 @@
<item>2</item>
</string-array>
<string-array name="filterRatingValues" translatable="false">
<item>0</item>
<item>1.0</item>
<item>2.0</item>
<item>3.0</item>
<item>4.0</item>
<item>4.5</item>
<item>4.7</item>
</string-array>
<string-array name="filterRatingLabels" translatable="false">
<item>@string/action_filter_all</item>
<item> 1 + </item>
<item> 2 + </item>
<item> 3 + </item>
<item> 4 + </item>
<item> 4.5 + </item>
<item> 4.7 + </item>
</string-array>
<string-array name="filterDownloadsValues" translatable="false">
<item>0</item>
<item>100</item>
<item>1000</item>
<item>10000</item>
<item>50000</item>
<item>100000</item>
<item>1000000</item>
<item>10000000</item>
<item>50000000</item>
<item>100000000</item>
</string-array>
<string-array name="filterDownloadsLabels" translatable="false">
<item>@string/action_filter_all</item>
<item> > 100 </item>
<item> > 1 K </item>
<item> > 10 K </item>
<item> > 50 K </item>
<item> > 100 K </item>
<item> > 1 M </item>
<item> > 10 M </item>
<item> > 50 M </item>
<item> > 100 M </item>
</string-array>
</resources>

3
app/src/main/res/values/strings.xml
View File

@@ -149,6 +149,7 @@
<string name="details_more_about_app">"More about app"</string>
<string name="details_no_ads">"No ads"</string>
<string name="details_no_app">"No apps available"</string>
<string name="details_no_app_match">"No app match found"</string>
<string name="details_no_dependencies">"No Dependencies"</string>
<string name="details_no_previews">"No previews available"</string>
<string name="details_no_permission">"No permissions"</string>
@@ -268,6 +269,8 @@
<string name="pref_filter_fdroid_title">"Filter F-Droid apps"</string>
<string name="pref_filter_google_summary">"Removes all Google Apps from search results and category apps"</string>
<string name="pref_filter_google_title">"Filter Google apps"</string>
<string name="pref_filter_search_summary">"Search filters are reset on each search. Turn off to save search filters"</string>
<string name="pref_filter_search_title">"Use non-persistent search filter"</string>
<string name="pref_insecure_anonymous_summary">"Generate GSF ID locally on device"</string>
<string name="pref_insecure_anonymous_title">"Insecure anonymous session"</string>
<string name="pref_install_auto_summary">"Apps are installed instantly after download completes"</string>

3
app/src/main/res/values/styles.xml
View File

@@ -29,6 +29,7 @@
<item name="scrimBlack">@color/colorScrimBlack</item>
<item name="colorShimmer">@color/colorShimmer</item>
<item name="colorStroke">@color/colorStroke</item>
<item name="chipStyle">@style/Widget.Aurora.Chip</item>
</style>
<style name="AppTheme.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
@@ -45,6 +46,7 @@
<item name="scrimBlack">@color/colorScrimBlack</item>
<item name="colorShimmer">@color/colorShimmer</item>
<item name="colorStroke">@color/colorStroke</item>
<item name="chipStyle">@style/Widget.Aurora.Chip</item>
</style>
<style name="AppTheme.Dark" parent="Theme.MaterialComponents.NoActionBar">
@@ -62,6 +64,7 @@
<item name="scrimBlack">@color/colorScrimBlack</item>
<item name="colorShimmer">@color/colorShimmerDark</item>
<item name="colorStroke">@color/colorStrokeDark</item>
<item name="chipStyle">@style/Widget.Aurora.Chip</item>
</style>
<style name="AppTheme.DarkX" parent="AppTheme.Dark">

7
app/src/main/res/xml/preferences_filter.xml
View File

@@ -32,4 +32,11 @@
app:key="PREFERENCE_FILTER_FDROID"
app:summary="@string/pref_filter_fdroid_summary"
app:title="@string/pref_filter_fdroid_title" />
<SwitchPreferenceCompat
app:defaultValue="true"
app:iconSpaceReserved="false"
app:key="PREFERENCE_FILTER_SEARCH"
app:summary="@string/pref_filter_search_summary"
app:title="@string/pref_filter_search_title" />
</PreferenceScreen>