Merge pull request 'Volume Seekbar Fixes' (#3) from dev into main

Reviewed-on: #3

.gitignore

@@ -33,3 +33,5 @@ google-services.json
 # Android Profiling
 *.hprof
 
+# Release Files
+app/release/*

README.md

@@ -5,8 +5,8 @@ Timer which loops over the specified interval, playing your default notification
 ## Update Notes
 
 ### 2025-07-11
-(This article)[https://sijus.medium.com/resurrecting-a-5-year-old-android-app-a-developers-journey-59d8f5689e5b]
- was very helpful in getting this app updated from SDK 25 to 36.
+This article was very helpful in getting this app updated from SDK 25 to 36.
+ - https://sijus.medium.com/resurrecting-a-5-year-old-android-app-a-developers-journey-59d8f5689e5b
 
 ## Licenses
 Chime sound byte came free from here:

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.hyperling.apps.infinitetimer"
         minSdkVersion 14
         targetSdkVersion 36
-        versionCode 8
-        versionName "1.1.0"
+        versionCode 9
+        versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/com/hyperling/apps/infinitetimer/MainActivity.java

@@ -4,6 +4,7 @@ import android.app.NotificationManager;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
@@ -14,13 +15,16 @@ import android.os.Message;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.SeekBar;
 import android.widget.TableRow;
 import android.widget.TextView;
 
+import java.net.URI;
 import java.util.Map;
 
 public class MainActivity extends AppCompatActivity {
@@ -50,6 +54,10 @@ public class MainActivity extends AppCompatActivity {
     Uri ringtoneUri;
     MediaPlayer mediaPlayer;
 
+    SeekBar seekBar;
+    AudioManager audioManager;
+    TextView tvSeekBar;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         String tag = "onCreate";
@@ -202,8 +210,32 @@ public class MainActivity extends AppCompatActivity {
         etMillis.setVisibility(View.GONE);
         //(ViewManager) etMillis.getParent().remove
 
-        //sharedPreferences.edit().putBoolean(keyStartStop, false).apply();
-        recoverScreen();
+        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);
+
+        seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @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) {
+                syncVolume();
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+                syncVolume();
+            }
+        });
 
         if (DEBUG) Log.d(tag, "Finished");
     }
@@ -585,7 +617,9 @@ public class MainActivity extends AppCompatActivity {
         if (DEBUG) Log.d(tag, "Starting");
 
         /* Original code, did not work on Nexus 7 with CM 12.1-20151117 (Android 5.1.1) * /
-        Ringtone ringtone = RingtoneManager.getRingtone(getApplicationContext(), ringtoneUri);
+        Uri uri = Uri.parse("android.resource://" + getPackageName() + "/raw/chime_sound_7143");
+        //Ringtone ringtone = RingtoneManager.getRingtone(getApplicationContext(), ringtoneUri);
+        Ringtone ringtone = RingtoneManager.getRingtone(getApplicationContext(), uri);
         ringtone.play();
         /**/
 
@@ -616,6 +650,17 @@ public class MainActivity extends AppCompatActivity {
         if (DEBUG) Log.d(tag, "Finished");
     }
 
+    private void flipInputTexts() {
+        String tag = TAG + "flipInputTexts";
+        if (DEBUG) Log.d(tag, "Starting");
+
+        etHours.setEnabled(!start);
+        etMinutes.setEnabled(!start);
+        etSeconds.setEnabled(!start);
+
+        if (DEBUG) Log.d(tag, "Finished");
+    }
+
     private void resetAll() {
         String tag = TAG + "resetAll";
         if (DEBUG) Log.d(tag, "Starting");
@@ -642,6 +687,21 @@ public class MainActivity extends AppCompatActivity {
         if (DEBUG) Log.d(tag, "Finished");
     }
 
+    public void syncVolume() {
+        String tag = TAG + "syncVolume";
+        if (DEBUG) Log.d(tag, "Starting");
+
+        int currVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+        if (currVolume != seekBar.getProgress()) {
+            seekBar.setProgress(currVolume);
+        }
+
+        String volume = getString(R.string.tvSeekBar) + " " + seekBar.getProgress() + "/" + seekBar.getMax();
+        tvSeekBar.setText(volume);
+
+        if (DEBUG) Log.d(tag, "Finished");
+    }
+
     @Override
     protected void onPause() {
         String tag = TAG + "onPause";
@@ -675,6 +735,7 @@ public class MainActivity extends AppCompatActivity {
         sharedPreferences.edit().putBoolean(keyServiceRunning, false).apply();
 
         recoverScreen();
+        syncVolume();
 
         if (DEBUG) Log.d(tag, "Finished");
     }
@@ -693,15 +754,14 @@ public class MainActivity extends AppCompatActivity {
         if (DEBUG) Log.d(tag, "Finished");
     }
 
-    private void flipInputTexts() {
-        String tag = TAG + "flipInputTexts";
-        if (DEBUG) Log.d(tag, "Starting");
-
-        etHours.setEnabled(!start);
-        etMinutes.setEnabled(!start);
-        etSeconds.setEnabled(!start);
-
-        if (DEBUG) Log.d(tag, "Finished");
+    // TODO: This is somehow always 1 action behind the actual volume when pressing volume buttons.
+    // Like when doing down+up+down, the bar does nothing+down+up.
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+            boolean bool = super.onKeyDown(keyCode, event);
+            syncVolume();
+            return bool;
         }
-
-}
+        return super.onKeyDown(keyCode, event);
+    }}

