Initial commit

This commit is contained in:
Tom Willemsen 2013-01-27 15:55:33 +01:00
commit 0be3e83d3b
24 changed files with 733 additions and 0 deletions

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
bin/
gen/

17
AndroidManifest.xml Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.ryuslash.Dailies"
android:versionCode="1"
android:versionName="1.0">
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
<activity android:name="DailiesActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="AddActivity" />
</application>
<uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
</manifest>

17
ant.properties Normal file
View file

@ -0,0 +1,17 @@
# This file is used to override default values used by the Ant build system.
#
# This file must be checked into Version Control Systems, as it is
# integral to the build system of your project.
# This file is only used by the Ant script.
# You can use this to override default values such as
# 'source.dir' for the location of your java source folder and
# 'out.dir' for the location of your output folder.
# You can also use it define how the release builds are signed by declaring
# the following properties:
# 'key.store' for the location of your keystore and
# 'key.alias' for the name of the key to use.
# The password will be asked during the build when you use the 'release' target.

92
build.xml Normal file
View file

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Dailies" default="help">
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<property file="local.properties" />
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:
source.dir
The name of the source directory. Default is 'src'.
out.dir
The name of the output directory. Default is 'bin'.
For other overridable properties, look at the beginning of the rules
files in the SDK, at tools/ant/build.xml
Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.
This file is an integral part of the build system for your
application and should be checked into Version Control Systems.
-->
<property file="ant.properties" />
<!-- if sdk.dir was not set from one of the property file, then
get it from the ANDROID_HOME env var.
This must be done before we load project.properties since
the proguard config can use sdk.dir -->
<property environment="env" />
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
<isset property="env.ANDROID_HOME" />
</condition>
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
This contains project specific properties such as project target, and library
dependencies. Lower level build properties are stored in ant.properties
(or in .classpath for Eclipse projects).
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
<loadproperties srcFile="project.properties" />
<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
unless="sdk.dir"
/>
<!--
Import per project custom build rules if present at the root of the project.
This is the place to put custom intermediary targets such as:
-pre-build
-pre-compile
-post-compile (This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir})
-post-package
-post-build
-pre-clean
-->
<import file="custom_rules.xml" optional="true" />
<!-- Import the actual build file.
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<import> task.
- customize it to your needs.
- Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node)
into this file, replacing the <import> task.
- customize to your needs.
***********************
****** IMPORTANT ******
***********************
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
<!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>

10
local.properties Normal file
View file

@ -0,0 +1,10 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
# location of the SDK. This is only used by Ant
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=/opt/android-sdk

20
proguard-project.txt Normal file
View file

@ -0,0 +1,20 @@
# To enable ProGuard in your project, edit project.properties
# to define the proguard.config property as described in that file.
#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in ${sdk.dir}/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the ProGuard
# include property in project.properties.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

14
project.properties Normal file
View file

@ -0,0 +1,14 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15

BIN
res/drawable-hdpi/add.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB

BIN
res/drawable-hdpi/save.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
res/drawable-mdpi/add.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
res/drawable-mdpi/save.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

21
res/layout/add.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<EditText
android:id="@+id/name_entry"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/add_name_entry" />
<CheckBox
android:id="@+id/alarm_entry"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/add_alarm_entry" />
<TimePicker
android:id="@+id/time_entry"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/add_time_entry" />
</LinearLayout>

10
res/layout/main.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/add_menu_save"
android:title="@string/add_menu_save"
android:showAsAction="ifRoom|withText"
android:icon="@drawable/save" />
</menu>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/main_menu_add"
android:title="@string/main_menu_add"
android:showAsAction="ifRoom|withText"
android:icon="@drawable/add" />
</menu>

9
res/values/strings.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Dailies</string>
<string name="main_menu_add">Add</string>
<string name="add_name_entry">Name</string>
<string name="add_alarm_entry">Set alarm?</string>
<string name="add_time_entry">At:</string>
<string name="add_menu_save">Save</string>
</resources>

View file

