Skip to content

Commit

Permalink
final cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@programminghoch10
programminghoch10 committed Jul 22, 2019
1 parent 8d93b99 commit 4cfaf05
Show file tree
Hide file tree
Showing 27 changed files with 10 additions and 290 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "com.JJ.hangoverclock"
minSdkVersion 16
targetSdkVersion 28
versionCode 5
versionName "1.5"
versionCode 6
versionName "toxic"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Binary file modified app/release/app-release.apk
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/release/output.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"1.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"v1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
package="com.JJ.hangoverclock">

<application
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/clock_c"
android:label="@string/app_name"
android:roundIcon="@mipmap/clock_c_round"
android:supportsRtl="true"
android:roundIcon="@mipmap/clock_c"
android:supportsRtl="false"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<receiver android:name="ClockWidgetProvider" >
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/JJ/hangoverclock/BootReceiver.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
package com.JJ.hangoverclock;

import android.app.AlarmManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.util.Log;

import static android.content.ContentValues.TAG;

public class BootReceiver extends BroadcastReceiver {

@Override
public void onReceive(Context context, Intent intent) {
Log.i(TAG, "onReceive: BOOT COMPLETE RECEIVED");
ClockWidgetProvider clockWidgetProvider = new ClockWidgetProvider();
clockWidgetProvider.onEnabled(context);
}
Expand Down
62 changes: 3 additions & 59 deletions app/src/main/java/com/jj/hangoverclock/ClockWidgetProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,23 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.annotation.VisibleForTesting;
import android.util.Log;
import android.view.View;
import android.widget.RemoteViews;

import java.util.Calendar;

//import static android.content.ContentValues.TAG;

public class ClockWidgetProvider extends AppWidgetProvider {

static String TAG = "info";

static final int houroverhang = 1;

public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
Log.i("info", "onUpdate: i have been called");
//int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
//int minutes = Calendar.getInstance().get(Calendar.MINUTE);
//int seconds = Calendar.getInstance().get(Calendar.SECOND);
for (int i = 0; i<appWidgetIds.length; i++) {
for (int appWidgetId : appWidgetIds) {
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
//remoteViews.setTextViewText(R.id.clock, hour + ":" + minutes);
//appWidgetManager.updateAppWidget(appWidgetIds[i], remoteViews);
Log.i("info", "onUpdate: updated widget "+i);

int appWidgetId = appWidgetIds[i];
appWidgetManager.updateAppWidget(appWidgetId, remoteViews);
updateAppWidget(context, appWidgetManager, appWidgetId);
}
}

/**
* Custom Intent name that is used by the AlarmManager to tell us to update the clock once per second.
*/
public static int overhang;
public static boolean controlsvisible = false;
public static String CLOCK_WIDGET_UPDATE = "com.JJ.hangoverclock.widgetupdate";
Expand All @@ -60,7 +43,6 @@ public void onReceive(Context context, Intent intent) {
}

if (controlbutton.equals(intent.getAction().split("#")[0])) {
Log.i(TAG, "onReceive: controlbutton pressed on widget " + intent.getAction().split("#")[1]);
ComponentName thisAppWidget = new ComponentName(context.getPackageName(), getClass().getName());
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
int[] ids = appWidgetManager.getAppWidgetIds(thisAppWidget);
Expand All @@ -71,7 +53,6 @@ public void onReceive(Context context, Intent intent) {
String timebefore = sharedPreferences.getString("time" + appWidgetID, "");
updateAppWidget(context, appWidgetManager, appWidgetID);
String timeafter = sharedPreferences.getString("time" + appWidgetID, "");
Log.i(TAG, "onReceive: comparing widget " + appWidgetID + ", before " + timebefore + " with after " + timeafter + ", result: " + !timebefore.equals(timeafter));
if (!timebefore.equals(timeafter)) switchcheck = false;
}
}
Expand All @@ -81,59 +62,46 @@ public void onReceive(Context context, Intent intent) {
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putBoolean("controlsvisible" + intent.getAction().split("#")[1], controlsvisible);
editor.apply();
Log.i(TAG, "onReceive: new controlbutton state: " + controlsvisible);
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
if (controlsvisible) {
remoteViews.setViewVisibility(R.id.plus, View.VISIBLE);
remoteViews.setViewVisibility(R.id.minus, View.VISIBLE);
remoteViews.setTextViewText(R.id.clock, "+" + overhang);
Log.i(TAG, "onReceive: enabled controls");
} else {
remoteViews.setViewVisibility(R.id.plus, View.GONE);
remoteViews.setViewVisibility(R.id.minus, View.GONE);
updateAppWidget(context, appWidgetManager, Integer.valueOf(intent.getAction().split("#")[1]));
Log.i(TAG, "onReceive: disabled controls");
}
appWidgetManager.updateAppWidget(Integer.valueOf(intent.getAction().split("#")[1]), remoteViews);
}
if (plusbutton.equals(intent.getAction().split("#")[0])) {
Log.i(TAG, "onReceive: plusbutton pressed");
if (overhang>=60) overhang += 60;
if (overhang<60) overhang += 10;
//overhang = Math.min(overhang, 60); //Limit of 1 hour
//overhang = Math.min(overhang, 60*24); //Limit of a day
ComponentName thisAppWidget = new ComponentName(context.getPackageName(), getClass().getName());
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
int[] ids = appWidgetManager.getAppWidgetIds(thisAppWidget);
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
remoteViews.setTextViewText(R.id.clock, "+" + overhang);
appWidgetManager.updateAppWidget(Integer.valueOf(intent.getAction().split("#")[1]), remoteViews);
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putInt("overhang" + Integer.valueOf(intent.getAction().split("#")[1]), overhang);
editor.apply();
Log.i(TAG, "onReceive: new overhang " + Integer.valueOf(intent.getAction().split("#")[1]) + " value: " + overhang);
}
if (minusbutton.equals(intent.getAction().split("#")[0])) {
Log.i(TAG, "onReceive: minusbutton pressed");
if (overhang<=60) overhang -= 10;
if (overhang>60) overhang -= 60;
overhang = Math.max(overhang, 0);
ComponentName thisAppWidget = new ComponentName(context.getPackageName(), getClass().getName());
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
int[] ids = appWidgetManager.getAppWidgetIds(thisAppWidget);
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
remoteViews.setTextViewText(R.id.clock, "+" + overhang);
appWidgetManager.updateAppWidget(Integer.valueOf(intent.getAction().split("#")[1]), remoteViews);
SharedPreferences.Editor editor= sharedPreferences.edit();
editor.putInt("overhang" + Integer.valueOf(intent.getAction().split("#")[1]), overhang);
editor.apply();
Log.i(TAG, "onReceive: new overhang " + Integer.valueOf(intent.getAction().split("#")[1]) + " value: " + overhang);
}

if (CLOCK_WIDGET_UPDATE.equals(intent.getAction())) {
Log.i(TAG, "Clock update");
// Get the widget manager and ids for this widget provider, then call the shared
// clock update method.
// Get the widget manager and ids for this widget provider, then call the shared clock update method.
ComponentName thisAppWidget = new ComponentName(context.getPackageName(), getClass().getName());
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
int[] ids = appWidgetManager.getAppWidgetIds(thisAppWidget);
Expand All @@ -156,7 +124,6 @@ protected PendingIntent getPendingSelfIntent(Context context, String action) {
@Override
public void onDisabled(Context context) {
super.onDisabled(context);
Log.i(TAG, "Widget Provider disabled. Turning off timer and deleting all values");
AlarmManager alarmManager = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
alarmManager.cancel(createClockTickIntent(context));
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
Expand All @@ -168,9 +135,6 @@ public void onDisabled(Context context) {
@Override
public void onEnabled(Context context) {
super.onEnabled(context);
//SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
//overhang = sharedPreferences.getInt("overhang", overhang);
Log.i(TAG, "Widget Provider enabled. Starting timer to update widget every minute");
AlarmManager alarmManager = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis());
Expand All @@ -184,53 +148,33 @@ public void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
controlsvisible = sharedPreferences.getBoolean("controlsvisible" + appWidgetId, false);
int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
int minutes = Calendar.getInstance().get(Calendar.MINUTE);
//int seconds = Calendar.getInstance().get(Calendar.SECOND);
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
//remoteViews.setTextViewText(R.id.clock, hour + ":" + minutes);
String time = calculatetime((double)hour*60*60+minutes*60,overhang);
if (controlsvisible) {
remoteViews.setViewVisibility(R.id.plus, View.GONE);
remoteViews.setViewVisibility(R.id.minus, View.GONE);
controlsvisible = false;
Log.i(TAG, "updateAppWidget: disabled controls");
}
remoteViews.setTextViewText(R.id.clock, time);
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString("time" + appWidgetId, time);
editor.apply();
//remoteViews.setTextViewText(R.id.clock, hour + ":" + minutes + ":" + seconds);
remoteViews.setOnClickPendingIntent(R.id.controlbutton, getPendingSelfIntent(context, controlbutton + "#" + appWidgetId));
remoteViews.setOnClickPendingIntent(R.id.plus, getPendingSelfIntent(context, plusbutton + "#" + appWidgetId));
remoteViews.setOnClickPendingIntent(R.id.minus, getPendingSelfIntent(context, minusbutton + "#" + appWidgetId));
appWidgetManager.updateAppWidget(appWidgetId, remoteViews);
Log.i("info", "updateAppWidget: updated widget " + appWidgetId);
}

public static String calculatetime(double time, int overhang) {
//inputs: double time in seconds
// int overhang in seconds
//if (overhang>60) overhang = 60;
int h = (int) Math.floor(time / 60 / 60);
int m = (int) Math.floor(time / 60) - (h*60);
//int s = (int) Math.floor(time) - (m*60) - (h*60*60);
//int ms = (int) ((time - (h*60*60) - (m*60) - s) * 100);
//final String timetext2 = String.format();
//final String timetext2 = String.format("%02d", h)+":"+String.format("%02d", m)+":"+String.format("%02d", s)+"."+String.format("%02d", ms);
/*if (h>0 & m<overhang) {
m = m+60;
if(m>=60) h--;
}/*
/*if (m>0 & s<overhang) {
s = s+60;
if(s>=60) m--;
}*/
while (m<overhang) {
m = m+60;
if(m>=60) h--;
if(h<houroverhang) h+=24;
}
//final String timetext = h+":"+m+":"+s+"."+ms;
//final String timetext = String.format("%02d", h)+":"+String.format("%02d", m)+":"+String.format("%02d", s)+"."+String.format("%02d", ms);
return String.format("%02d", h)+":"+String.format("%02d", m);
}

Expand Down
34 changes: 0 additions & 34 deletions app/src/main/res/drawable-v24/ic_launcher_foreground.xml
View file

This file was deleted.

Loading

0 comments on commit 4cfaf05

Please sign in to comment.