senaduka/old-tfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Farm alarm #34

Merged
senaduka merged 2 commits from farm_alarm into master 2016-12-30 16:31:41 +01:00
Conversation 0 Commits 2 Files Changed 22 +38 -63
22 changed files with 38 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/FarmAlarm/app/app-release.apk
View File

Binary file not shown.

6
android/FarmAlarm/app/build.gradle
View File

@@ -4,11 +4,11 @@ android {
compileSdkVersion 24
buildToolsVersion "24.0.1"
defaultConfig {
applicationId "com.zoblak.farmalarm"
applicationId "com.zoblak.farm"
minSdkVersion 15
targetSdkVersion 24
versionCode 1
versionName "1.0"
versionCode 101
versionName "1.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}

4
android/FarmAlarm/app/src/androidTest/java/com/zoblak/farmalarm/ExampleInstrumentedTest.java → android/FarmAlarm/app/src/androidTest/java/com/zoblak/farm/ExampleInstrumentedTest.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("com.zoblak.farmalarm", appContext.getPackageName());
assertEquals("com.zoblak.apps.farmalarm", appContext.getPackageName());
}
}

18
android/FarmAlarm/app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zoblak.farmalarm">
package="com.zoblak.farm">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" />
@@ -14,7 +14,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainScreen"
android:name="com.zoblak.farm.MainScreen"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
@@ -36,29 +36,29 @@
</activity>
<service
android:name=".AlarmPollingService"
android:name="com.zoblak.farm.AlarmPollingService"
android:exported="false" />
<service
android:name=".SoundPlayingService"
android:name="com.zoblak.farm.SoundPlayingService"
android:exported="false" />
<receiver
android:name=".PeriodicalPingReceiver"
android:name="com.zoblak.farm.PeriodicalPingReceiver"
android:enabled="true"
android:exported="true" />
<activity
android:name=".SettingsActivity"
android:name="com.zoblak.farm.SettingsActivity"
android:label="@string/title_activity_settings"
android:parentActivityName=".MainScreen"
android:parentActivityName="com.zoblak.farm.MainScreen"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.zoblak.farmalarm.MainScreen" />
android:value="com.zoblak.farm.MainScreen" />
</activity>
<receiver
android:name=".BootBroadcastReceiver"
android:name="com.zoblak.farm.BootBroadcastReceiver"
android:enabled="true"
android:exported="true">
<intent-filter>

3
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmNotification.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmNotification.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.annotation.TargetApi;
import android.app.Notification;
@@ -9,7 +9,6 @@ import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Build;
import android.support.v4.app.NotificationCompat;

