From c54935ca24d962a9b9c31d89bbf457014dcd06e4 Mon Sep 17 00:00:00 2001 From: Vasili Fedotov Date: Fri, 13 Dec 2019 15:42:44 +0200 Subject: [PATCH 1/2] Migrate to AndroidX --- gradle.properties | 2 ++ library/build.gradle | 4 ++-- .../view/DefaultControlPanelView.java | 15 +++++++++------ .../view/VimeoPlayerActivity.java | 10 +++++++--- .../view/VimeoPlayerView.java | 12 +++++++----- .../view/menu/MenuAdapter.java | 10 +++++----- .../view/menu/VimeoDividerItemDecoration.java | 7 ++++--- .../{ViemoMenuItem.java => VimeoMenuItem.java} | 13 +++++++------ ...emoPlayerMenu.java => VimeoPlayerMenu.java} | 18 ++++++++++-------- library/src/main/res/layout/player_menu.xml | 2 +- sample/build.gradle | 6 +++--- .../androidvimeoplayersample/MainActivity.kt | 12 ++++-------- .../examples/FullscreenActivity.kt | 11 ++++++----- .../examples/MenuActivity.kt | 8 ++++---- .../examples/OriginalControlsActivity.kt | 2 +- .../examples/RecyclerViewActivity.kt | 10 +++++----- .../main/res/layout/activity_fullscreen.xml | 6 +++--- sample/src/main/res/layout/activity_main.xml | 12 ++++++------ sample/src/main/res/layout/activity_menu.xml | 6 +++--- .../res/layout/activity_original_controls.xml | 6 +++--- .../main/res/layout/activity_recyclerview.xml | 8 ++++---- 21 files changed, 96 insertions(+), 84 deletions(-) rename library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/{ViemoMenuItem.java => VimeoMenuItem.java} (77%) rename library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/{ViemoPlayerMenu.java => VimeoPlayerMenu.java} (83%) diff --git a/gradle.properties b/gradle.properties index 1487463..dbf9c12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/library/build.gradle b/library/build.gradle index e7aa7b4..dc712b0 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -21,8 +21,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.github.bumptech.glide:glide:4.8.0' implementation 'com.squareup.okhttp3:okhttp:3.12.0' diff --git a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/DefaultControlPanelView.java b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/DefaultControlPanelView.java index 7699020..2050e58 100644 --- a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/DefaultControlPanelView.java +++ b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/DefaultControlPanelView.java @@ -24,14 +24,15 @@ import com.ct7ct7ct7.androidvimeoplayer.model.TextTrack; import com.ct7ct7ct7.androidvimeoplayer.model.VimeoThumbnail; import com.ct7ct7ct7.androidvimeoplayer.utils.Utils; -import com.ct7ct7ct7.androidvimeoplayer.view.menu.ViemoMenuItem; -import com.ct7ct7ct7.androidvimeoplayer.view.menu.ViemoPlayerMenu; +import com.ct7ct7ct7.androidvimeoplayer.view.menu.VimeoMenuItem; +import com.ct7ct7ct7.androidvimeoplayer.view.menu.VimeoPlayerMenu; import com.google.gson.Gson; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +@SuppressWarnings("WeakerAccess") public class DefaultControlPanelView { private View vimeoPanelView; private View vimeoShadeView; @@ -46,7 +47,7 @@ public class DefaultControlPanelView { private TextView vimeoTitleTextView; private View controlsRootView; private boolean ended = false; - private ViemoPlayerMenu vimeoPlayerMenu; + private VimeoPlayerMenu vimeoPlayerMenu; public DefaultControlPanelView(final VimeoPlayerView vimeoPlayerView) { View defaultControlPanelView = View.inflate(vimeoPlayerView.getContext(), R.layout.view_default_control_panel, vimeoPlayerView); @@ -62,7 +63,7 @@ public DefaultControlPanelView(final VimeoPlayerView vimeoPlayerView) { vimeoReplayButton = defaultControlPanelView.findViewById(R.id.vimeoReplayButton); vimeoTitleTextView = defaultControlPanelView.findViewById(R.id.vimeoTitleTextView); controlsRootView = defaultControlPanelView.findViewById(R.id.controlsRootView); - vimeoPlayerMenu = new ViemoPlayerMenu(vimeoPlayerView.getContext()); + vimeoPlayerMenu = new VimeoPlayerMenu(vimeoPlayerView.getContext()); vimeoSeekBar.setVisibility(View.INVISIBLE); vimeoPanelView.setVisibility(View.VISIBLE); @@ -232,7 +233,7 @@ public void setMenuVisibility(int value) { vimeoMenuButton.setVisibility(value); } - public void addMenuItem(ViemoMenuItem menuItem) { + public void addMenuItem(VimeoMenuItem menuItem) { vimeoPlayerMenu.addItem(menuItem); } @@ -268,7 +269,9 @@ protected VimeoThumbnail doInBackground(Void... voids) { VimeoThumbnail vimeoThumbnail = null; try { Response response = client.newCall(request).execute(); - vimeoThumbnail = new Gson().fromJson(response.body().string(), VimeoThumbnail.class); + if (response.body() != null) { + vimeoThumbnail = new Gson().fromJson(response.body().string(), VimeoThumbnail.class); + } } catch (Exception e) { Log.e(context.getPackageName(), e.toString()); } diff --git a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/VimeoPlayerActivity.java b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/VimeoPlayerActivity.java index 1f21b6a..961f993 100644 --- a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/VimeoPlayerActivity.java +++ b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/VimeoPlayerActivity.java @@ -7,8 +7,10 @@ import android.content.res.Configuration; import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import com.ct7ct7ct7.androidvimeoplayer.R; @@ -124,10 +126,12 @@ public void onBackPressed() { } @Override - public void onConfigurationChanged(Configuration newConfig) { + public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); if (REQUEST_ORIENTATION_AUTO.equals(orientation)) { vimeoPlayerView.reset(); } } + + } diff --git a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/VimeoPlayerView.java b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/VimeoPlayerView.java index ea4c149..7f037a0 100644 --- a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/VimeoPlayerView.java +++ b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/VimeoPlayerView.java @@ -1,8 +1,9 @@ package com.ct7ct7ct7.androidvimeoplayer.view; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleObserver; -import android.arch.lifecycle.OnLifecycleEvent; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; + import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; @@ -28,7 +29,7 @@ import com.ct7ct7ct7.androidvimeoplayer.listeners.VimeoPlayerTextTrackListener; import com.ct7ct7ct7.androidvimeoplayer.listeners.VimeoPlayerTimeListener; import com.ct7ct7ct7.androidvimeoplayer.listeners.VimeoPlayerVolumeListener; -import com.ct7ct7ct7.androidvimeoplayer.view.menu.ViemoMenuItem; +import com.ct7ct7ct7.androidvimeoplayer.view.menu.VimeoMenuItem; public class VimeoPlayerView extends FrameLayout implements LifecycleObserver { public VimeoOptions defaultOptions; @@ -257,7 +258,7 @@ public void setMenuVisibility(boolean show) { } } - public void addMenuItem(ViemoMenuItem menuItem) { + public void addMenuItem(VimeoMenuItem menuItem) { if (defaultControlPanelView != null) { defaultControlPanelView.addMenuItem(menuItem); } @@ -389,6 +390,7 @@ private VimeoOptions generateDefaultVimeoOptions(Context context, AttributeSet a options.menuOption = menuOption; options.fullscreenOption = fullscreenOption; options.aspectRatio = aspectRatio; + attributes.recycle(); } return options; diff --git a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/MenuAdapter.java b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/MenuAdapter.java index d336661..4a51765 100644 --- a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/MenuAdapter.java +++ b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/MenuAdapter.java @@ -1,9 +1,9 @@ package com.ct7ct7ct7.androidvimeoplayer.view.menu; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,9 +17,9 @@ class MenuAdapter extends RecyclerView.Adapter { @NonNull private final Context context; - @NonNull private final List menuItems; + @NonNull private final List menuItems; - MenuAdapter(@NonNull Context context, @NonNull List menuItems) { + MenuAdapter(@NonNull Context context, @NonNull List menuItems) { this.context = context; this.menuItems = menuItems; } diff --git a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoDividerItemDecoration.java b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoDividerItemDecoration.java index bf1c9f3..5c1f607 100644 --- a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoDividerItemDecoration.java +++ b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoDividerItemDecoration.java @@ -3,13 +3,14 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.ct7ct7ct7.androidvimeoplayer.R; +@SuppressWarnings("WeakerAccess") public class VimeoDividerItemDecoration extends RecyclerView.ItemDecoration { private Drawable mDivider; diff --git a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/ViemoMenuItem.java b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoMenuItem.java similarity index 77% rename from library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/ViemoMenuItem.java rename to library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoMenuItem.java index 9a27bdc..82fa98d 100644 --- a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/ViemoMenuItem.java +++ b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoMenuItem.java @@ -1,18 +1,19 @@ package com.ct7ct7ct7.androidvimeoplayer.view.menu; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; -public class ViemoMenuItem { +@SuppressWarnings("WeakerAccess") +public class VimeoMenuItem { private final String text; @DrawableRes private final int icon; private final View.OnClickListener onClickListener; - public ViemoMenuItem(@NonNull String text, @DrawableRes final int icon, @Nullable View.OnClickListener onClickListener) { + public VimeoMenuItem(@NonNull String text, @DrawableRes final int icon, @Nullable View.OnClickListener onClickListener) { this.text = text; this.icon = icon; this.onClickListener = onClickListener; @@ -37,7 +38,7 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ViemoMenuItem menuItem = (ViemoMenuItem) o; + VimeoMenuItem menuItem = (VimeoMenuItem) o; return icon == menuItem.icon && text.equals(menuItem.text); } diff --git a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/ViemoPlayerMenu.java b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoPlayerMenu.java similarity index 83% rename from library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/ViemoPlayerMenu.java rename to library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoPlayerMenu.java index 609514d..c714b20 100644 --- a/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/ViemoPlayerMenu.java +++ b/library/src/main/java/com/ct7ct7ct7/androidvimeoplayer/view/menu/VimeoPlayerMenu.java @@ -1,10 +1,11 @@ package com.ct7ct7ct7.androidvimeoplayer.view.menu; +import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,14 +19,14 @@ import java.util.List; -public class ViemoPlayerMenu { +public class VimeoPlayerMenu { private final Context context; - private final List menuItems; + private final List menuItems; @Nullable private PopupWindow popupWindow; - public ViemoPlayerMenu(@NonNull Context context) { + public VimeoPlayerMenu(@NonNull Context context) { this.context = context; this.menuItems = new ArrayList<>(); @@ -41,7 +42,7 @@ public void dismiss() { popupWindow.dismiss(); } - public void addItem(ViemoMenuItem menuItem) { + public void addItem(VimeoMenuItem menuItem) { menuItems.add(menuItem); } @@ -54,6 +55,7 @@ public int getItemCount() { } @NonNull + @SuppressLint("InflateParams") private PopupWindow createPopupWindow() { LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); diff --git a/library/src/main/res/layout/player_menu.xml b/library/src/main/res/layout/player_menu.xml index 90457f3..5615c62 100644 --- a/library/src/main/res/layout/player_menu.xml +++ b/library/src/main/res/layout/player_menu.xml @@ -8,7 +8,7 @@ android:background="@drawable/shape_rounded_corners" android:orientation="vertical"> - diff --git a/sample/build.gradle b/sample/build.gradle index 1a8c70e..336576f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':library') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:design:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.0.0' } diff --git a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/MainActivity.kt b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/MainActivity.kt index 313c3ad..840c56b 100644 --- a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/MainActivity.kt +++ b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/MainActivity.kt @@ -3,7 +3,7 @@ package com.ct7ct7ct7.androidvimeoplayersample import android.content.Intent import android.graphics.Color import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.widget.SeekBar import android.widget.Toast import com.ct7ct7ct7.androidvimeoplayer.listeners.VimeoPlayerReadyListener @@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity() { private fun setupToolbar() { toolbar.setNavigationIcon(R.drawable.ic_menu_white) - toolbar.setNavigationOnClickListener { v -> + toolbar.setNavigationOnClickListener { if (drawerLayout.isDrawerOpen(navigationView)) { drawerLayout.closeDrawers() } else { @@ -39,19 +39,15 @@ class MainActivity : AppCompatActivity() { when (menuItem.itemId) { R.id.fullscreenExampleItem -> { startActivity(Intent(this@MainActivity, FullscreenActivity::class.java)) - true } R.id.menuExampleItem -> { startActivity(Intent(this@MainActivity, MenuActivity::class.java)) - true } R.id.recyclerViewExampleItem -> { startActivity(Intent(this@MainActivity, RecyclerViewActivity::class.java)) - true } R.id.originalControlsExampleItem -> { startActivity(Intent(this@MainActivity, OriginalControlsActivity::class.java)) - true } } false @@ -68,7 +64,7 @@ class MainActivity : AppCompatActivity() { playerCurrentTimeTextView.text = getString(R.string.player_current_time, second.toString()) } - vimeoPlayer.addErrorListener { message, method, name -> + vimeoPlayer.addErrorListener { message, _, _ -> Toast.makeText(this, message, Toast.LENGTH_LONG).show() } @@ -99,7 +95,7 @@ class MainActivity : AppCompatActivity() { volumeSeekBar.progress = 100 volumeSeekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener { override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) { - var volume = progress.toFloat() / 100 + val volume = progress.toFloat() / 100 vimeoPlayer.setVolume(volume) } diff --git a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/FullscreenActivity.kt b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/FullscreenActivity.kt index fe5ef28..4f2ec08 100644 --- a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/FullscreenActivity.kt +++ b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/FullscreenActivity.kt @@ -3,7 +3,7 @@ package com.ct7ct7ct7.androidvimeoplayersample.examples import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.ct7ct7ct7.androidvimeoplayer.model.PlayerState import com.ct7ct7ct7.androidvimeoplayer.view.VimeoPlayerActivity import com.ct7ct7ct7.androidvimeoplayersample.R @@ -32,7 +32,7 @@ class FullscreenActivity : AppCompatActivity() { vimeoPlayer.setFullscreenVisibility(true) vimeoPlayer.setFullscreenClickListener { - var requestOrientation = VimeoPlayerActivity.REQUEST_ORIENTATION_AUTO + val requestOrientation = VimeoPlayerActivity.REQUEST_ORIENTATION_AUTO startActivityForResult(VimeoPlayerActivity.createIntent(this, requestOrientation, vimeoPlayer), REQUEST_CODE) } } @@ -41,13 +41,14 @@ class FullscreenActivity : AppCompatActivity() { super.onActivityResult(requestCode, resultCode, data) if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE) { - var playAt = data!!.getFloatExtra(VimeoPlayerActivity.RESULT_STATE_VIDEO_PLAY_AT, 0f) + val playAt = data!!.getFloatExtra(VimeoPlayerActivity.RESULT_STATE_VIDEO_PLAY_AT, 0f) vimeoPlayer.seekTo(playAt) - var playerState = PlayerState.valueOf(data!!.getStringExtra(VimeoPlayerActivity.RESULT_STATE_PLAYER_STATE)) - when (playerState) { + when (PlayerState.valueOf(data.getStringExtra(VimeoPlayerActivity.RESULT_STATE_PLAYER_STATE))) { PlayerState.PLAYING -> vimeoPlayer.play() PlayerState.PAUSED -> vimeoPlayer.pause() + else -> { + } } } } diff --git a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/MenuActivity.kt b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/MenuActivity.kt index 2dfb68a..05a2f04 100644 --- a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/MenuActivity.kt +++ b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/MenuActivity.kt @@ -1,10 +1,10 @@ package com.ct7ct7ct7.androidvimeoplayersample.examples import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.View import android.widget.Toast -import com.ct7ct7ct7.androidvimeoplayer.view.menu.ViemoMenuItem +import com.ct7ct7ct7.androidvimeoplayer.view.menu.VimeoMenuItem import com.ct7ct7ct7.androidvimeoplayersample.R import kotlinx.android.synthetic.main.activity_menu.* @@ -29,11 +29,11 @@ class MenuActivity : AppCompatActivity() { vimeoPlayer.initialize(true, 59777392) vimeoPlayer.setMenuVisibility(true) - vimeoPlayer.addMenuItem(ViemoMenuItem("settings", R.drawable.ic_settings, View.OnClickListener { + vimeoPlayer.addMenuItem(VimeoMenuItem("settings", R.drawable.ic_settings, View.OnClickListener { Toast.makeText(this, "settings clicked", Toast.LENGTH_SHORT).show() vimeoPlayer.dismissMenuItem() })) - vimeoPlayer.addMenuItem(ViemoMenuItem("star", R.drawable.ic_star, View.OnClickListener { + vimeoPlayer.addMenuItem(VimeoMenuItem("star", R.drawable.ic_star, View.OnClickListener { Toast.makeText(this, "star clicked", Toast.LENGTH_SHORT).show() vimeoPlayer.dismissMenuItem() })) diff --git a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/OriginalControlsActivity.kt b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/OriginalControlsActivity.kt index b9aa367..9f2cfaa 100644 --- a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/OriginalControlsActivity.kt +++ b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/OriginalControlsActivity.kt @@ -1,7 +1,7 @@ package com.ct7ct7ct7.androidvimeoplayersample.examples import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.ct7ct7ct7.androidvimeoplayersample.R import kotlinx.android.synthetic.main.activity_original_controls.* diff --git a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/RecyclerViewActivity.kt b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/RecyclerViewActivity.kt index 9eccb90..af3e37d 100644 --- a/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/RecyclerViewActivity.kt +++ b/sample/src/main/java/com/ct7ct7ct7/androidvimeoplayersample/examples/RecyclerViewActivity.kt @@ -1,10 +1,10 @@ package com.ct7ct7ct7.androidvimeoplayersample.examples -import android.arch.lifecycle.Lifecycle +import androidx.lifecycle.Lifecycle import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -48,7 +48,7 @@ class RecyclerViewActivity : AppCompatActivity() { private class TestRecyclerViewAdapter(val lifecycle: Lifecycle, val items: ArrayList) : RecyclerView.Adapter() { override fun onBindViewHolder(holder: ViewHolder, position: Int) { - var id = items[position] + val id = items[position] holder.vimeoPlayer.initialize(true, id) } diff --git a/sample/src/main/res/layout/activity_fullscreen.xml b/sample/src/main/res/layout/activity_fullscreen.xml index b8e2d65..09a96ff 100644 --- a/sample/src/main/res/layout/activity_fullscreen.xml +++ b/sample/src/main/res/layout/activity_fullscreen.xml @@ -8,12 +8,12 @@ android:orientation="vertical" tools:context=".MainActivity"> - - - + - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/sample/src/main/res/layout/activity_menu.xml b/sample/src/main/res/layout/activity_menu.xml index 77680f2..72d63b3 100644 --- a/sample/src/main/res/layout/activity_menu.xml +++ b/sample/src/main/res/layout/activity_menu.xml @@ -8,12 +8,12 @@ android:orientation="vertical" tools:context=".MainActivity"> - - - + - - - + - - - + - Date: Fri, 13 Dec 2019 15:37:08 +0200 Subject: [PATCH 2/2] update dependency versions (cherry picked from commit 036ba5ff2f8d2fcd65c0f7952c96cd1cfb6eac8f) --- library/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index dc712b0..3cf34ac 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -24,8 +24,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.github.bumptech.glide:glide:4.8.0' - implementation 'com.squareup.okhttp3:okhttp:3.12.0' + implementation 'com.github.bumptech.glide:glide:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:3.12.3' } apply from: rootProject.file('bintray.gradle')