Skip to content

Commit

Permalink
Use design support library.
Browse files Browse the repository at this point in the history 
Bug: 24207656
Change-Id: Ib3924d8ac249864cca8a1db74137838d02737500
  • Loading branch information
@mangini
mangini committed Dec 1, 2015
1 parent ecfa619 commit 3ea11a2
Show file tree
Hide file tree
Showing 19 changed files with 159 additions and 392 deletions.
4 changes: 2 additions & 2 deletions mobile/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ repositories {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.google.android.gms:play-services-cast:8.3.0'
compile 'com.google.android.support:wearable:1.2.0'
compile 'com.google.android.support:wearable:1.3.0'
compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:cardview-v7:23.1.1'
compile 'com.android.support:mediarouter-v7:23.1.1'
compile 'com.android.support:leanback-v17:23.1.1'

compile (name:'CastCompanionLibrary-debug-2.6.1', ext:'aar')
compile 'com.github.amlcurran.showcaseview:library:5.0.0'
compile 'com.android.support:design:23.1.1'
}
91 changes: 37 additions & 54 deletions mobile/src/main/java/com/example/android/uamp/ui/ActionBarCastActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import android.app.FragmentManager;
import android.content.Intent;
import android.content.res.Configuration;
import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
import android.support.design.widget.NavigationView;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
Expand All @@ -32,15 +32,10 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.SimpleAdapter;

