Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca9d6cd3 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'issue-118' into 'master' 

enable zoom-in on app preview images

See merge request e/apps/apps!16
parents 1f531a28 d6c37380

app/build.gradle

+3 −0
Original line number Original line Diff line number Diff line
@@ -82,4 +82,7 @@ dependencies { 
    implementation 'com.trello.rxlifecycle3:rxlifecycle-components-preference:3.1.0'

    implementation 'com.trello.rxlifecycle3:rxlifecycle-components-preference:3.1.0'

    implementation 'com.makeramen:roundedimageview:2.3.0'

    implementation 'com.makeramen:roundedimageview:2.3.0'





    implementation 'com.github.chrisbanes:PhotoView:2.3.0'





}
 
}

app/src/main/java/foundation/e/apps/application/ScreenshotsCarouselAdapter.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ class ScreenshotsCarouselAdapter(context: Context, private val screenshots: List 
    override fun instantiateItem(container: ViewGroup, position: Int): Any {

    override fun instantiateItem(container: ViewGroup, position: Int): Any {

        val view = layoutInflater.inflate(R.layout.screenshots_carousel_item, container, false)

        val view = layoutInflater.inflate(R.layout.screenshots_carousel_item, container, false)





        view.image.setImageBitmap(screenshots[position])

        view.photo_view.setImageBitmap(screenshots[position])





        container.addView(view)

        container.addView(view)

        return view

        return view

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -22,10 +22,9 @@ 
    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:orientation="vertical">





    <ImageView

    <com.github.chrisbanes.photoview.PhotoView

        android:id="@+id/image"

        android:id="@+id/photo_view"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"/>

        android:background="@android:color/black" />





</LinearLayout>
 
</LinearLayout>
 
 No newline at end of file

build.gradle

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ allprojects { 
    repositories {

    repositories {

        google()

        google()

        jcenter()

        jcenter()

        maven { url "https://jitpack.io" }

    }

    }

}

}