Skip to content

Commit

Permalink
FloatingVolume: Code clean up and version bump to 1.0.7 beta (8)
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Myczkowski <[email protected]>
  • Loading branch information
Adam Myczkowski committed May 2, 2018
1 parent 9adde45 commit 72b4169
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 91 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ android {
applicationId "com.android.mycax.floatingvolume"
minSdkVersion min_sdk_version
targetSdkVersion compile_sdk_version
versionCode 7
versionName "1.0.6 beta"
versionCode 8
versionName "1.0.7 beta"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import android.os.IBinder;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.CardView;
import android.util.DisplayMetrics;
import android.view.Gravity;
import android.view.LayoutInflater;
Expand All @@ -28,7 +26,6 @@
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.SeekBar;
import android.widget.TextView;

import com.android.mycax.floatingvolume.R;
import com.android.mycax.floatingvolume.audio.AudioVolumeObserver;
Expand Down Expand Up @@ -163,87 +160,25 @@ private void addFloatingWidgetView(LayoutInflater inflater, DisplayMetrics displ
}

private void implementVolumeFeatures() {
if (seekbarSelections.contains("1")) {
mediaControl = mFloatingWidgetView.findViewById(R.id.SeekBarMedia);
mediaControl.setMax(Objects.requireNonNull(audioManager).getStreamMaxVolume(AudioManager.STREAM_MUSIC));
mediaControl.setProgress(audioManager.getStreamVolume(AudioManager.STREAM_MUSIC));
mediaControl.setOnSeekBarChangeListener(this);
mAudioVolumeObserverMedia = new AudioVolumeObserver(this);
mAudioVolumeObserverMedia.register(AudioManager.STREAM_MUSIC, this);
} else {
if (style == 3) {
mFloatingWidgetView.findViewById(R.id.textViewMedia).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.SeekBarMediaRotator).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.ImageMedia).setVisibility(View.GONE);
} else {
mFloatingWidgetView.findViewById(R.id.textViewMedia).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.linearLayoutMedia).setVisibility(View.GONE);
}
}

if (seekbarSelections.contains("2")) {
ringerControl = mFloatingWidgetView.findViewById(R.id.SeekBarRinger);
ringerControl.setMax(audioManager.getStreamMaxVolume(AudioManager.STREAM_RING));
ringerControl.setProgress(audioManager.getStreamVolume(AudioManager.STREAM_RING));
ringerControl.setOnSeekBarChangeListener(this);
mAudioVolumeObserverRinger = new AudioVolumeObserver(this);
mAudioVolumeObserverRinger.register(AudioManager.STREAM_RING, this);
} else {
if (style == 3) {
mFloatingWidgetView.findViewById(R.id.textViewRinger).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.SeekBarRingerRotator).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.ImageRinger).setVisibility(View.GONE);
} else {
mFloatingWidgetView.findViewById(R.id.textViewRinger).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.linearLayoutRinger).setVisibility(View.GONE);
}
}

if (seekbarSelections.contains("3")) {
alarmControl = mFloatingWidgetView.findViewById(R.id.SeekBarAlarm);
alarmControl.setMax(audioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM));
alarmControl.setProgress(audioManager.getStreamVolume(AudioManager.STREAM_ALARM));
alarmControl.setOnSeekBarChangeListener(this);
mAudioVolumeObserverAlarm = new AudioVolumeObserver(this);
mAudioVolumeObserverAlarm.register(AudioManager.STREAM_ALARM, this);
} else {
if (style == 3) {
mFloatingWidgetView.findViewById(R.id.textViewAlarm).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.SeekBarAlarmRotator).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.ImageAlarm).setVisibility(View.GONE);
} else {
mFloatingWidgetView.findViewById(R.id.textViewAlarm).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.linearLayoutAlarm).setVisibility(View.GONE);
}
}

if (seekbarSelections.contains("4")) {
mAudioVolumeObserverVoiceCall = new AudioVolumeObserver(this);
mAudioVolumeObserverVoiceCall.register(AudioManager.STREAM_VOICE_CALL, this);
if (audioManager.getMode() == AudioManager.MODE_IN_CALL) {
if (style == 3) {
mFloatingWidgetView.findViewById(R.id.textViewVoiceCall).setVisibility(View.VISIBLE);
mFloatingWidgetView.findViewById(R.id.SeekBarVoiceCallRotator).setVisibility(View.VISIBLE);
mFloatingWidgetView.findViewById(R.id.ImageVoiceCall).setVisibility(View.VISIBLE);
} else {
mFloatingWidgetView.findViewById(R.id.linearLayoutVoiceCall).setVisibility(View.VISIBLE);
mFloatingWidgetView.findViewById(R.id.textViewVoiceCall).setVisibility(View.VISIBLE);
}
voiceCallControl = mFloatingWidgetView.findViewById(R.id.SeekBarVoiceCall);
voiceCallControl.setMax(audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL));
voiceCallControl.setProgress(audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL));
voiceCallControl.setOnSeekBarChangeListener(this);
} else {
if (style == 3) {
mFloatingWidgetView.findViewById(R.id.textViewVoiceCall).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.SeekBarVoiceCallRotator).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.ImageVoiceCall).setVisibility(View.GONE);
} else {
mFloatingWidgetView.findViewById(R.id.linearLayoutVoiceCall).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(R.id.textViewVoiceCall).setVisibility(View.GONE);
}
}
}
mediaControl = mFloatingWidgetView.findViewById(R.id.SeekBarMedia);
mAudioVolumeObserverMedia = new AudioVolumeObserver(this);
seekbarSetup(Constants.SEEKBAR_MEDIA, mediaControl, AudioManager.STREAM_MUSIC, mAudioVolumeObserverMedia, R.id.textViewMedia,
R.id.SeekBarMediaRotator, R.id.ImageMedia, R.id.linearLayoutMedia);

ringerControl = mFloatingWidgetView.findViewById(R.id.SeekBarRinger);
mAudioVolumeObserverRinger = new AudioVolumeObserver(this);
seekbarSetup(Constants.SEEKBAR_RINGER, ringerControl, AudioManager.STREAM_RING, mAudioVolumeObserverRinger, R.id.textViewRinger,
R.id.SeekBarRingerRotator, R.id.ImageRinger, R.id.linearLayoutRinger);

alarmControl = mFloatingWidgetView.findViewById(R.id.SeekBarAlarm);
mAudioVolumeObserverAlarm = new AudioVolumeObserver(this);
seekbarSetup(Constants.SEEKBAR_ALARM, alarmControl, AudioManager.STREAM_ALARM, mAudioVolumeObserverAlarm, R.id.textViewAlarm,
R.id.SeekBarAlarmRotator, R.id.ImageAlarm, R.id.linearLayoutAlarm);

mAudioVolumeObserverVoiceCall = new AudioVolumeObserver(this);
voiceCallControl = mFloatingWidgetView.findViewById(R.id.SeekBarVoiceCall);
seekbarSetup(Constants.SEEKBAR_VOICE_CALL, voiceCallControl, AudioManager.STREAM_VOICE_CALL, mAudioVolumeObserverVoiceCall, R.id.textViewVoiceCall,
R.id.SeekBarVoiceCallRotator, R.id.ImageVoiceCall, R.id.linearLayoutVoiceCall);

change_ringer_mode = mFloatingWidgetView.findViewById(R.id.imageViewModeSwitch);
final Animation fab_open = AnimationUtils.loadAnimation(this, R.anim.fab_open_0_to_1);
Expand All @@ -260,6 +195,40 @@ public void onReceive(Context context, Intent intent) {
change_ringer_mode.setOnClickListener(this);
}

private void seekbarSetup(String enabled, SeekBar seekBar, int streamType, AudioVolumeObserver audioVolumeObserver,
int textView, int rotator, int imageView, int linearLayout) {
if (seekbarSelections.contains(enabled)) {
if (seekBar.getId() == R.id.SeekBarVoiceCall && audioManager.getMode() == AudioManager.MODE_IN_CALL) {
if (style == 3) {
mFloatingWidgetView.findViewById(textView).setVisibility(View.VISIBLE);
mFloatingWidgetView.findViewById(rotator).setVisibility(View.VISIBLE);
mFloatingWidgetView.findViewById(imageView).setVisibility(View.VISIBLE);
} else {
mFloatingWidgetView.findViewById(linearLayout).setVisibility(View.VISIBLE);
mFloatingWidgetView.findViewById(textView).setVisibility(View.VISIBLE);
}
seekBar.setMax(Objects.requireNonNull(audioManager).getStreamMaxVolume(streamType));
seekBar.setProgress(audioManager.getStreamVolume(streamType));
seekBar.setOnSeekBarChangeListener(this);
audioVolumeObserver.register(streamType, this);
} else {
seekBar.setMax(Objects.requireNonNull(audioManager).getStreamMaxVolume(streamType));
seekBar.setProgress(audioManager.getStreamVolume(streamType));
seekBar.setOnSeekBarChangeListener(this);
audioVolumeObserver.register(streamType, this);
}
} else {
if (style == 3) {
mFloatingWidgetView.findViewById(textView).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(rotator).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(imageView).setVisibility(View.GONE);
} else {
mFloatingWidgetView.findViewById(textView).setVisibility(View.GONE);
mFloatingWidgetView.findViewById(linearLayout).setVisibility(View.GONE);
}
}
}

@Override
public void onStopTrackingTouch(SeekBar arg0) {
Animation animation = AnimationUtils.loadAnimation(this, R.anim.fab_close_13_to_1);
Expand Down Expand Up @@ -358,16 +327,16 @@ public void onClick(View v) {
case R.id.close_expanded_view:
removeExpandedView();
iconView.setVisibility(View.VISIBLE);
if (seekbarSelections.contains("1")) {
if (seekbarSelections.contains(Constants.SEEKBAR_MEDIA)) {
mAudioVolumeObserverMedia.unregister();
}
if (seekbarSelections.contains("2")) {
if (seekbarSelections.contains(Constants.SEEKBAR_RINGER)) {
mAudioVolumeObserverRinger.unregister();
}
if (seekbarSelections.contains("3")) {
if (seekbarSelections.contains(Constants.SEEKBAR_ALARM)) {
mAudioVolumeObserverAlarm.unregister();
}
if (seekbarSelections.contains("4")) {
if (seekbarSelections.contains(Constants.SEEKBAR_VOICE_CALL)) {
mAudioVolumeObserverVoiceCall.unregister();
}
unregisterReceiver(RingerModeReceiver);
Expand Down Expand Up @@ -437,7 +406,7 @@ private FloatingViewManager.Options loadOptions(DisplayMetrics metrics) {
options.floatingViewY = height - (height / 2);
}

options.moveDirection=FloatingViewManager.MOVE_DIRECTION_NONE;
options.moveDirection = FloatingViewManager.MOVE_DIRECTION_NONE;

return options;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ public interface Constants {
String PREF_ITEMS_TO_SHOW = "items_to_show_in_dialog_pref";
String ARM64V8A = "arm64-v8a";
String ARMEABIV7A = "armeabi-v7a";
String SEEKBAR_MEDIA = "1";
String SEEKBAR_RINGER = "2";
String SEEKBAR_ALARM = "3";
String SEEKBAR_VOICE_CALL = "4";
int OVERLAY_PERMISSION_REQUEST = 1;
int NOTIFICATION_POLICY_PERMISSION_REQUEST = 2;
}

0 comments on commit 72b4169

Please sign in to comment.