update to 1.2.58 #59
Closed
update to 1.2.58 #59
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replace "emby" with jellyfin, including package name. # Conflicts: # MediaBrowserTv/.idea/gradle.xml # MediaBrowserTv/.idea/misc.xml # MediaBrowserTv/app/app.iml # MediaBrowserTv/app/src/main/AndroidManifest.xml # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/TvApp.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/browsing/BrowseRecordingsFragment.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/browsing/BrowseViewFragment.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/browsing/HomeFragment.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/browsing/StdGridFragment.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/details/FullDetailsActivity.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/details/ItemListActivity.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/details/MyDetailsOverviewRow.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/itemhandling/BaseRowItem.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/itemhandling/ItemLauncher.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/livetv/LiveTvGuideActivity.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/livetv/TvManager.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/playback/CustomPlaybackOverlayFragment.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/playback/PlaybackController.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/presentation/MyDetailsOverviewRowPresenter.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/presentation/MyImageCardView.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/search/SearchActivity.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/ui/ProgramGridCell.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/ui/RecordPopup.java # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/util/Utils.java # MediaBrowserTv/app/src/main/res/values-cs/strings.xml # MediaBrowserTv/app/src/main/res/values-de/strings.xml # MediaBrowserTv/app/src/main/res/values-fr/strings.xml # MediaBrowserTv/app/src/main/res/values-nb/strings.xml # MediaBrowserTv/app/src/main/res/values-pt-rBR/strings.xml # MediaBrowserTv/app/src/main/res/values-pt-rPT/strings.xml # MediaBrowserTv/app/src/main/res/values-ru/strings.xml # MediaBrowserTv/app/src/main/res/values-sv/strings.xml
remove build and ide config files # Conflicts: # MediaBrowserTv/.gitignore # MediaBrowserTv/.idea/compiler.xml # MediaBrowserTv/.idea/encodings.xml # MediaBrowserTv/gradle/wrapper/gradle-wrapper.properties
Remove logging to emby servers # Conflicts: # MediaBrowserTv/app/src/main/java/org/jellyfin/androidtv/util/LogReporter.java
remove nested source and fix build issues # Conflicts: # MediaBrowserTv/app/libs/libvlc_1_5_2_arm.jar # MediaBrowserTv/app/libs/libvlc_1_9_8_arm.jar # app/build.gradle # app/libs/libvlc_1_5_2_arm.jar # app/src/main/res/drawable/playlist.png
Fix linting issues in xml files
Replace all emby icons/banners with jellyfin ones; and UI colours
Remove support for Connect # Conflicts: # app/src/main/java/org/jellyfin/androidtv/startup/ConnectActivity.java # app/src/main/java/org/jellyfin/androidtv/startup/SelectServerFragment.java # app/src/main/java/org/jellyfin/androidtv/startup/SelectUserFragment.java
Remove support for Connect # Conflicts: # app/src/main/java/org/jellyfin/androidtv/startup/SelectServerFragment.java # app/src/main/java/org/jellyfin/androidtv/startup/SelectUserFragment.java
Add CONTRIBUTORS.md
Update README.md
Change app icon to use banner
Removes additional premiere support # Conflicts: # app/src/main/res/values-es-rMX/strings.xml # app/src/main/res/values-kk/strings.xml # app/src/main/res/values/strings.xml
Update build gradle files # Conflicts: # build.gradle
Restore gradle wrapper
Add java-websocket to gradle dependencies
Update support lib to sdk version
General Cleanup # Conflicts: # app/src/main/java/org/jellyfin/androidtv/presentation/CardPresenter.java # app/src/main/res/drawable/left_fade.xml # app/src/main/res/values/array.xml # app/src/main/res/values/colors.xml # app/src/main/res/values/styles.xml
Add null check for channel name
Import Docker build infrastructure from jellyfin-android
Remove additional Emby references
Add build directories to gitignore
|
Much better. The PR title and description still needs to contain useful information though. |
|
What's the difference between this and #58? |
|
thornbill work is great. this PR for the previous #56. |
Merged
|
Closing as requested #58 (comment) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
need ur review and edit