@ -0,0 +1,106 @@
package org.ryuslash.Dailies;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.TimePicker;
public class AddActivity extends Activity
{
private DailiesDataSource datasource;
private long id;
public void saveDaily()
{
EditText name_entry = (EditText) findViewById(R.id.name_entry);
CheckBox alarm_entry =
(CheckBox) findViewById(R.id.alarm_entry);
TimePicker time_entry =
(TimePicker) findViewById(R.id.time_entry);
String name = name_entry.getText().toString();
boolean alarm = alarm_entry.isChecked();
int hour = alarm ? time_entry.getCurrentHour() : 0;
int minute = alarm ? time_entry.getCurrentMinute() : 0;
if (id > 0)
datasource.updateDaily(id, name, alarm, hour, minute, null);
else
datasource.createDaily(name, alarm, hour, minute);
}
@Override
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.add);
datasource = new DailiesDataSource(this);
datasource.open();
Intent intent = getIntent();
id = intent.getLongExtra(SQLiteHelper.COLUMN_ID, 0l);
if (id > 0) {
Daily daily = datasource.getById(id);
EditText name_entry =
(EditText) findViewById(R.id.name_entry);
CheckBox alarm_entry =
(CheckBox) findViewById(R.id.alarm_entry);
TimePicker time_entry =
(TimePicker) findViewById(R.id.alarm_entry);
name_entry.setText(daily.getTitle());
alarm_entry.setChecked(daily.getAlarm());
time_entry.setCurrentHour(daily.getHour());
time_entry.setCurrentMinute(daily.getMinute());
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu)
{
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.add_activity, menu);
return true;
}
@Override
protected void onDestroy()
{
datasource.close();
super.onDestroy();
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
switch (item.getItemId()) {
case R.id.add_menu_save:
saveDaily();
finish();
return true;
}
return false;
}
@Override
protected void onPause()
{
datasource.close();
super.onPause();
}
@Override
protected void onResume()
{
datasource.open();
super.onResume();
}
}

View file

@ -0,0 +1,91 @@
package org.ryuslash.Dailies;
import java.util.List;
import android.app.ListActivity;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.ArrayAdapter;
public class DailiesActivity extends ListActivity
{
private DailiesDataSource datasource;
private List<Daily> getData()
{
return datasource.getDailiesList();
}
@Override
protected void onActivityResult(int requestCode,
int resultCode,
Intent data)
{
super.onActivityResult(requestCode, resultCode, data);
datasource.open();
}
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
datasource = new DailiesDataSource(this);
datasource.open();
List<Daily> dailies = getData();
ArrayAdapter<Daily> adapter = new ArrayAdapter<Daily>(
this, android.R.layout.simple_list_item_1, dailies
);
setListAdapter(adapter);
}
@Override
public boolean onCreateOptionsMenu(Menu menu)
{
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.main_activity, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
switch (item.getItemId()) {
case R.id.main_menu_add:
showAdd();
return true;
}
return false;
}
@Override
public void onPause()
{
datasource.close();
super.onPause();
}
@Override
protected void onResume()
{
datasource.open();
super.onResume();
}
public void showAdd()
{
Intent intent = new Intent(this, AddActivity.class);
datasource.close();
startActivityForResult(intent, 0);
}
}

View file

@ -0,0 +1,152 @@
package org.ryuslash.Dailies;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
public class DailiesDataSource
{
private SQLiteDatabase database;
private SQLiteHelper dbHelper;
private String[] allColumns = { SQLiteHelper.COLUMN_ID,
SQLiteHelper.COLUMN_TITLE,
SQLiteHelper.COLUMN_ALARM,
SQLiteHelper.COLUMN_HOUR,
SQLiteHelper.COLUMN_MINUTE,
SQLiteHelper.COLUMN_LAST_COMPLETED };
public DailiesDataSource(Context context)
{
dbHelper = new SQLiteHelper(context);
}
public void open() throws SQLException
{
database = dbHelper.getWritableDatabase();
}
public void close()
{
dbHelper.close();
}
private String dateToString(Date date)
{
DateFormat df = DateFormat.getDateInstance();
return df.format(date);
}
private ContentValues createValues(String title, boolean alarm,
int hour, int minute, Date date)
{
ContentValues values = new ContentValues();
values.put(SQLiteHelper.COLUMN_TITLE, title);
values.put(SQLiteHelper.COLUMN_ALARM, alarm ? 1 : 0);
values.put(SQLiteHelper.COLUMN_HOUR, hour);
values.put(SQLiteHelper.COLUMN_MINUTE, minute);
if (date != null)
values.put(SQLiteHelper.COLUMN_LAST_COMPLETED,
dateToString(date));
return values;
}
private ContentValues createValues(String title, boolean alarm,
int hour, int minute)
{
return createValues(title, alarm, hour, minute, null);
}
public Daily createDaily(String title, boolean alarm, int hour,
int minute)
{
ContentValues values = createValues(title, alarm, hour, minute);
long insertId = database.insert(SQLiteHelper.TABLE_DAILY, null,
values);
Daily daily = new Daily(insertId, title, alarm, hour, minute);
return daily;
}
public void updateDaily(long id, String title, boolean alarm,
int hour, int minute, Date last_completed)
{
ContentValues values = createValues(title, alarm, hour, minute,
last_completed);
String whereArgs[] = { "" + id };
database.update(SQLiteHelper.TABLE_DAILY, values, "id = ?",
whereArgs);
}
public void deleteDaily(Daily daily)
{
deleteDaily(daily.getId());
}
public void deleteDaily(long id)
{
database.delete(SQLiteHelper.TABLE_DAILY,
SQLiteHelper.COLUMN_ID + " = " + id, null);
}
public List<Daily> getDailiesList()
{
List<Daily> dailies = new ArrayList<Daily>();
Cursor cursor = database.query(
SQLiteHelper.TABLE_DAILY, allColumns, null, null, null,
null, "last_completed DESC, hour, minute"
);
cursor.moveToFirst();
while(!cursor.isAfterLast()) {
Daily daily = cursorToDaily(cursor);
dailies.add(daily);
cursor.moveToNext();
}
cursor.close();
return dailies;
}
public Daily getById(long id)
{
Cursor cursor = database.query(SQLiteHelper.TABLE_DAILY,
allColumns,
SQLiteHelper.COLUMN_ID + " = ?",
new String[] { "" + id },
null, null, null);
cursor.moveToFirst();
Daily daily = cursorToDaily(cursor);
cursor.close();
return daily;
}
private Daily cursorToDaily(Cursor cursor)
{
Daily daily = new Daily();
daily.setId(cursor.getLong(0));
daily.setTitle(cursor.getString(1));
daily.setAlarm(cursor.getInt(2) == 1);
daily.setHour(cursor.getInt(3));
daily.setMinute(cursor.getInt(4));
daily.setLastCompleted(cursor.getString(5));
return daily;
}
}

