kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 00:10:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #713 from Bnyro/master

Browse Source 
use system region
This commit is contained in:
Bnyro 2022-07-07 16:52:41 +02:00 committed by GitHub
commit 7c70cc3091
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/github/libretube/fragments/HomeFragment.kt
View File

@ -16,10 +16,12 @@ import com.github.libretube.preferences.PreferenceHelper
import com.github.libretube.util.RetrofitInstance import com.github.libretube.util.RetrofitInstance
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
import java.util.*
class HomeFragment : Fragment() { class HomeFragment : Fragment() {
private val TAG = "HomeFragment" private val TAG = "HomeFragment"
private lateinit var binding: FragmentHomeBinding private lateinit var binding: FragmentHomeBinding
private lateinit var region: String
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -43,6 +45,12 @@ class HomeFragment : Fragment() {
"grid", "grid",
resources.getInteger(R.integer.grid_items).toString() resources.getInteger(R.integer.grid_items).toString()
)!! )!!
val regionPref = PreferenceHelper.getString(requireContext(), "region", "sys")!!
// get the system default country if auto region selected
region = if (regionPref == "sys") Locale.getDefault().country else regionPref
binding.recview.layoutManager = GridLayoutManager(view.context, grid.toInt()) binding.recview.layoutManager = GridLayoutManager(view.context, grid.toInt())
fetchJson() fetchJson()
binding.homeRefresh.isEnabled = true binding.homeRefresh.isEnabled = true
@ -55,8 +63,7 @@ class HomeFragment : Fragment() {
fun run() { fun run() {
lifecycleScope.launchWhenCreated { lifecycleScope.launchWhenCreated {
val response = try { val response = try {
val region = PreferenceHelper.getString(requireContext(), "region", "US") RetrofitInstance.api.getTrending(region)
RetrofitInstance.api.getTrending(region!!)
} catch (e: IOException) { } catch (e: IOException) {
println(e) println(e)
Log.e(TAG, "IOException, you might not have internet connection") Log.e(TAG, "IOException, you might not have internet connection")

2
app/src/main/res/values/array.xml
View File

@ -65,6 +65,7 @@
<item>il.ax"</item> <item>il.ax"</item>
</string-array> </string-array>
<string-array name="regions"> <string-array name="regions">
<item>@string/systemDefault</item>
<item>Afghanistan</item> <item>Afghanistan</item>
<item>Albania</item> <item>Albania</item>
<item>Algeria</item> <item>Algeria</item>
@ -260,6 +261,7 @@
<item>Zimbabwe</item> <item>Zimbabwe</item>
</string-array> </string-array>
<string-array name="regionsValue"> <string-array name="regionsValue">
<item>sys</item>
<item>AF</item> <item>AF</item>
<item>AL</item> <item>AL</item>
<item>DZ</item> <item>DZ</item>

2
app/src/main/res/xml/settings.xml
View File

@ -6,7 +6,7 @@
<ListPreference <ListPreference
android:icon="@drawable/ic_region" android:icon="@drawable/ic_region"
app:defaultValue="US" app:defaultValue="sys"
app:entries="@array/regions" app:entries="@array/regions"
app:entryValues="@array/regionsValue" app:entryValues="@array/regionsValue"
app:key="region" app:key="region"