Compare commits
No commits in common. "c87225cc5fcb44e62d796855a0ecec3c2ab74755" and "7b68264dd78e739e851d9e2a36c2361da90b6986" have entirely different histories.
c87225cc5f
...
7b68264dd7
@ -1,7 +1,6 @@
|
|||||||
import java.io.ByteArrayOutputStream
|
import java.io.ByteArrayOutputStream
|
||||||
|
|
||||||
val ignoreGitVersion: String by project
|
val ignoreGitVersion: String by project
|
||||||
val acraVersion = "5.9.7"
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.android.application")
|
id("com.android.application")
|
||||||
@ -188,9 +187,6 @@ dependencies {
|
|||||||
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
|
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
|
||||||
|
|
||||||
implementation("ch.acra:acra-http:$acraVersion")
|
|
||||||
implementation("ch.acra:acra-toast:$acraVersion")
|
|
||||||
|
|
||||||
// Matomo
|
// Matomo
|
||||||
implementation("com.github.matomo-org:matomo-sdk-android:4.1.4")
|
implementation("com.github.matomo-org:matomo-sdk-android:4.1.4")
|
||||||
}
|
}
|
||||||
|
@ -59,15 +59,11 @@ import com.mikepenz.materialdrawer.util.updateBadge
|
|||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.acra.ACRA
|
|
||||||
import org.acra.ktx.sendSilentlyWithAcra
|
|
||||||
import org.acra.ktx.sendWithAcra
|
|
||||||
import org.kodein.di.DIAware
|
import org.kodein.di.DIAware
|
||||||
import org.kodein.di.android.closestDI
|
import org.kodein.di.android.closestDI
|
||||||
import org.kodein.di.instance
|
import org.kodein.di.instance
|
||||||
import org.matomo.sdk.Tracker
|
import org.matomo.sdk.Tracker
|
||||||
import org.matomo.sdk.extra.TrackHelper
|
import org.matomo.sdk.extra.TrackHelper
|
||||||
import java.security.MessageDigest
|
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
|
|
||||||
@ -310,8 +306,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
|
|
||||||
handleBottomBarActions()
|
handleBottomBarActions()
|
||||||
|
|
||||||
handleGDPRDialog(appSettingsService.settings.getBoolean("GDPR_shown", false))
|
|
||||||
|
|
||||||
handleRecurringTask()
|
handleRecurringTask()
|
||||||
|
|
||||||
CoroutineScope(Dispatchers.Main).launch {
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
@ -321,26 +315,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
getElementsAccordingToTab()
|
getElementsAccordingToTab()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private fun handleGDPRDialog(GDPRShown: Boolean) {
|
|
||||||
val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
|
|
||||||
messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
|
|
||||||
ACRA.errorReporter.putCustomData("unique_id", String(messageDigest.digest()))
|
|
||||||
if (!GDPRShown) {
|
|
||||||
val alertDialog = AlertDialog.Builder(this).create()
|
|
||||||
alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
|
|
||||||
alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
|
|
||||||
alertDialog.setButton(
|
|
||||||
AlertDialog.BUTTON_NEUTRAL,
|
|
||||||
"OK"
|
|
||||||
) { dialog, _ ->
|
|
||||||
appSettingsService.settings.putBoolean("GDPR_shown", true)
|
|
||||||
dialog.dismiss()
|
|
||||||
}
|
|
||||||
alertDialog.show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun initDrawer() {
|
private fun initDrawer() {
|
||||||
DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
|
DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
|
||||||
override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
|
override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
|
||||||
@ -513,7 +487,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
val gdColor = try {
|
val gdColor = try {
|
||||||
Color.parseColor(it.color)
|
Color.parseColor(it.color)
|
||||||
} catch (e: IllegalArgumentException) {
|
} catch (e: IllegalArgumentException) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
resources.getColor(R.color.colorPrimary)
|
resources.getColor(R.color.colorPrimary)
|
||||||
}
|
}
|
||||||
gd.setColor(gdColor)
|
gd.setColor(gdColor)
|
||||||
|
@ -29,12 +29,6 @@ import kotlinx.coroutines.CoroutineScope
|
|||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.acra.ReportField
|
|
||||||
import org.acra.config.httpSender
|
|
||||||
import org.acra.config.toast
|
|
||||||
import org.acra.data.StringFormat
|
|
||||||
import org.acra.ktx.initAcra
|
|
||||||
import org.acra.sender.HttpSender
|
|
||||||
import org.kodein.di.*
|
import org.kodein.di.*
|
||||||
import org.matomo.sdk.Matomo
|
import org.matomo.sdk.Matomo
|
||||||
import org.matomo.sdk.Tracker
|
import org.matomo.sdk.Tracker
|
||||||
@ -91,35 +85,6 @@ class MyApp : MultiDexApplication(), DIAware {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun attachBaseContext(base: Context?) {
|
|
||||||
super.attachBaseContext(base)
|
|
||||||
|
|
||||||
initAcra {
|
|
||||||
//core configuration:
|
|
||||||
buildConfigClass = BuildConfig::class.java
|
|
||||||
reportFormat = StringFormat.JSON
|
|
||||||
|
|
||||||
reportContent = listOf(
|
|
||||||
ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
|
|
||||||
ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
|
|
||||||
ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
|
|
||||||
ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
|
|
||||||
ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
|
|
||||||
ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
|
|
||||||
ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA)
|
|
||||||
toast {
|
|
||||||
//required
|
|
||||||
text = getString(R.string.crash_toast_text)
|
|
||||||
length = Toast.LENGTH_LONG
|
|
||||||
}
|
|
||||||
httpSender {
|
|
||||||
uri = "https://your.server.com/report"
|
|
||||||
httpMethod = HttpSender.Method.POST
|
|
||||||
compress = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun handleNotificationChannels() {
|
private fun handleNotificationChannels() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
|
val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
|
||||||
|
@ -44,8 +44,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
|
|||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.acra.ktx.sendSilentlyWithAcra
|
|
||||||
import org.acra.ktx.sendWithAcra
|
|
||||||
import org.kodein.di.DI
|
import org.kodein.di.DI
|
||||||
import org.kodein.di.DIAware
|
import org.kodein.di.DIAware
|
||||||
import org.kodein.di.android.x.closestDI
|
import org.kodein.di.android.x.closestDI
|
||||||
@ -114,7 +112,6 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
typeface = try {
|
typeface = try {
|
||||||
ResourcesCompat.getFont(requireContext(), resId)!!
|
ResourcesCompat.getFont(requireContext(), resId)!!
|
||||||
} catch (e: java.lang.Exception) {
|
} catch (e: java.lang.Exception) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
// Just to be sure
|
// Just to be sure
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
@ -220,7 +217,6 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
)
|
)
|
||||||
|
|
||||||
} catch (e: InflateException) {
|
} catch (e: InflateException) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
AlertDialog.Builder(requireContext())
|
AlertDialog.Builder(requireContext())
|
||||||
.setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
|
.setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
|
||||||
.setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
|
.setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
|
||||||
@ -268,18 +264,15 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
URL(response.data!!.url)
|
URL(response.data!!.url)
|
||||||
url = response.data!!.url
|
url = response.data!!.url
|
||||||
} catch (e: MalformedURLException) {
|
} catch (e: MalformedURLException) {
|
||||||
// Mercury returned a relative url
|
// Mercury returned a relative url. We do nothing.
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
contentText = response.data!!.content.orEmpty()
|
contentText = response.data!!.content.orEmpty()
|
||||||
htmlToWebview()
|
htmlToWebview()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -295,13 +288,13 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
.apply(RequestOptions.fitCenterTransform())
|
.apply(RequestOptions.fitCenterTransform())
|
||||||
.into(binding.imageView)
|
.into(binding.imageView)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.imageView.visibility = View.GONE
|
binding.imageView.visibility = View.GONE
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.sendSilentlyWithAcra()
|
if (context != null) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -309,17 +302,20 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
|
|
||||||
binding.progressBar.visibility = View.GONE
|
binding.progressBar.visibility = View.GONE
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.sendSilentlyWithAcra()
|
if (context != null) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
openInBrowserAfterFailing()
|
openInBrowserAfterFailing()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.sendSilentlyWithAcra()
|
if (context != null) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.sendSilentlyWithAcra()
|
if (context != null) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
openInBrowserAfterFailing()
|
openInBrowserAfterFailing()
|
||||||
@ -363,25 +359,19 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
try {
|
try {
|
||||||
val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
|
val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
|
||||||
return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
|
return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
|
||||||
} catch ( e : ExecutionException) {
|
}catch ( e : ExecutionException) {}
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (url.lowercase(Locale.US).contains(".png")) {
|
else if (url.lowercase(Locale.US).contains(".png")) {
|
||||||
try {
|
try {
|
||||||
val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
|
val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
|
||||||
return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
|
return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
|
||||||
} catch ( e : ExecutionException) {
|
}catch ( e : ExecutionException) {}
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (url.lowercase(Locale.US).contains(".webp")) {
|
else if (url.lowercase(Locale.US).contains(".webp")) {
|
||||||
try {
|
try {
|
||||||
val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
|
val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
|
||||||
return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
|
return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
|
||||||
} catch ( e : ExecutionException) {
|
}catch ( e : ExecutionException) {}
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.shouldInterceptRequest(view, url)
|
return super.shouldInterceptRequest(view, url)
|
||||||
@ -405,7 +395,6 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
val itemUrl = URL(url)
|
val itemUrl = URL(url)
|
||||||
baseUrl = itemUrl.protocol + "://" + itemUrl.host
|
baseUrl = itemUrl.protocol + "://" + itemUrl.host
|
||||||
} catch (e: MalformedURLException) {
|
} catch (e: MalformedURLException) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val fontName = when (font) {
|
val fontName = when (font) {
|
||||||
|
@ -7,7 +7,6 @@ import bou.amine.apps.readerforselfossv2.utils.getImages
|
|||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
||||||
import com.bumptech.glide.request.RequestOptions
|
import com.bumptech.glide.request.RequestOptions
|
||||||
import org.acra.ktx.sendSilentlyWithAcra
|
|
||||||
|
|
||||||
fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
|
fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
|
||||||
val imageUrls = this.getImages()
|
val imageUrls = this.getImages()
|
||||||
@ -24,7 +23,6 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e : Error) {
|
} catch (e : Error) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,7 +35,7 @@ fun String.toTextDrawableString(): String {
|
|||||||
try {
|
try {
|
||||||
textDrawable.append(s[0])
|
textDrawable.append(s[0])
|
||||||
} catch (e: StringIndexOutOfBoundsException) {
|
} catch (e: StringIndexOutOfBoundsException) {
|
||||||
e.sendSilentlyWithAcra()
|
// We do nothing
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return textDrawable.toString()
|
return textDrawable.toString()
|
||||||
|
@ -17,8 +17,6 @@ import androidx.preference.PreferenceFragmentCompat
|
|||||||
import bou.amine.apps.readerforselfossv2.android.R
|
import bou.amine.apps.readerforselfossv2.android.R
|
||||||
import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
|
||||||
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
|
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
|
||||||
import org.acra.ktx.sendSilentlyWithAcra
|
|
||||||
import org.acra.ktx.sendWithAcra
|
|
||||||
import org.kodein.di.DIAware
|
import org.kodein.di.DIAware
|
||||||
import org.kodein.di.android.closestDI
|
import org.kodein.di.android.closestDI
|
||||||
import org.kodein.di.instance
|
import org.kodein.di.instance
|
||||||
@ -103,11 +101,6 @@ class SettingsActivity : AppCompatActivity(),
|
|||||||
class MainPreferenceFragment : PreferenceFragmentCompat() {
|
class MainPreferenceFragment : PreferenceFragmentCompat() {
|
||||||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||||
setPreferencesFromResource(R.xml.pref_main, rootKey)
|
setPreferencesFromResource(R.xml.pref_main, rootKey)
|
||||||
|
|
||||||
preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
|
|
||||||
AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
|
|
||||||
true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,7 +117,6 @@ class SettingsActivity : AppCompatActivity(),
|
|||||||
val input: Int = (dest.toString() + source.toString()).toInt()
|
val input: Int = (dest.toString() + source.toString()).toInt()
|
||||||
if (input in 1..200) return@InputFilter null
|
if (input in 1..200) return@InputFilter null
|
||||||
} catch (nfe: NumberFormatException) {
|
} catch (nfe: NumberFormatException) {
|
||||||
nfe.sendSilentlyWithAcra()
|
|
||||||
Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
|
Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
|
||||||
}
|
}
|
||||||
""
|
""
|
||||||
@ -148,7 +140,6 @@ class SettingsActivity : AppCompatActivity(),
|
|||||||
try {
|
try {
|
||||||
editText.textSize = editable.toString().toInt().toFloat()
|
editText.textSize = editable.toString().toInt().toFloat()
|
||||||
} catch (e: NumberFormatException) {
|
} catch (e: NumberFormatException) {
|
||||||
e.sendSilentlyWithAcra()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} }
|
} }
|
||||||
@ -158,7 +149,6 @@ class SettingsActivity : AppCompatActivity(),
|
|||||||
val input = (dest.toString() + source.toString()).toInt()
|
val input = (dest.toString() + source.toString()).toInt()
|
||||||
if (input > 0) return@InputFilter null
|
if (input > 0) return@InputFilter null
|
||||||
} catch (nfe: NumberFormatException) {
|
} catch (nfe: NumberFormatException) {
|
||||||
nfe.sendSilentlyWithAcra()
|
|
||||||
}
|
}
|
||||||
""
|
""
|
||||||
}
|
}
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
<vector android:height="24dp" android:tint="#000000"
|
|
||||||
android:viewportHeight="24" android:viewportWidth="24"
|
|
||||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<path android:fillColor="@android:color/white" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
|
|
||||||
</vector>
|
|
@ -1,7 +0,0 @@
|
|||||||
<vector android:height="24dp" android:tint="#000000"
|
|
||||||
android:viewportHeight="24" android:viewportWidth="24"
|
|
||||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<path android:fillColor="@android:color/white" android:pathData="M21,8c-1.45,0 -2.26,1.44 -1.93,2.51l-3.55,3.56c-0.3,-0.09 -0.74,-0.09 -1.04,0l-2.55,-2.55C12.27,10.45 11.46,9 10,9c-1.45,0 -2.27,1.44 -1.93,2.52l-4.56,4.55C2.44,15.74 1,16.55 1,18c0,1.1 0.9,2 2,2c1.45,0 2.26,-1.44 1.93,-2.51l4.55,-4.56c0.3,0.09 0.74,0.09 1.04,0l2.55,2.55C12.73,16.55 13.54,18 15,18c1.45,0 2.27,-1.44 1.93,-2.52l3.56,-3.55C21.56,12.26 23,11.45 23,10C23,8.9 22.1,8 21,8z"/>
|
|
||||||
<path android:fillColor="@android:color/white" android:pathData="M15,9l0.94,-2.07l2.06,-0.93l-2.06,-0.93l-0.94,-2.07l-0.92,2.07l-2.08,0.93l2.08,0.93z"/>
|
|
||||||
<path android:fillColor="@android:color/white" android:pathData="M3.5,11l0.5,-2l2,-0.5l-2,-0.5l-0.5,-2l-0.5,2l-2,0.5l2,0.5z"/>
|
|
||||||
</vector>
|
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Thème clair</string>
|
<string name="mode_light">Thème clair</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">浅色模式</string>
|
<string name="mode_light">浅色模式</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -134,8 +134,4 @@
|
|||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
<string name="drawer_error_loading_sources">Error loading sources…</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -137,8 +137,4 @@
|
|||||||
<string name="mode_system">Follow the system setting</string>
|
<string name="mode_system">Follow the system setting</string>
|
||||||
<string name="mode_light">Light mode</string>
|
<string name="mode_light">Light mode</string>
|
||||||
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
<string name="pref_switch_enable_analytics">Enable analytics</string>
|
||||||
<string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
|
|
||||||
<string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
|
|
||||||
<string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
|
|
||||||
<string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -1,6 +1,12 @@
|
|||||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:defaultValue="true"
|
||||||
|
app:iconSpaceReserved="false"
|
||||||
|
android:key="enable_analytics"
|
||||||
|
android:title="@string/pref_switch_enable_analytics" />
|
||||||
|
|
||||||
<EditTextPreference
|
<EditTextPreference
|
||||||
android:inputType="number"
|
android:inputType="number"
|
||||||
android:key="api_timeout"
|
android:key="api_timeout"
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:title="@string/title_activity_settings">
|
android:title="@string/title_activity_settings">
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
@ -18,13 +17,9 @@
|
|||||||
android:title="@string/pref_header_offline"
|
android:title="@string/pref_header_offline"
|
||||||
android:icon="@drawable/ic_signal_wifi_off_black_24dp" />
|
android:icon="@drawable/ic_signal_wifi_off_black_24dp" />
|
||||||
|
|
||||||
<ListPreference
|
<Preference
|
||||||
android:defaultValue="0"
|
android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$ThemePreferenceFragment"
|
||||||
android:entries="@array/ModeTitles"
|
|
||||||
android:entryValues="@array/ModeValues"
|
|
||||||
android:key="currentMode"
|
|
||||||
android:title="@string/pref_header_theme"
|
android:title="@string/pref_header_theme"
|
||||||
app:useSimpleSummaryProvider="false"
|
|
||||||
android:icon="@drawable/ic_color_lens_black_24dp" />
|
android:icon="@drawable/ic_color_lens_black_24dp" />
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
@ -37,18 +32,4 @@
|
|||||||
android:title="@string/pref_header_experimental"
|
android:title="@string/pref_header_experimental"
|
||||||
android:icon="@drawable/ic_widgets_black_24dp" />
|
android:icon="@drawable/ic_widgets_black_24dp" />
|
||||||
|
|
||||||
|
|
||||||
<SwitchPreference
|
|
||||||
android:defaultValue="false"
|
|
||||||
android:key="enable_analytics"
|
|
||||||
android:title="@string/pref_switch_enable_analytics"
|
|
||||||
android:icon="@drawable/ic_baseline_insights_24"/>
|
|
||||||
|
|
||||||
|
|
||||||
<SwitchPreference
|
|
||||||
android:defaultValue="false"
|
|
||||||
android:key="acra.disable"
|
|
||||||
android:title="@string/pref_switch_disable_acra"
|
|
||||||
android:icon="@drawable/ic_baseline_bug_report_24"/>
|
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
Loading…
Reference in New Issue
Block a user