View file

@ -0,0 +1,107 @@
package org.ryuslash.Dailies;
import java.util.Date;
import java.text.DateFormat;
public class Daily
{
private long id;
private String title;
private boolean alarm;
private int hour;
private int minute;
private Date last_completed;
public Daily() { }
public Daily(long id, String title, boolean alarm, int hour,
int minute, Date last_completed)
{
this.id = id;
this.title = title;
this.alarm = alarm;
this.hour = hour;
this.minute = minute;
this.last_completed = last_completed;
}
public Daily(long id, String title, boolean alarm, int hour,
int minute)
{
this(id, title, alarm, hour, minute, null);
}
public long getId()
{
return id;
}
public void setId(long id)
{
this.id = id;
}
public String getTitle()
{
return title;
}
public void setTitle(String title)
{
this.title = title;
}
public boolean getAlarm()
{
return alarm;
}
public void setAlarm(boolean alarm)
{
this.alarm = alarm;
}
public int getHour()
{
return hour;
}
public void setHour(int hour)
{
this.hour = hour;
}
public int getMinute()
{
return minute;
}
public void setMinute(int minute)
{
this.minute = minute;
}
public Date getLastCompleted()
{
return last_completed;
}
public void setLastCompleted(Date last_completed)
{
this.last_completed = last_completed;
}
public void setLastCompleted(String last_completed)
{
if (last_completed != null && !last_completed.isEmpty()) {
DateFormat df = DateFormat.getDateInstance();
setLastCompleted(df.format(last_completed));
}
}
@Override
public String toString()
{
return String.format("%02d:%02d %s", hour, minute, title);
}
}

View file

@ -0,0 +1,51 @@
package org.ryuslash.Dailies;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
public class SQLiteHelper extends SQLiteOpenHelper
{
public static final String TABLE_DAILY = "daily";
public static final String COLUMN_ID = "id";
public static final String COLUMN_TITLE = "title";
public static final String COLUMN_ALARM = "alarm";
public static final String COLUMN_HOUR = "hour";
public static final String COLUMN_MINUTE = "minute";
public static final String COLUMN_LAST_COMPLETED = "last_completed";
private static final String DATABASE_NAME = "dailies.db";
private static final int DATABASE_VERSION = 1;
private static final String TABLE_DAILY_CREATE =
"CREATE TABLE " + TABLE_DAILY + " ("
+ COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+ COLUMN_TITLE + " TEXT NOT NULL, "
+ COLUMN_ALARM + " INTEGER NOT NULL, "
+ COLUMN_HOUR + " INTEGER NULL, "
+ COLUMN_MINUTE + " INTEGER NULL, "
+ COLUMN_LAST_COMPLETED + " TEXT NULL "
+ ");";
public SQLiteHelper(Context context)
{
super(context, DATABASE_NAME, null, DATABASE_VERSION);
}
@Override
public void onCreate(SQLiteDatabase database)
{
database.execSQL(TABLE_DAILY_CREATE);
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldV, int newV)
{
Log.w(SQLiteHelper.class.getName(),
"Upgrading database from version " + oldV + " to "
+ newV + ", which will destroy all old data");
db.execSQL("DROP TABLE IF EXISTS " + TABLE_DAILY);
onCreate(db);
}
}