import com.example.android.uamp.R;
import com.example.android.uamp.utils.LogHelper;
import com.example.android.uamp.utils.PrefUtils;
import com.example.android.uamp.utils.ResourceHelper;
import com.github.amlcurran.showcaseview.ShowcaseView;
import com.github.amlcurran.showcaseview.targets.ViewTarget;
import com.google.android.libraries.cast.companionlibrary.cast.VideoCastManager;
Expand All @@ -67,8 +62,6 @@ public abstract class ActionBarCastActivity extends AppCompatActivity {
private Toolbar mToolbar;
private ActionBarDrawerToggle mDrawerToggle;
private DrawerLayout mDrawerLayout;
private ListView mDrawerList;
private DrawerMenuContents mDrawerMenuContents;

private boolean mToolbarInitialized;

Expand Down Expand Up @@ -117,14 +110,23 @@ public void run() {
@Override
public void onDrawerClosed(View drawerView) {
if (mDrawerToggle != null) mDrawerToggle.onDrawerClosed(drawerView);
int position = mItemToOpenWhenDrawerCloses;
if (position >= 0) {
if (mItemToOpenWhenDrawerCloses >= 0) {
Bundle extras = ActivityOptions.makeCustomAnimation(
ActionBarCastActivity.this, R.anim.fade_in, R.anim.fade_out).toBundle();

Class activityClass = mDrawerMenuContents.getActivity(position);
startActivity(new Intent(ActionBarCastActivity.this, activityClass), extras);
finish();
Class activityClass = null;
switch (mItemToOpenWhenDrawerCloses) {
case R.id.navigation_allmusic:
activityClass = MusicPlayerActivity.class;
break;
case R.id.navigation_playlists:
activityClass = PlaceholderActivity.class;
break;
}
if (activityClass != null) {
startActivity(new Intent(ActionBarCastActivity.this, activityClass), extras);
finish();
}
}
}

Expand Down Expand Up @@ -269,21 +271,19 @@ protected void initializeToolbar() {
}
mToolbar.inflateMenu(R.menu.main);

mDrawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
if (mDrawerLayout != null) {
mDrawerList = (ListView) findViewById(R.id.drawer_list);
if (mDrawerList == null) {
throw new IllegalStateException("A layout with a drawerLayout is required to" +
"include a ListView with id 'drawerList'");
NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
if (navigationView == null) {
throw new IllegalStateException("Layout requires a NavigationView " +
"with id 'nav_view'");
}

// Create an ActionBarDrawerToggle that will handle opening/closing of the drawer:
mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,
mToolbar, R.string.open_content_drawer, R.string.close_content_drawer);
mDrawerLayout.setDrawerListener(mDrawerListener);
mDrawerLayout.setStatusBarBackgroundColor(
ResourceHelper.getThemeColor(this, R.attr.colorPrimary, android.R.color.black));
populateDrawerItems();
populateDrawerItems(navigationView);
setSupportActionBar(mToolbar);
updateDrawerToggle();
} else {
Expand All @@ -293,39 +293,22 @@ protected void initializeToolbar() {
mToolbarInitialized = true;
}

private void populateDrawerItems() {
mDrawerMenuContents = new DrawerMenuContents(this);
final int selectedPosition = mDrawerMenuContents.getPosition(this.getClass());
final int unselectedColor = Color.WHITE;
final int selectedColor = getResources().getColor(R.color.drawer_item_selected_background);
SimpleAdapter adapter = new SimpleAdapter(this, mDrawerMenuContents.getItems(),
R.layout.drawer_list_item,
new String[]{DrawerMenuContents.FIELD_TITLE, DrawerMenuContents.FIELD_ICON},
new int[]{R.id.drawer_item_title, R.id.drawer_item_icon}) {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view = super.getView(position, convertView, parent);
int color = unselectedColor;
if (position == selectedPosition) {
color = selectedColor;
}
view.setBackgroundColor(color);
return view;
}
};

mDrawerList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (position != selectedPosition) {
view.setBackgroundColor(getResources().getColor(
R.color.drawer_item_selected_background));
mItemToOpenWhenDrawerCloses = position;
}
mDrawerLayout.closeDrawers();
}
});
mDrawerList.setAdapter(adapter);
private void populateDrawerItems(NavigationView navigationView) {
navigationView.setNavigationItemSelectedListener(
new NavigationView.OnNavigationItemSelectedListener() {
@Override
public boolean onNavigationItemSelected(MenuItem menuItem) {
menuItem.setChecked(true);
mItemToOpenWhenDrawerCloses = menuItem.getItemId();
mDrawerLayout.closeDrawers();
return true;
}
});
if (MusicPlayerActivity.class.isAssignableFrom(getClass())) {
navigationView.setCheckedItem(R.id.navigation_allmusic);
} else if (PlaceholderActivity.class.isAssignableFrom(getClass())) {
navigationView.setCheckedItem(R.id.navigation_playlists);
}
}

protected void updateDrawerToggle() {
Expand Down
70 changes: 0 additions & 70 deletions mobile/src/main/java/com/example/android/uamp/ui/DrawerMenuContents.java
View file

This file was deleted.

6 changes: 3 additions & 3 deletions mobile/src/main/java/com/example/android/uamp/ui/FullScreenPlayerActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import android.os.Handler;
import android.os.SystemClock;
import android.support.annotation.NonNull;
import android.text.format.DateUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.ProgressBar;
Expand All @@ -39,7 +40,6 @@
import com.example.android.uamp.MusicService;
import com.example.android.uamp.R;
import com.example.android.uamp.utils.LogHelper;
import com.google.android.libraries.cast.companionlibrary.utils.Utils;

import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Expand Down Expand Up @@ -186,7 +186,7 @@ public void onClick(View v) {
mSeekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
mStart.setText(Utils.formatMillis(progress));
mStart.setText(DateUtils.formatElapsedTime(progress / 1000));
}

@Override
Expand Down Expand Up @@ -334,7 +334,7 @@ private void updateDuration(MediaMetadata metadata) {
LogHelper.d(TAG, "updateDuration called ");
int duration = (int) metadata.getLong(MediaMetadata.METADATA_KEY_DURATION);
mSeekbar.setMax(duration);
mEnd.setText(Utils.formatMillis(duration));
mEnd.setText(DateUtils.formatElapsedTime(duration/1000));
}

private void updatePlaybackState(PlaybackState state) {
Expand Down
Loading

0 comments on commit 3ea11a2

Please sign in to comment.