app/src/main/res/layout/activity_main.xml

@@ -158,4 +158,27 @@
 
     </TableLayout>
 
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tblButtons"
+        android:layout_alignParentBottom="true">
+        <SeekBar
+            android:id="@+id/seekBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/activity_vertical_margin"
+            android:layout_centerInParent="true"
+            android:indeterminate="false"/>
+
+        <TextView
+            android:id="@+id/tvSeekbar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/seekBar"
+            android:layout_centerHorizontal="true"
+            android:text="@string/tvSeekBar"
+            android:textSize="14sp" />
+    </RelativeLayout>
+
 </RelativeLayout>

app/src/main/res/values-es/strings.xml

@@ -0,0 +1,40 @@
+<resources>
+    <!-- App details -->
+    <string name="appName">Infinite Timer</string>
+    <string name="appVersion">v20250711</string>
+    <string name="TAG">com.hyperling.apps.infinitetimer</string>
+
+    <!-- Keys -->
+    <string name="keySharedPreferences">InfiniteTimer</string>
+    <string name="keyDebug">DEBUG</string>
+    <string name="keyChronometerTime">ChronometerTime</string>
+    <string name="keyLoopInterval">LoopInterval</string>
+    <string name="keyStartStop">StartStop</string>
+    <string name="keyAppOpen">AppOpen</string>
+    <string name="keyServiceRunning">ServiceRunning</string>
+
+    <!-- UI Text -->
+    <string name="btnStart">Empezar</string>
+    <string name="btnStop">Terminar</string>
+    <string name="btnChooseTime">Elige un Tiempo</string>
+    <string name="btnReset">Reiniciar</string>
+    <string name="btnPause">Pausa</string>
+    <string name="btnResume">Seguir</string>
+
+    <string name="chronometerDefault">00:00:00</string>
+
+    <string name="tvHoursHint">Horas</string>
+    <string name="tvMinutesHint">Minutos</string>
+    <string name="tvSecondsHint">Segundos</string>
+    <string name="tvMillisHint">Millis</string>
+    <string name="tvDot">.</string>
+
+    <string name="tvUpperLabel"><b>Tiempo entre notificaciones:</b></string>
+    <string name="tvLowerLabel"><b>Cuenta regresiva hasta notificación:</b></string>
+
+    <string name="action_millis">Enable Millisecs</string>
+    <string name="action_enable_ads">Enable Ads</string>
+    <string name="action_exit">Exit</string>
+
+    <string name="tvSeekBar">Volumen: </string>
+</resources>

app/src/main/res/values/strings.xml

@@ -35,4 +35,6 @@
     <string name="action_millis">Enable Millisecs</string>
     <string name="action_enable_ads">Enable Ads</string>
     <string name="action_exit">Exit</string>
+
+    <string name="tvSeekBar">Media Volume:</string>
 </resources>