Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version 0.1.2 #30

Merged
merged 16 commits into from
Aug 26, 2021
Merged

Version 0.1.2 #30

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
59d687f
Remove livetv section from home screen
jarnedemeulemeester Aug 23, 2021
45fc40b
Fix if media items are in folders
jarnedemeulemeester Aug 23, 2021
19ab3f8
Fix underlined "View details" string
jarnedemeulemeester Aug 23, 2021
e621032
Show complete error message
jarnedemeulemeester Aug 23, 2021
1c6c864
Ask for login if server responds with 401
jarnedemeulemeester Aug 24, 2021
78117ae
Upgrade kotlin to 1.5.30
jarnedemeulemeester Aug 24, 2021
2ff9239
Improve home loading
jarnedemeulemeester Aug 24, 2021
d53fbf3
Handle empty mediaSources
jarnedemeulemeester Aug 25, 2021
be2c4dc
Improve image loading
jarnedemeulemeester Aug 25, 2021
1417d97
Fix crash in player when no connection to server
jarnedemeulemeester Aug 25, 2021
653d41c
Fix continue watching movie image
jarnedemeulemeester Aug 25, 2021
bb208d6
Add missing episode icon
jarnedemeulemeester Aug 25, 2021
fb1755e
Update proguard rules
jarnedemeulemeester Aug 26, 2021
25ac552
Rework how player items are created
jarnedemeulemeester Aug 26, 2021
4fdcf98
Fix missing episodes being sent to the player
jarnedemeulemeester Aug 26, 2021
e474544
Update versionCode to 3 and versionName to 0.1.2
jarnedemeulemeester Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add missing episode icon
  • Loading branch information
@jarnedemeulemeester
jarnedemeulemeester committed Aug 25, 2021
commit bb208d68fde57d4dc195fab922f39c5779d5d77b
25 changes: 25 additions & 0 deletions app/src/main/res/layout/episode_bottom_sheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

<data>

<import type="android.view.View" />

<import type="org.jellyfin.sdk.model.api.LocationType" />

<variable
name="viewModel"
type="dev.jdtech.jellyfin.viewmodels.EpisodeBottomSheetViewModel" />
Expand Down Expand Up @@ -38,6 +42,27 @@
app:layout_constraintTop_toBottomOf="@id/holder"
app:shapeAppearance="@style/roundedImageView" />

<FrameLayout
android:id="@+id/missing_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/circle_background"
android:backgroundTint="@color/red"
android:visibility="@{viewModel.item.locationType == LocationType.VIRTUAL ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/episode_image"
app:layout_constraintTop_toTopOf="@id/episode_image">

<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="M"
android:textColor="@color/white"
tools:ignore="HardcodedText" />
</FrameLayout>

<FrameLayout
android:id="@+id/progress_bar"
android:layout_width="wrap_content"
Expand Down
25 changes: 24 additions & 1 deletion app/src/main/res/layout/episode_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

<import type="android.view.View" />

<import type="org.jellyfin.sdk.model.api.LocationType" />

<variable
name="episode"
type="org.jellyfin.sdk.model.api.BaseItemDto" />
Expand Down Expand Up @@ -44,6 +46,27 @@
app:layout_constraintEnd_toEndOf="@id/episode_image"
app:layout_constraintTop_toTopOf="@id/episode_image" />

<FrameLayout
android:id="@+id/missing_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/circle_background"
android:backgroundTint="@color/red"
android:visibility="@{episode.locationType == LocationType.VIRTUAL ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toStartOf="@id/played_icon"
app:layout_constraintTop_toTopOf="@id/episode_image">

<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="M"
android:textColor="@color/white"
tools:ignore="HardcodedText" />
</FrameLayout>

<FrameLayout
android:id="@+id/progress_bar"
android:layout_width="wrap_content"
Expand Down Expand Up @@ -74,8 +97,8 @@
android:id="@+id/episode_desc"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="@{episode.overview}"
android:scrollbars="none"
android:text="@{episode.overview}"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down