me/android-infinite-timer
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Compare commits

base: me:03380cf02352533de713c626c889f40e445d93bb
Branches Tags
me:main me:dev
me:1.1.1 me:1.1.0 me:Final
...
compare: me:37e7df98af7f1fee503db49fda4ada45db69d085
Branches Tags
me:dev me:main
me:1.1.1 me:1.1.0 me:Final

2 Commits
03380cf023 ... 37e7df98af

Author SHA1 Message Date
Hyperling
37e7df98af Update all debug log text. Fix bugs related to Start/Stop button. Start working on TODO for large value bug. 2025-07-12 15:43:47 -07:00
Hyperling
9bb729d5c2 Remove test from version name. 2025-07-12 15:31:07 -07:00
2 changed files with 172 additions and 66 deletions
Expand all files Collapse all files

236
app/src/main/java/com/hyperling/apps/infinitetimer/MainActivity.java
View File

@@ -21,7 +21,7 @@ import java.util.Map;
public class MainActivity extends AppCompatActivity {
String TAG,
String TAG = "MainActivity.",
keySharedPreferences, keyDebug, keyChronometerTime, keyLoopInterval,
keyStartStop, keyAppOpen, keyServiceRunning,
stringChronometerDefault, stringChronometerTime, stringLoopInterval;
@@ -48,6 +48,9 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
String tag = "onCreate";
if (DEBUG) Log.d(tag, "Starting");
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
@@ -55,7 +58,6 @@ public class MainActivity extends AppCompatActivity {
this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
/***** Get Strings *****/
TAG = getString(R.string.TAG);
keySharedPreferences = getString(R.string.keySharedPreferences);
keyDebug = getString(R.string.keyDebug);
keyChronometerTime = getString(R.string.keyChronometerTime);
@@ -68,34 +70,33 @@ public class MainActivity extends AppCompatActivity {
/***** Shared Preferences *****/
sharedPreferences = getSharedPreferences(keySharedPreferences, MODE_PRIVATE);
// TODO: Comment these lines!
//sharedPreferences.edit().putBoolean(keyDebug, true).apply();
//sharedPreferences.edit().putBoolean(keyStartStop, false).apply();
//sharedPreferences.edit().putString(keyLoopInterval, stringChronometerDefault).apply();
//sharedPreferences.edit().putString(keyChronometerTime, stringChronometerDefault).apply();
// TODO: Keep these!
DEBUG = sharedPreferences.getBoolean(keyDebug, false);
DEBUG = sharedPreferences.getBoolean(keyDebug, true);
appOpen = sharedPreferences.getBoolean(keyAppOpen, false);
serviceRunning = sharedPreferences.getBoolean(keyServiceRunning, false);
/*
if (!appOpen && !serviceRunning) {
sharedPreferences.edit().putBoolean(keyStartStop, false).apply();
}
*/
// Sound
ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
mediaPlayer = MediaPlayer.create(this, ringtoneUri);
if (DEBUG) Log.d(TAG, "MainActivity.onCreate! Got strings.");
if (DEBUG) Log.d(tag, "Got strings.");
if (DEBUG){
// Print all preferences
Map<String, ?> sharedPreferencesAll = sharedPreferences.getAll();
for (String key : sharedPreferencesAll.keySet()){
Log.d(TAG, "MainActivity.onCreate! key=" + key + " value=" + sharedPreferencesAll.get(key));
String value = sharedPreferencesAll.get(key).toString();
Log.d(tag, "key=" + key + " value=" + value);
// If app crashed, ensure buttons are correct.
if (key.equals(keyStartStop) && value.equals("true")) {
if (DEBUG) Log.d(tag, "Shutting off improper START value");
// Ensure START is always off if we are creating (not resuming).
sharedPreferences.edit().putBoolean(keyStartStop, false).apply();
Log.d(tag, "key=" + key + " value=" + sharedPreferencesAll.get(key));
}
}
}
@@ -152,18 +153,22 @@ public class MainActivity extends AppCompatActivity {
//sharedPreferences.edit().putBoolean(keyStartStop, false).apply();
recoverScreen();
if (DEBUG) Log.d(TAG, "MainActivity.onCreate! Finished.");
if (DEBUG) Log.d(tag, "Finished");
}
private void doTimeChooser(){
if (DEBUG) Log.d(TAG, "MainActivity.openTimeChooser!");
String tag = TAG + "doTimeChooser";
if (DEBUG) Log.d(tag, "Starting");
//stringLoopInterval = "00:00:07";
//setEditTexts(stringLoopInterval);
if (DEBUG) Log.d(tag, "Finished");
}
private void setEditTexts(String interval){
if (DEBUG) Log.d(TAG, "MainActivity.setEditTexts! interval=" + interval);
String tag = TAG + "setEditTexts";
if (DEBUG) Log.d(tag, "Starting, interval=" + interval);
if (!interval.equals(stringChronometerDefault)) {
String[] time = interval.split(":");
@@ -187,23 +192,59 @@ public class MainActivity extends AppCompatActivity {
}
setLoopInterval();
if (DEBUG) Log.d(tag, "Finished");
}
private void setLoopInterval(){
if (DEBUG) Log.d(TAG, "MainActivity.setLoopInterval!");
String tag = TAG + "setLoopInterval";
if (DEBUG) Log.d(tag, "Starting");
int hours = Integer.parseInt("0"+etHours.getText().toString());
int minutes = Integer.parseInt("0"+etMinutes.getText().toString());
int seconds = Integer.parseInt("0"+etSeconds.getText().toString());
int hours = 0, minutes = 0, seconds = 0;
try {
hours = Integer.parseInt("0" + etHours.getText().toString());
} catch (NumberFormatException e) {
etHours.setText("");
longLoopInterval = (((hours*60*60) + (minutes*60) + seconds) * 1000);
if (DEBUG) Log.d(TAG, "MainActivity.setLoopInterval! longLoopInterval=" + longLoopInterval);
}
try {
minutes = Integer.parseInt("0" + etMinutes.getText().toString());
} catch (NumberFormatException e) {
etMinutes.setText("");
}
try {
seconds = Integer.parseInt("0" + etSeconds.getText().toString());
} catch (NumberFormatException e) {
etSeconds.setText("");
}
// TODO: Properly handle hours being set to 999, which casues a negative.
// TODO: Properly handle time being greater than current time, such as
longLoopInterval = (long) (((hours*60*60) + (minutes*60) + seconds) * 1000);
if (longLoopInterval > System.currentTimeMillis() || longLoopInterval < 0) {
if (DEBUG) Log.d(tag, "Got a number larger than current time");
if (DEBUG) Log.d(tag, "Setting to current time value");
longLoopInterval = System.currentTimeMillis();
/* Not quite doing what we want yet.
String sHours = "" + longLoopInterval/1000;
String sMinutes = "" + longLoopInterval/1000/60 % 60;
String sSeconds = "" + longLoopInterval/1000/60/60 % 60;
etHours.setText(sHours);
etMinutes.setText(sMinutes);
etSeconds.setText(sSeconds);
*/
}
if (DEBUG) Log.d(tag, "longLoopInterval=" + longLoopInterval);
setChronometer(longLoopInterval);
if (DEBUG) Log.d(tag, "Finished");
}
private void setChronometer(long milliseconds){
if (DEBUG) Log.d(TAG, "MainActivity.setChronometer! milliseconds=" + milliseconds);
String tag = TAG + "setChronometer";
if (DEBUG) Log.d(tag, "Starting, milliseconds=" + milliseconds);
//chronometer = (TextView) findViewById(R.id.chronometer);
@@ -230,16 +271,18 @@ public class MainActivity extends AppCompatActivity {
doTimeChooser();
}
});*/
if (DEBUG) Log.d(TAG, "MainActivity.setChronometer! display=" + display);
if (DEBUG) Log.d(tag, "display=" + display);
sharedPreferences.edit().putString(keyChronometerTime, display).apply();
if (DEBUG) Log.d(TAG, "MainActivity.setChronometer! Before=" + chronometer.getText());
if (DEBUG) Log.d(tag, "Before=" + chronometer.getText());
chronometer.setText(display);
if (DEBUG) Log.d(TAG, "MainActivity.setChronometer! After=" + chronometer.getText());
if (DEBUG) Log.d(tag, "After=" + chronometer.getText());
if (DEBUG) Log.d(tag, "Finished");
}
private void startStopChronometer(String buttonText){
if (DEBUG) Log.d(TAG, "MainActivity.startStopChronometer!");
String tag = TAG + "startStopChronometer";
if (DEBUG) Log.d(tag, "Starting");
start = !start;
SharedPreferences.Editor editor = sharedPreferences.edit();
@@ -275,10 +318,13 @@ public class MainActivity extends AppCompatActivity {
flipStartStopButton();
flipResetPauseButton();
if (DEBUG) Log.d(tag, "Finished");
}
private void recoverScreen(){
if (DEBUG) Log.d(TAG, "MainActivity.recoverScreen!");
String tag = TAG + "recoverScreen";
if (DEBUG) Log.d(tag, "Starting");
/***** Retrieve the last settings *****/
// Chronometer
@@ -291,6 +337,7 @@ public class MainActivity extends AppCompatActivity {
// Start/Stop Button
start = sharedPreferences.getBoolean(keyStartStop, false);
if (DEBUG) Log.d(tag, "start=" + start);
flipStartStopButton();
flipResetPauseButton();
@@ -302,10 +349,13 @@ public class MainActivity extends AppCompatActivity {
//startStopChronometer(stringChronometerTime);
//incrementTime.sendEmptyMessage(0);
if (DEBUG) Log.d(tag, "Finished");
}
private void flipStartStopButton(){
if (DEBUG) Log.d(TAG, "MainActivity.flipStartStopButton!");
String tag = TAG + "flipStartStopButton";
if (DEBUG) Log.d(tag, "Starting");
start = sharedPreferences.getBoolean(keyStartStop, false);
serviceRunning = sharedPreferences.getBoolean(keyServiceRunning, false);
@@ -320,10 +370,13 @@ public class MainActivity extends AppCompatActivity {
}
btnStartStop.setBackgroundColor(Color.GREEN);
}
if (DEBUG) Log.d(tag, "Finished");
}
private void resetPauseChronometer(){
if (DEBUG) Log.d(TAG, "MainActivity.resetPauseChronometer!");
String tag = TAG + "resetPauseChronometer";
if (DEBUG) Log.d(tag, "Starting");
start = sharedPreferences.getBoolean(keyStartStop, false);
serviceRunning = sharedPreferences.getBoolean(keyServiceRunning, false);
@@ -334,10 +387,13 @@ public class MainActivity extends AppCompatActivity {
else{
setEditTexts(stringChronometerDefault);
}
if (DEBUG) Log.d(tag, "Finished");
}
private void flipResetPauseButton(){
if (DEBUG) Log.d(TAG, "MainActivity.flipResetPauseButton!");
String tag = TAG + "flipResetPauseButton";
if (DEBUG) Log.d(tag, "Starting");
start = sharedPreferences.getBoolean(keyStartStop, false);
serviceRunning = sharedPreferences.getBoolean(keyServiceRunning, false);
@@ -350,13 +406,17 @@ public class MainActivity extends AppCompatActivity {
btnResetPause.setText(getString(R.string.btnReset));
btnResetPause.setBackgroundColor(Color.RED);
}
if (DEBUG) Log.d(tag, "Finished");
}
private final Handler incrementTime = new Handler(){
@Override
public void handleMessage(Message msg) {
String tag = TAG + "handleMessage";
if (DEBUG) Log.d(tag, "Starting");
super.handleMessage(msg);
if (DEBUG) Log.d(TAG, "MainActivity.incrementTime.handleMessage!");
appOpen = sharedPreferences.getBoolean(keyAppOpen, true);
if (appOpen) {
@@ -373,7 +433,7 @@ public class MainActivity extends AppCompatActivity {
// Calculate new time and text
setTimeLeft();
if (DEBUG) Log.d(TAG, "MainActivity.incrementTime.handleMessage! longTimeLeft=" + longTimeLeft);
if (DEBUG) Log.d(tag, "longTimeLeft=" + longTimeLeft);
// Check if we need to beep
if (longTimeLeft < 1000){
@@ -382,12 +442,12 @@ public class MainActivity extends AppCompatActivity {
setStartTime();
if (DEBUG) {
Log.d(TAG, "MainActivity.incrementTime.handleMessage!C longLoopInterval=" + longLoopInterval);
Log.d(TAG, "MainActivity.incrementTime.handleMessage!C longStartTime=" + longStartTime);
Log.d(TAG, "MainActivity.incrementTime.handleMessage!C longEndTime=" + longEndTime);
Log.d(TAG, "MainActivity.incrementTime.handleMessage!C longTimeLeft=" + longTimeLeft);
Log.d(TAG, "MainActivity.incrementTime.handleMessage!C waitInterval=" + waitInterval);
Log.d(TAG, "MainActivity.incrementTime.handleMessage!C start=" + start);
Log.d(tag, "longLoopInterval=" + longLoopInterval);
Log.d(tag, "longStartTime=" + longStartTime);
Log.d(tag, "longEndTime=" + longEndTime);
Log.d(tag, "longTimeLeft=" + longTimeLeft);
Log.d(tag, "waitInterval=" + waitInterval);
Log.d(tag, "start=" + start);
//chronometer.setText("Test");
//setChronometer(200);
/*
@@ -405,11 +465,11 @@ public class MainActivity extends AppCompatActivity {
synchronized (this){
try{
wait(waitInterval);
if (DEBUG) Log.d(TAG, "MainActivity.incrementTime.handleMessage! Done waiting.");
if (DEBUG) Log.d(tag, "Done waiting.");
}
catch (Exception e){
e.printStackTrace();
if (DEBUG) Log.d(TAG, "MainActivity.incrementTime.handleMessage! Failed to wait.");
if (DEBUG) Log.d(tag, "Failed to wait.");
}
}
//sharedPreferences.edit().putBoolean(keyStartStop, true).apply();
@@ -420,45 +480,57 @@ public class MainActivity extends AppCompatActivity {
Thread t = new Thread(task);
t.start();
}
if (DEBUG) Log.d(tag, "Finished");
}
};
private void setStartTime(){
if (DEBUG) Log.d(TAG, "MainActivity.setStartTime!");
String tag = TAG + "setStartTime";
if (DEBUG) Log.d(tag, "Starting");
if (DEBUG) Log.d(tag, "System.currentTimeMillis()=" + System.currentTimeMillis());
if (longTimeLeft == 0) {
if (DEBUG) Log.d(TAG, "MainActivity.setStartTime! longTimeLeft==" + longTimeLeft);
if (DEBUG) Log.d(tag, "longTimeLeft=" + longTimeLeft);
// Add extra 1000 so timer starts on interval and beeps after 1
longStartTime = System.currentTimeMillis() + 1000 - waitInterval;
if (DEBUG) Log.d(TAG, "MainActivity.setStartTime! longStartTime=" + longStartTime);
if (DEBUG) Log.d(tag, "longStartTime=" + longStartTime);
longEndTime = longStartTime + longLoopInterval;
if (DEBUG) Log.d(TAG, "MainActivity.setStartTime! longEndTime=" + longEndTime);
}
else{
if (DEBUG) Log.d(TAG, "MainActivity.setStartTime! longTimeLeft==" + longTimeLeft);
if (DEBUG) Log.d(tag, "longEndTime=" + longEndTime);
} else {
if (DEBUG) Log.d(tag, "longTimeLeft=" + longTimeLeft);
longStartTime = System.currentTimeMillis() - waitInterval;
if (DEBUG) Log.d(TAG, "MainActivity.setStartTime! longStartTime=" + longStartTime);
if (DEBUG) Log.d(tag, "longStartTime=" + longStartTime);
longEndTime = longStartTime + longTimeLeft;
if (DEBUG) Log.d(TAG, "MainActivity.setStartTime! longEndTime=" + longEndTime);
if (DEBUG) Log.d(tag, "longEndTime=" + longEndTime);
}
if (DEBUG) Log.d(tag, "Finished");
}
private void setTimeLeft(){
if (DEBUG) Log.d(TAG, "MainActivity.setTimeLeft!");
String tag = TAG + "setTimeLeft";
if (DEBUG) Log.d(tag, "Starting");
longTimeLeft = longEndTime - System.currentTimeMillis() + waitInterval;
if (DEBUG) Log.d(TAG, "MainActivity.setTimeLeft! longTimeLeft=" + longTimeLeft);
if (DEBUG) Log.d(tag, "longTimeLeft=" + longTimeLeft);
setChronometer(longTimeLeft);
if (DEBUG) Log.d(tag, "Finished");
}
private void resetTimeLeft(){
if (DEBUG) Log.d(TAG, "MainActivity.resetTimeLeft!");
String tag = TAG + "resetTimeLeft";
if (DEBUG) Log.d(tag, "Starting");
longTimeLeft = 0;
setChronometer(longLoopInterval);
if (DEBUG) Log.d(tag, "Finished");
}
private void playSound(){
if (DEBUG) Log.d(TAG, "MainActivity.playSound!");
String tag = TAG + "playSound";
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);
@@ -467,28 +539,40 @@ public class MainActivity extends AppCompatActivity {
//mediaPlayer.reset();
mediaPlayer.start();
if (DEBUG) Log.d(tag, "Finished");
}
// TODO: use this to fix bug when app is closed during a countdown, it opens
// back up with a 0 count but timer is enabled and needs Stopped before the
// edit texts can be used.
private void resetAll() {
String tag = TAG + "resetAll";
if (DEBUG) Log.d(tag, "Starting");
if (DEBUG) Log.d(tag, "Resetting screen values...");
setChronometer(0);
setEditTexts("");
setLoopInterval();
if (DEBUG) Log.d(tag, "Values reset");
if (DEBUG) Log.d(tag, "Resetting SharedPreferences...");
start = false;
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putBoolean(keyStartStop, start);
editor.putBoolean(keyAppOpen, start);
editor.putBoolean(keyServiceRunning, start);
editor.apply();
int count = 0;
while (!editor.commit() && count < 50) {
Log.i(tag, "Failed! Reattempting commit... count=" + count);
count++;
};
if (DEBUG) Log.d(tag, "SharedPreferences reset");
if (DEBUG) Log.d(tag, "Finished");
}
@Override
protected void onPause() {
super.onPause();
if (DEBUG) Log.d(TAG, "MainActivity.onPause!");
String tag = TAG + "onPause";
if (DEBUG) Log.d(tag, "Starting");
stringLoopInterval =
etHours.getText().toString() + ":" +
@@ -500,29 +584,51 @@ public class MainActivity extends AppCompatActivity {
editor.putString(keyLoopInterval, stringLoopInterval);
editor.putBoolean(keyAppOpen, false);
editor.apply();
if (DEBUG) Log.d(tag, "Done with local code, calling super.");
super.onPause();
if (DEBUG) Log.d(tag, "Finished");
}
@Override
protected void onResume() {
super.onResume();
if (DEBUG) Log.d(TAG, "MainActivity.onResume!");
String tag = TAG + "onResume";
if (DEBUG) Log.d(tag, "Starting");
sharedPreferences.edit().putBoolean(keyServiceRunning, false).apply();
recoverScreen();
if (DEBUG) Log.d(tag, "Finished");
}
@Override
protected void onDestroy() {
String tag = TAG + "onDestroy";
if (DEBUG) Log.d(tag, "Starting");
resetAll();
if (DEBUG) Log.d(tag, "Done with local code, calling super..");
super.onDestroy();
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");
}
}

2
app/src/main/res/values/strings.xml
View File

@@ -1,7 +1,7 @@
<resources>
<!-- App details -->
<string name="appName">Infinite Timer</string>
<string name="appVersion">Test v20250711</string>
<string name="appVersion">v20250711</string>
<string name="TAG">com.hyperling.apps.infinitetimer</string>
<!-- Keys -->