2
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPingResponse.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmPingResponse.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
/**
* Created by senadu on 11/15/16.

13
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPollingService.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmPollingService.java
View File

@@ -1,14 +1,9 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.app.IntentService;
import android.content.Intent;
import android.content.Context;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.PowerManager;
import android.util.Log;
import android.widget.Toast;
/**
* An {@link IntentService} subclass for handling asynchronous task requests in
@@ -20,11 +15,11 @@ import android.widget.Toast;
public class AlarmPollingService extends IntentService {
// TODO: Rename actions, choose action names that describe tasks that this
// IntentService can perform, e.g. ACTION_FETCH_NEW_ITEMS
private static final String ACTION_PING = "com.zoblak.farmalarm.action.PING";
private static final String ACTION_STOP_ALARM = "com.zoblak.farmalarm.action.STOP_ALARM";
private static final String ACTION_PING = "com.zoblak.apps.farmalarm.action.PING";
private static final String ACTION_STOP_ALARM = "com.zoblak.apps.farmalarm.action.STOP_ALARM";
// TODO: Rename parameters
private static final String CONTROLLERS = "com.zoblak.farmalarm.extra.CONTROLLLERS";
private static final String CONTROLLERS = "com.zoblak.apps.farmalarm.extra.CONTROLLLERS";
private AlarmResponseHandler handler;

10
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmResponseHandler.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmResponseHandler.java
View File

@@ -1,14 +1,6 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.annotation.TargetApi;
import android.content.Context;
import android.media.AudioAttributes;
import android.media.AudioManager;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Build;
import android.util.Log;
/**
* Created by senadu on 11/15/16.

2
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AppCompatPreferenceActivity.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/AppCompatPreferenceActivity.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.content.res.Configuration;
import android.os.Bundle;

2
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/BootBroadcastReceiver.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/BootBroadcastReceiver.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.content.BroadcastReceiver;
import android.content.Context;

8
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreen.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/MainScreen.java
View File

@@ -1,18 +1,12 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.view.Menu;
import android.view.MenuItem;

2
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreenFragment.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/MainScreenFragment.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;

7
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/PeriodicalPingReceiver.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/PeriodicalPingReceiver.java
View File

@@ -1,15 +1,10 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.PowerManager;
import android.preference.PreferenceManager;
import android.util.Log;
import android.widget.Toast;
import static android.content.Context.POWER_SERVICE;
public class PeriodicalPingReceiver extends BroadcastReceiver {
public PeriodicalPingReceiver() {

2
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/SettingsActivity.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/SettingsActivity.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.annotation.TargetApi;

2
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/SoundPlayingService.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/SoundPlayingService.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.app.Service;
import android.content.Context;

8
android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/ZoblakClient.java → android/FarmAlarm/app/src/main/java/com/zoblak/farm/ZoblakClient.java
View File

@@ -1,10 +1,10 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import android.util.JsonReader;
import android.util.JsonToken;
import android.util.Log;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -67,8 +67,8 @@ public class ZoblakClient {
Log.e("zoblakClient", "malformed: " + e.getLocalizedMessage());
} catch (IOException e) {
Log.e("zoblakClient", "ioexception: " + e.getLocalizedMessage());
result.setAlarmTriggered(true);
result.setServerError(true);
result.setAlarmTriggered(false);
result.setServerError(false);
}
if (urlConnection != null) urlConnection.disconnect();

2
android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="com.zoblak.farmalarm.MainScreen">
tools:context="com.zoblak.farm.MainScreen">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"

2
android/FarmAlarm/app/src/main/res/layout/content_main_screen.xml
View File

@@ -2,7 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragment"
android:name="com.zoblak.farmalarm.MainScreenFragment"
android:name="com.zoblak.farm.MainScreenFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"

2
android/FarmAlarm/app/src/main/res/layout/fragment_main_screen.xml
View File

@@ -8,7 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.zoblak.farmalarm.MainScreenFragment"
tools:context="com.zoblak.farm.MainScreenFragment"
tools:showIn="@layout/activity_main_screen">
<WebView

2
android/FarmAlarm/app/src/main/res/menu/menu_main_screen.xml
View File

@@ -1,7 +1,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.zoblak.farmalarm.MainScreen">
tools:context="com.zoblak.farm.MainScreen">
<item
android:id="@+id/action_settings"
android:orderInCategory="100"

2
android/FarmAlarm/app/src/main/res/xml/pref_headers.xml
View File

@@ -3,7 +3,7 @@
<!-- These settings headers are only used on tablets. -->
<header
android:fragment="com.zoblak.farmalarm.SettingsActivity$GeneralPreferenceFragment"
android:fragment="com.zoblak.farm.SettingsActivity$GeneralPreferenceFragment"
android:icon="@drawable/ic_info_black_24dp"
android:title="@string/pref_header_general" />

2
android/FarmAlarm/app/src/test/java/com/zoblak/farmalarm/ExampleUnitTest.java → android/FarmAlarm/app/src/test/java/com/zoblak/farm/ExampleUnitTest.java
View File

@@ -1,4 +1,4 @@
package com.zoblak.farmalarm;
package com.zoblak.farm;
import org.junit.Test;