parsing, content and bug fixes

Author: mykola-dev

README.md

@@ -1,7 +1,7 @@
 # Photosight Gallery
 
-Photosight.ru is a photographic community of talented photographers mostly from Europe. You can find there daily updated archive of creative artistic photos or share your own.
-Photosight Gallery is an easy way to browse photos from www.photosight.ru on your Android device.
+sight.photo is a photographic community of talented photographers mostly from Europe. You can find there daily updated archive of creative artistic photos or share your own.
+Photosight Gallery is an easy way to browse photos from https://sight.photo on your Android device.
 
 <img src="media/photosight.gif" width=25%>
 

app/build.gradle.kts

@@ -65,7 +65,7 @@ android {
     }
 
     compileOptions {
-        //coreLibraryDesugaringEnabled = true
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
@@ -105,6 +105,8 @@ dependencies {
 
     implementation(project(":parser"))
 
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
+
     // androidx
     implementation("androidx.core:core-ktx:$androidX")
     implementation("androidx.appcompat:appcompat:$appCompatVersion")

app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true"
         >
 
         <activity

app/src/main/java/ds/photosight/ui/SharedElementsHelper.kt

@@ -20,15 +20,13 @@ class SharedElementsHelper(private val fragment: Fragment) {
     private var isScrollingToPosition = false
 
     fun postpone(position: Int) {
-        //Timber.v("${fragment.javaClass.simpleName}:postpone animation for element $position")
         isRunning = true
         fragment.postponeEnterTransition(2000, TimeUnit.MILLISECONDS)
         elementPosition = position
     }
 
     fun animate(position: Int) {
         fun doAnimate() {
-            //Timber.v("start new animation at position $position")
             fragment.startPostponedEnterTransition()
             isRunning = false
         }
@@ -44,7 +42,6 @@ class SharedElementsHelper(private val fragment: Fragment) {
     }
 
     fun setupEnterAnimation(onEnd: () -> Unit) = with(fragment) {
-        //Timber.d("${fragment.javaClass.simpleName}:setup animations")
         sharedElementEnterTransition = TransitionInflater.from(requireContext()).inflateTransition(R.transition.image_transition)
             .addListener(object : TransitionListenerAdapter() {
                 override fun onTransitionEnd(transition: Transition) {
@@ -64,7 +61,6 @@ class SharedElementsHelper(private val fragment: Fragment) {
     }
 
     fun setupEnterCallback(view: View) {
-        //Timber.v("${fragment.javaClass.simpleName}: setting new enter callback")
         if (isRunning) {
             Timber.e("can't set callback when animation is running")
             return
@@ -80,19 +76,13 @@ class SharedElementsHelper(private val fragment: Fragment) {
             Timber.e("can't set callback when animation is stopped")
             return
         }
-        //if (!isScrollingToPosition) {
         fragment.setExitSharedElementCallback(TransitionCallback("exit", view) {
             fragment.setExitSharedElementCallback(null)
         })
-        /*} else {
-            fragment.setExitSharedElementCallback(null)
-        }*/
-
     }
 
     fun moveToCurrentItem(recyclerView: RecyclerView) {
         if (isRunning && elementPosition >= 0) {
-            //Timber.v("${fragment.javaClass.simpleName}: scroll grid to updated position")
             val selectedViewHolder = recyclerView.findViewHolderForAdapterPosition(elementPosition)
             if (selectedViewHolder == null) {
                 Timber.w("view not found for position $elementPosition. scrolling!")
@@ -107,14 +97,10 @@ class SharedElementsHelper(private val fragment: Fragment) {
             if (isScrollingToPosition) {
                 isScrollingToPosition = false
             }
-            //photosAdapter.notifyItemChanged(elementPosition)
-            //photosAdapter.notifyDataSetChanged()
             elementPosition = -1
         }
     }
 
-    //fun denyUpdate(position: Int): Boolean = isScrollingToPosition && elementPosition != position
-
     class TransitionCallback(val name: String, val view: View, val onFinish: () -> Unit) : SharedElementCallback() {
         override fun onMapSharedElements(names: MutableList<String>, sharedElements: MutableMap<String, View>) {
             sharedElements[names.first()] = view

app/src/main/java/ds/photosight/ui/view/GalleryFragment.kt

@@ -17,7 +17,6 @@ import androidx.navigation.fragment.findNavController
 import androidx.paging.LoadState
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import androidx.transition.TransitionInflater
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayoutMediator
@@ -82,6 +81,20 @@ class GalleryFragment : Fragment() {
 
     }
 
+    private fun navigateTo(clickedItem: GalleryAdapter.ClickedItem) {
+        val extras = FragmentNavigatorExtras(
+            clickedItem.view to clickedItem.view.transitionName
+        )
+        with(findNavController()) {
+            log.v("current destination: ${currentDestination?.id}")
+            if (R.id.galleryFragment == currentDestination?.id) {
+                navigate(GalleryFragmentDirections.openViewer(clickedItem.position), extras)
+            } else {
+                log.w("wrong destination")
+            }
+        }
+    }
+
     private fun observeData() {
         val onMenuSelected = { item: MenuItemState ->
             viewModel.onMenuSelected(item)
@@ -100,17 +113,7 @@ class GalleryFragment : Fragment() {
             if (clickedItem.isLoading) {
                 viewModel.loadingState.value = true
             } else {
-                val extras = FragmentNavigatorExtras(
-                    clickedItem.view to clickedItem.view.transitionName
-                )
-                with(findNavController()) {
-                    log.v("current destination: ${currentDestination?.id}")
-                    if (R.id.galleryFragment == currentDestination?.id) {
-                        navigate(GalleryFragmentDirections.openViewer(clickedItem.position), extras)
-                    } else {
-                        log.w("wrong destination")
-                    }
-                }
+                navigateTo(clickedItem)
             }
         }
 

app/src/main/java/ds/photosight/ui/view/ViewerFragment.kt

@@ -10,10 +10,7 @@ import android.view.ViewGroup
 import androidx.activity.addCallback
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.core.content.ContextCompat
-import androidx.core.view.GravityCompat
-import androidx.core.view.ViewCompat
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
+import androidx.core.view.*
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
@@ -41,6 +38,8 @@ import ds.photosight.utils.position
 import ds.photosight.utils.recyclerView
 import ds.photosight.utils.snack
 import kotlinx.android.synthetic.main.fragment_viewer.*
+import kotlinx.android.synthetic.main.fragment_viewer.toolbar
+import kotlinx.android.synthetic.main.view_menu.*
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -149,8 +148,11 @@ class ViewerFragment : Fragment() {
     }
 
     private fun setupInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(shareMenuView) { v, insets ->
-            v.setPadding(0, 0, 0, 0)    // buggy NavigationView fix
+        ViewCompat.setOnApplyWindowInsetsListener(drawerLayout) { view, insets ->
+            val sbInset = insets.systemWindowInsetTop
+            val nbInset = insets.systemWindowInsetBottom
+            appBar.updatePadding(top = sbInset)
+            bottomToolbar.updatePadding(bottom = nbInset)
             insets
         }
     }

app/src/main/java/ds/photosight/ui/viewmodel/ViewerViewModel.kt

@@ -37,6 +37,7 @@ class ViewerViewModel @Inject constructor(
             val details = photoDetailsMap.getOrPut(photoId) { photosightRepo.getPhotoDetails(photoId) }
             _commentsState.value = CommentsState.Payload(details)
         } catch (e: Exception) {
+            e.printStackTrace()
             _commentsState.value = CommentsState.Error
         }
     }

app/src/main/res/layout/fragment_viewer.xml

@@ -25,6 +25,7 @@
             />
 
         <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"

app/src/main/res/values-ru/strings.xml

@@ -32,7 +32,7 @@
 	<string name="category_92">Техно</string>
 
 
-	<string name="abouttext">"Photosight Gallery - это неофициальное приложение для быстрого и удобного доступа к крупнейшему в мире архиву высокохудожественных фоторабот профессиональных фотографов (преимущественно из стран СНГ) photosight.ru
+	<string name="abouttext">"Photosight Gallery - это неофициальное приложение для быстрого и удобного доступа к крупнейшему в мире архиву высокохудожественных фоторабот профессиональных фотографов (преимущественно из стран СНГ) sight.photo
 
 Пожелания и багрепорты принимаются на email:
 deviantstudio.software@gmail.com

app/src/main/res/values-uk/strings.xml

@@ -54,7 +54,7 @@
     <string name="dislikes">Невподоби</string>
     <string name="retry">Повторити</string>
     <string name="views">Перегляди</string>
-    <string name="abouttext">"Photosight Gallery - це неофіційний застосунок для швидкого та зручного доступу до великого архіву високохудожніх світлин професійних фотографів (переважно москалів) photosight.ru
+    <string name="abouttext">"Photosight Gallery - це неофіційний застосунок для швидкого та зручного доступу до великого архіву високохудожніх світлин професійних фотографів (переважно москалів) sight.photo
 Побажання та звіти про помилки приймаються на deviantstudio.software@gmail.com
 
 Change Log:

app/src/main/res/values/strings.xml

@@ -45,8 +45,8 @@
     <string name="thin_font" translatable="false">sans-serif-light</string>
     <string name="light_font" translatable="false">sans-serif</string>
 
-	<string name="abouttext">"Photosight.ru is a photographic community of talented photographers mostly from Europe. You can find there daily updated archive of creative artistic photos or share your own.
-Photosight Gallery is an easy way to browse photos from photosight.ru on your Android device.
+	<string name="abouttext">"sight.photo is a photographic community of talented photographers mostly from Europe. You can find there daily updated archive of creative artistic photos or share your own.
+Photosight Gallery is an easy way to browse photos from https://sight.photo on your Android device.
 
 Please e-mail bugreports:
 deviantstudio.software@gmail.com
@@ -70,7 +70,7 @@ Change Log:
     <string name="photo_author">"&lt;AUTHOR&gt;"</string>
     <string name="likes">Likes</string>
     <string name="dislikes">Dislikes</string>
-	<string name="copyright" translatable="false">© 1997-2020 Deviant Studio</string>
+	<string name="copyright" translatable="false">© 1997-2022 Deviant Studio</string>
 	<string name="about_title_" translatable="false">"PHOTOSIGHT GALLERY "</string>
 	<string name="retry">Retry</string>
     <string name="views">Views</string>

parser/src/main/kotlin/ds/photosight/parser/Requests.kt

@@ -65,7 +65,7 @@ class CategoriesRequest : JsoupRequest<List<PhotoCategory>>() {
 
 class PhotoDetailsRequest(photoId: Int) : JsoupRequest<PhotoDetails>() {
 
-    private val dateFormat = DateTimeFormatter.ofPattern("d MMMM yyyy, HH:mm:ss")
+    private val dateFormat = DateTimeFormatter.ofPattern("d MMMM yyyy, HH:mm:ss", Locale.US)
 
     override fun invoke(): PhotoDetails {
         val doc = getDocument()

parser/src/test/kotlin/ds/photosight/parser/PhotosightParserTest.kt

@@ -73,7 +73,7 @@ class PhotosightParserTest {
 
     @Test
     fun `comments showcase`() {
-        PhotoDetailsRequest(5358008)()
+        PhotoDetailsRequest(7249211)()
             .also { println(it) }
     }