tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed the default settings. Fixed settings layout bug. Synced translations.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-06-11 17:34:34 +02:00
commit b32feb38fe
15 changed files with 255 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/kabouzeid/gramophone/prefs/ColorChooserPreference.java
View file

@ -25,7 +25,8 @@ public class ColorChooserPreference extends Preference {
public ColorChooserPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
setLayoutResource(R.layout.preference_color_chooser);
setLayoutResource(R.layout.preference_custom);
setWidgetLayoutResource(R.layout.preference_color_widget);
}
@Override

24
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
View file

@ -83,8 +83,8 @@ public class MusicControllerActivity extends AbsFabActivity {
private final boolean opaqueStatusBar = PreferenceUtils.getInstance(this).opaqueStatusbarNowPlaying();
private final boolean opaqueToolBar = opaqueStatusBar && PreferenceUtils.getInstance(this).opaqueToolbarNowPlaying();
private final boolean forceSquareAlbumArt = PreferenceUtils.getInstance(this).forceAlbumArtSquared();
private final boolean smallerTitleBox = PreferenceUtils.getInstance(this).smallerTitileBoxNowPlaying();
private final boolean traditionalProgressSlider = PreferenceUtils.getInstance(this).traditionalProgressSliderNowPlaying();
private final boolean largerTitleBox = PreferenceUtils.getInstance(this).largerTitleBoxNowPlaying();
private final boolean alternativeProgressSlider = PreferenceUtils.getInstance(this).alternativeProgressSliderNowPlaying();
private final boolean showPlaybackControllerCard = PreferenceUtils.getInstance(this).playbackControllerCardNowPlaying();
@Override
@ -92,7 +92,7 @@ public class MusicControllerActivity extends AbsFabActivity {
setStatusBarTransparent();
super.onCreate(savedInstanceState);
setContentView(traditionalProgressSlider ? R.layout.activity_music_controller_traditional_progress_slider : R.layout.activity_music_controller);
setContentView(alternativeProgressSlider ? R.layout.activity_music_controller_alternative_progress_slider : R.layout.activity_music_controller);
initViews();
moveSeekBarIntoPlace();
@ -149,7 +149,7 @@ public class MusicControllerActivity extends AbsFabActivity {
private void moveSeekBarIntoPlace() {
if (traditionalProgressSlider) {
if (!alternativeProgressSlider) {
RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) progressSlider.getLayoutParams();
progressSlider.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
final int seekBarMarginLeftRight = getResources().getDimensionPixelSize(R.dimen.seek_bar_margin_left_right);
@ -159,14 +159,14 @@ public class MusicControllerActivity extends AbsFabActivity {
}
private void adjustTitleBoxSize() {
int paddingTopBottom = smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_padding_small) : getResources().getDimensionPixelSize(R.dimen.title_box_padding_large);
int paddingTopBottom = largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_padding_large) : getResources().getDimensionPixelSize(R.dimen.title_box_padding_small);
footer.setPadding(footer.getPaddingLeft(), paddingTopBottom, footer.getPaddingRight(), paddingTopBottom);
songTitle.setPadding(songTitle.getPaddingLeft(), songTitle.getPaddingTop(), songTitle.getPaddingRight(), smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_small) : getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_large));
songArtist.setPadding(songArtist.getPaddingLeft(), smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_small) : getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_large), songArtist.getPaddingRight(), songArtist.getPaddingBottom());
songTitle.setPadding(songTitle.getPaddingLeft(), songTitle.getPaddingTop(), songTitle.getPaddingRight(), largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_large) : getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_small));
songArtist.setPadding(songArtist.getPaddingLeft(), largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_large) : getResources().getDimensionPixelSize(R.dimen.title_box_text_spacing_small), songArtist.getPaddingRight(), songArtist.getPaddingBottom());
songTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_title_text_size_small) : getResources().getDimensionPixelSize(R.dimen.title_box_title_text_size_large));
songArtist.setTextSize(TypedValue.COMPLEX_UNIT_PX, smallerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_caption_text_size_small) : getResources().getDimensionPixelSize(R.dimen.title_box_caption_text_size_large));
songTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_title_text_size_large) : getResources().getDimensionPixelSize(R.dimen.title_box_title_text_size_small));
songArtist.setTextSize(TypedValue.COMPLEX_UNIT_PX, largerTitleBox ? getResources().getDimensionPixelSize(R.dimen.title_box_caption_text_size_large) : getResources().getDimensionPixelSize(R.dimen.title_box_caption_text_size_small));
}
private void setUpPlaybackControllerCard() {
@ -203,10 +203,10 @@ public class MusicControllerActivity extends AbsFabActivity {
ColorStateList s1 = ColorStateList.valueOf(color);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
seekBar.setThumbTintList(s1);
if (traditionalProgressSlider) seekBar.setProgressTintList(s1);
if (!alternativeProgressSlider) seekBar.setProgressTintList(s1);
} else {
seekBar.getThumb().setColorFilter(color, PorterDuff.Mode.SRC_IN);
if (traditionalProgressSlider)
if (!alternativeProgressSlider)
seekBar.getProgressDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
}
}
@ -487,7 +487,7 @@ public class MusicControllerActivity extends AbsFabActivity {
@Override
protected void onPause() {
super.onPause();
if(progressViewsUpdateThread != null) progressViewsUpdateThread.interrupt();
if (progressViewsUpdateThread != null) progressViewsUpdateThread.interrupt();
}
@Override

12
app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
View file

@ -37,8 +37,8 @@ public final class PreferenceUtils {
public static final String OPAQUE_TOOLBAR_NOW_PLAYING = "opaque_toolbar_now_playing";
public static final String OPAQUE_STATUSBAR_NOW_PLAYING = "opaque_statusbar_now_playing";
public static final String FORCE_SQUARE_ALBUM_ART = "force_square_album_art";
public static final String SMALLER_TITLE_BOX_NOW_PLAYING = "smaller_title_box_now_playing";
public static final String TRADITIONAL_PROGRESS_SLIDER_NOW_PLAYING = "traditional_progress_slider_now_playing";
public static final String LARGER_TITLE_BOX_NOW_PLAYING = "larger_title_box_now_playing";
public static final String ALTERNATIVE_PROGRESS_SLIDER_NOW_PLAYING = "alternative_progress_slider_now_playing";
public static final String PLAYBACK_CONTROLLER_CARD_NOW_PLAYING = "playback_controller_card_now_playing";
private static PreferenceUtils sInstance;
@ -179,12 +179,12 @@ public final class PreferenceUtils {
return mPreferences.getBoolean(PLAYBACK_CONTROLLER_CARD_NOW_PLAYING, false);
}
public final boolean smallerTitileBoxNowPlaying() {
return mPreferences.getBoolean(SMALLER_TITLE_BOX_NOW_PLAYING, false);
public final boolean largerTitleBoxNowPlaying() {
return mPreferences.getBoolean(LARGER_TITLE_BOX_NOW_PLAYING, false);
}
public final boolean traditionalProgressSliderNowPlaying() {
return mPreferences.getBoolean(TRADITIONAL_PROGRESS_SLIDER_NOW_PLAYING, false);
public final boolean alternativeProgressSliderNowPlaying() {
return mPreferences.getBoolean(ALTERNATIVE_PROGRESS_SLIDER_NOW_PLAYING, false);
}
// public final boolean downloadMissingArtistImages() {