mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-28 13:23:58 +01:00
Compare commits
No commits in common. "3a55583460d3294efc7ae2000616d1cb4ec6ad68" and "714e5f8a4bdf49ceea0d5dbc3e32749273c274b1" have entirely different histories.
3a55583460
...
714e5f8a4b
7 changed files with 8 additions and 15 deletions
|
|
@ -324,7 +324,7 @@ after opening the app.
|
||||||
)
|
)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.blockingGet()
|
.blockingGet()
|
||||||
Timber.d("Resuming %d uploads...", stuckUploads.size)
|
Timber.d("Resuming " + stuckUploads.size + " uploads...")
|
||||||
if (!stuckUploads.isEmpty()) {
|
if (!stuckUploads.isEmpty()) {
|
||||||
for (contribution in stuckUploads) {
|
for (contribution in stuckUploads) {
|
||||||
contribution.state = Contribution.STATE_QUEUED
|
contribution.state = Contribution.STATE_QUEUED
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.ProgressBar
|
import android.widget.ProgressBar
|
||||||
|
import android.widget.Switch
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout
|
import androidx.constraintlayout.widget.ConstraintLayout
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
|
|
@ -19,7 +20,6 @@ import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
import androidx.lifecycle.repeatOnLifecycle
|
||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.android.material.switchmaterial.SwitchMaterial
|
|
||||||
import fr.free.nrw.commons.contributions.Contribution
|
import fr.free.nrw.commons.contributions.Contribution
|
||||||
import fr.free.nrw.commons.contributions.ContributionDao
|
import fr.free.nrw.commons.contributions.ContributionDao
|
||||||
import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao
|
import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao
|
||||||
|
|
@ -82,7 +82,7 @@ class ImageFragment :
|
||||||
*/
|
*/
|
||||||
private var selectorRV: RecyclerView? = null
|
private var selectorRV: RecyclerView? = null
|
||||||
private var loader: ProgressBar? = null
|
private var loader: ProgressBar? = null
|
||||||
private var switch: SwitchMaterial? = null
|
private var switch: Switch? = null
|
||||||
lateinit var filteredImages: ArrayList<Image>
|
lateinit var filteredImages: ArrayList<Image>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -112,8 +112,8 @@ class WikidataItemDetailsActivity : BaseActivity(), MediaDetailProvider, Categor
|
||||||
|
|
||||||
viewPagerAdapter!!.setTabs(
|
viewPagerAdapter!!.setTabs(
|
||||||
R.string.title_for_media to depictionImagesListFragment!!,
|
R.string.title_for_media to depictionImagesListFragment!!,
|
||||||
R.string.title_for_child_classes to childDepictionsFragment,
|
R.string.title_for_subcategories to childDepictionsFragment,
|
||||||
R.string.title_for_parent_classes to parentDepictionsFragment
|
R.string.title_for_parent_categories to parentDepictionsFragment
|
||||||
)
|
)
|
||||||
binding!!.viewPager.offscreenPageLimit = 2
|
binding!!.viewPager.offscreenPageLimit = 2
|
||||||
viewPagerAdapter!!.notifyDataSetChanged()
|
viewPagerAdapter!!.notifyDataSetChanged()
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ import java.io.File
|
||||||
import java.io.FileOutputStream
|
import java.io.FileOutputStream
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
import timber.log.Timber
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This activity will set two tabs, achievements and
|
* This activity will set two tabs, achievements and
|
||||||
|
|
@ -123,7 +122,7 @@ class ProfileActivity : BaseActivity() {
|
||||||
val rootView = window.decorView.findViewById<View>(android.R.id.content)
|
val rootView = window.decorView.findViewById<View>(android.R.id.content)
|
||||||
val screenShot = getScreenShot(rootView)
|
val screenShot = getScreenShot(rootView)
|
||||||
if (screenShot == null) {
|
if (screenShot == null) {
|
||||||
Timber.e("ScreenShot is null")
|
Log.e("ERROR", "ScreenShot is null")
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
showAlert(screenShot)
|
showAlert(screenShot)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
package fr.free.nrw.commons.settings
|
package fr.free.nrw.commons.settings
|
||||||
|
|
||||||
import android.Manifest.permission
|
import android.Manifest.permission
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.content.Context.MODE_PRIVATE
|
import android.content.Context.MODE_PRIVATE
|
||||||
|
|
@ -304,11 +303,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove the space for icons in the settings menu.
|
|
||||||
// This uses an internal API that shouldn't be used in app code,
|
|
||||||
// but it appears to be the most robust way to do this at the moment,
|
|
||||||
// disable the warning.
|
|
||||||
@SuppressLint("RestrictedApi")
|
|
||||||
override fun onCreateAdapter(preferenceScreen: PreferenceScreen): Adapter<PreferenceViewHolder>
|
override fun onCreateAdapter(preferenceScreen: PreferenceScreen): Adapter<PreferenceViewHolder>
|
||||||
{
|
{
|
||||||
return object : PreferenceGroupAdapter(preferenceScreen) {
|
return object : PreferenceGroupAdapter(preferenceScreen) {
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ object LocationUtils {
|
||||||
latLng = LatLng(latLngArray[1].trim().toDouble(),
|
latLng = LatLng(latLngArray[1].trim().toDouble(),
|
||||||
latLngArray[0].trim().toDouble(), 1f)
|
latLngArray[0].trim().toDouble(), 1f)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Timber.e(e, "Error while parsing user entered lat long")
|
Timber.e("Error while parsing user entered lat long: %s", e)
|
||||||
}
|
}
|
||||||
|
|
||||||
return latLng
|
return latLng
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:background="?attr/mainBackground">
|
android:background="?attr/mainBackground">
|
||||||
|
|
||||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
<Switch
|
||||||
android:id="@+id/switchWidget"
|
android:id="@+id/switchWidget"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue