diff --git a/app/src/main/java/com/hyperling/apps/infinitetimer/MainActivity.java b/app/src/main/java/com/hyperling/apps/infinitetimer/MainActivity.java
index 08152f4..05f5547 100755
--- a/app/src/main/java/com/hyperling/apps/infinitetimer/MainActivity.java
+++ b/app/src/main/java/com/hyperling/apps/infinitetimer/MainActivity.java
@@ -56,6 +56,7 @@ public class MainActivity extends AppCompatActivity {
SeekBar seekBar;
AudioManager audioManager;
+ TextView tvSeekBar;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -210,7 +211,13 @@ public class MainActivity extends AppCompatActivity {
//(ViewManager) etMillis.getParent().remove
seekBar = findViewById(R.id.seekBar);
+ setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
+ int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+ seekBar.setMax(maxVolume);
+
+ tvSeekBar = findViewById(R.id.tvSeekbar);
syncVolume();
@@ -218,19 +225,20 @@ public class MainActivity extends AppCompatActivity {
@Override
public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, i, AudioManager.FLAG_SHOW_UI);
+ syncVolume();
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
- // Do Nothing
+ syncVolume();
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
- // Do Nothing
+ syncVolume();
}
});
- setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
recoverScreen();
@@ -685,11 +693,16 @@ public class MainActivity extends AppCompatActivity {
}
public void syncVolume() {
- int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
- seekBar.setMax(maxVolume);
+ String tag = TAG + "syncVolume";
+ if (DEBUG) Log.d(tag, "Starting");
int currVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
seekBar.setProgress(currVolume);
+
+ String volume = getString(R.string.tvSeekBar) + seekBar.getProgress() + "/" + seekBar.getMax();
+ tvSeekBar.setText(volume);
+
+ if (DEBUG) Log.d(tag, "Finished");
}
@Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1a25421..d30d6ed 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -158,13 +158,27 @@
-
+ android:layout_alignParentBottom="true">
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ac5198..5df19ae 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,4 +35,6 @@
Enable Millisecs
Enable Ads
Exit
+
+ Media Volume: