Skip to content

Commit 82128d2

Browse files
author
Paul Ruiz
committed
cleanup
1 parent 0d984bf commit 82128d2

File tree

4 files changed

+36
-47
lines changed

4 files changed

+36
-47
lines changed

‎AndroidTVMediaPlayer/app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.ptrprograms.androidtvmediaplayer" >
44

5+
<uses-permission android:name="android.permission.INTERNET" />
6+
<uses-feature
7+
android:name="android.hardware.touchscreen"
8+
android:required="false" />
9+
510
<application
611
android:allowBackup="true"
712
android:icon="@drawable/ic_launcher"
@@ -29,10 +34,4 @@
2934

3035
</application>
3136

32-
<uses-permission android:name="android.permission.INTERNET" />
33-
34-
<uses-feature
35-
android:name="android.hardware.touchscreen"
36-
android:required="false" />
37-
3837
</manifest>

‎AndroidTVMediaPlayer/app/src/main/java/com/ptrprograms/androidtvmediaplayer/Fragment/MainFragment.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
public class MainFragment extends BrowseFragment {
3131

32-
CardPresenter mCardPresenter;
3332
private List<Movie> mMovies = new ArrayList<Movie>();
3433

3534
@Override
@@ -51,15 +50,15 @@ private void loadData() {
5150

5251
private void loadRows() {
5352

54-
ArrayObjectAdapter rowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
55-
mCardPresenter = new CardPresenter();
53+
ArrayObjectAdapter rowsAdapter = new ArrayObjectAdapter( new ListRowPresenter() );
54+
CardPresenter cardPresenter = new CardPresenter();
5655

5756
List<String> categories = getCategories();
5857
if( categories == null || categories.isEmpty() )
5958
return;
6059

6160
for( String category : categories ) {
62-
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter( mCardPresenter );
61+
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter( cardPresenter );
6362
for( Movie movie : mMovies ) {
6463
if( category.equalsIgnoreCase( movie.getCategory() ) )
6564
listRowAdapter.add( movie );
@@ -71,7 +70,7 @@ private void loadRows() {
7170
}
7271

7372
setupPreferences( rowsAdapter );
74-
setAdapter(rowsAdapter);
73+
setAdapter( rowsAdapter );
7574

7675
}
7776

‎AndroidTVMediaPlayer/app/src/main/java/com/ptrprograms/androidtvmediaplayer/Fragment/VideoDetailsFragment.java

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import android.support.v17.leanback.widget.OnActionClickedListener;
1818
import android.text.TextUtils;
1919
import android.util.DisplayMetrics;
20-
import android.util.Log;
21-
import android.widget.Toast;
2220

2321
import com.google.gson.Gson;
2422
import com.google.gson.reflect.TypeToken;
@@ -46,7 +44,7 @@ public class VideoDetailsFragment extends DetailsFragment {
4644

4745
private static final int ACTION_WATCH = 1;
4846

49-
private Movie selectedMovie;
47+
private Movie mSelectedMovie;
5048

5149
private Target mBackgroundTarget;
5250
private DisplayMetrics mMetrics;
@@ -55,10 +53,10 @@ public class VideoDetailsFragment extends DetailsFragment {
5553
public void onCreate(Bundle savedInstanceState) {
5654
super.onCreate(savedInstanceState);
5755

58-
selectedMovie = (Movie) getActivity().getIntent().getSerializableExtra( EXTRA_MOVIE );
56+
mSelectedMovie = (Movie) getActivity().getIntent().getSerializableExtra( EXTRA_MOVIE );
5957

6058
initBackground();
61-
new DetailRowBuilderTask().execute( selectedMovie );
59+
new DetailRowBuilderTask().execute( mSelectedMovie );
6260

6361
}
6462

@@ -70,9 +68,9 @@ private void initBackground() {
7068
mMetrics = new DisplayMetrics();
7169
getActivity().getWindowManager().getDefaultDisplay().getMetrics(mMetrics);
7270

73-
if( selectedMovie != null && !TextUtils.isEmpty( selectedMovie.getBackgroundImageUrl() ) ) {
71+
if( mSelectedMovie != null && !TextUtils.isEmpty( mSelectedMovie.getBackgroundImageUrl() ) ) {
7472
try {
75-
updateBackground(new URI(selectedMovie.getBackgroundImageUrl()));
73+
updateBackground(new URI(mSelectedMovie.getBackgroundImageUrl()));
7674
} catch (URISyntaxException e) { }
7775
}
7876
}
@@ -95,20 +93,19 @@ protected void updateBackground(URI uri) {
9593

9694
private class DetailRowBuilderTask extends AsyncTask<Movie, Integer, DetailsOverviewRow> {
9795
@Override
98-
protected DetailsOverviewRow doInBackground(Movie... movies) {
99-
Log.e( "VideoDetailsFragment", "doInBackground" );
100-
selectedMovie = movies[0];
96+
protected DetailsOverviewRow doInBackground( Movie... movies ) {
97+
mSelectedMovie = movies[0];
10198
DetailsOverviewRow row = null;
10299
try {
103-
row = new DetailsOverviewRow(selectedMovie);
100+
row = new DetailsOverviewRow( mSelectedMovie );
104101
Bitmap poster = Picasso.with( getActivity() )
105-
.load( selectedMovie.getCardImageUrl() )
106-
.resize(Utils.dpToPx( getActivity().getResources().getInteger( R.integer.detail_thumbnail_square_size ), getActivity().getApplicationContext()),
107-
Utils.dpToPx( getActivity().getResources().getInteger( R.integer.detail_thumbnail_square_size ), getActivity().getApplicationContext()))
102+
.load( mSelectedMovie.getCardImageUrl() )
103+
.resize(Utils.dpToPx( getActivity().getResources().getInteger( R.integer.detail_thumbnail_square_size ), getActivity().getApplicationContext() ),
104+
Utils.dpToPx( getActivity().getResources().getInteger( R.integer.detail_thumbnail_square_size ), getActivity().getApplicationContext() ) )
108105
.centerCrop()
109106
.get();
110-
row.setImageBitmap(getActivity(), poster);
111-
} catch (IOException e) {
107+
row.setImageBitmap( getActivity(), poster );
108+
} catch ( IOException e ) {
112109
getActivity().finish();
113110
return null;
114111
} catch( NullPointerException e ) {
@@ -123,43 +120,37 @@ protected DetailsOverviewRow doInBackground(Movie... movies) {
123120
}
124121

125122
@Override
126-
protected void onPostExecute(DetailsOverviewRow detailRow) {
127-
Log.e( "VideoDetailsFragment", "onPostExecute" );
123+
protected void onPostExecute( DetailsOverviewRow detailRow ) {
128124
if( detailRow == null )
129125
return;
130126

131-
Log.e( "VideoDetailsFragment", "detailRow != null" );
132-
133127
ClassPresenterSelector ps = new ClassPresenterSelector();
134128
DetailsOverviewRowPresenter dorPresenter =
135-
new DetailsOverviewRowPresenter(new DetailsDescriptionPresenter());
129+
new DetailsOverviewRowPresenter( new DetailsDescriptionPresenter() );
136130
// set detail background and style
137131
dorPresenter.setBackgroundColor( getResources().getColor( R.color.detail_background ) );
138132
dorPresenter.setStyleLarge( true );
139133
dorPresenter.setOnActionClickedListener( new OnActionClickedListener() {
140134
@Override
141-
public void onActionClicked(Action action) {
135+
public void onActionClicked( Action action ) {
142136
if (action.getId() == ACTION_WATCH ) {
143137
Intent intent = new Intent( getActivity(), PlayerActivity.class );
144-
intent.putExtra( EXTRA_MOVIE, selectedMovie);
145-
intent.putExtra( EXTRA_SHOULD_AUTO_START, true);
146-
startActivity(intent);
147-
}
148-
else {
149-
Toast.makeText(getActivity(), action.toString(), Toast.LENGTH_SHORT).show();
138+
intent.putExtra( EXTRA_MOVIE, mSelectedMovie );
139+
intent.putExtra( EXTRA_SHOULD_AUTO_START, true );
140+
startActivity( intent );
150141
}
151142
}
152143
});
153144

154-
ps.addClassPresenter(DetailsOverviewRow.class, dorPresenter);
155-
ps.addClassPresenter(ListRow.class,
156-
new ListRowPresenter());
145+
ps.addClassPresenter( DetailsOverviewRow.class, dorPresenter );
146+
ps.addClassPresenter( ListRow.class,
147+
new ListRowPresenter() );
157148

158149

159-
ArrayObjectAdapter adapter = new ArrayObjectAdapter(ps);
160-
adapter.add(detailRow);
150+
ArrayObjectAdapter adapter = new ArrayObjectAdapter( ps );
151+
adapter.add( detailRow );
161152
loadRelatedMedia( adapter );
162-
setAdapter(adapter);
153+
setAdapter( adapter );
163154
}
164155

165156
private void loadRelatedMedia( ArrayObjectAdapter adapter ) {
@@ -170,7 +161,7 @@ private void loadRelatedMedia( ArrayObjectAdapter adapter ) {
170161
List<Movie> movies = gson.fromJson( json, collection );
171162
List<Movie> related = new ArrayList<Movie>();
172163
for( Movie movie : movies ) {
173-
if( movie.getCategory().equals( selectedMovie.getCategory() ) ) {
164+
if( movie.getCategory().equals( mSelectedMovie.getCategory() ) ) {
174165
related.add( movie );
175166
}
176167
}

‎AndroidTVMediaPlayer/app/src/main/java/com/ptrprograms/androidtvmediaplayer/Presenter/CardPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ImageCardView getCardView() {
3232
protected void updateCardViewImage( Context context, String link ) {
3333
Picasso.with( context )
3434
.load(link)
35-
.resize( mCardView.getResources().getInteger( R.integer.card_presenter_width ), mCardView.getResources().getInteger(R.integer.card_presenter_height) )
35+
.resize( mCardView.getResources().getInteger( R.integer.card_presenter_width ), mCardView.getResources().getInteger( R.integer.card_presenter_height ) )
3636
.centerCrop()
3737
.error( R.drawable.default_background )
3838
.into( mImageCardViewTarget );

0 commit comments

Comments
 (0)