ricky/location_ringer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

What on Default

Browse Source 
Updated default ringer to only display the what fragment, and added the
default ringer description to the ringer list view

closes #48

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-05-17 12:29:21 -04:00
parent 5407d10b29
commit a29ed10fae
3 changed files with 209 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
LocationRinger/res/values/pagerTitles.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="ringer_info_titles">
<item>About</item>
<item>Location</item>
<item>What</item>
</string-array>
<string-array name="ringer_info_titles_default">
<item>What</item>
</string-array>
</resources>

36
LocationRinger/src/com/TwentyCodes/android/LocationRinger/db/RingerDatabase.java
View File

@@ -85,11 +85,11 @@ public class RingerDatabase {
public static final String KEY_RINGER_DESCRIPTION = "ringer_description"; public static final String KEY_RINGER_DESCRIPTION = "ringer_description";
/** /**
* A helper class to manage database creation and version management. * A helper class to manage database creation and version management.
* @author ricky barrette * @author ricky barrette
*/ */
private class OpenHelper extends SQLiteOpenHelper { private class OpenHelper extends SQLiteOpenHelper {
/** /**
* Creates a new OpenHelper * Creates a new OpenHelper
@@ -190,6 +190,10 @@ private class OpenHelper extends SQLiteOpenHelper {
createDatabase(db); createDatabase(db);
//insert the default ringer into this table //insert the default ringer into this table
db.execSQL("insert into " + RINGER_TABLE + "(" + KEY_RINGER_NAME + ") values ('"+RingerDatabase.this.mContext.getString(R.string.default_ringer)+"')"); db.execSQL("insert into " + RINGER_TABLE + "(" + KEY_RINGER_NAME + ") values ('"+RingerDatabase.this.mContext.getString(R.string.default_ringer)+"')");
db.execSQL("insert into " + RINGER_INFO_TABLE + "(" + KEY_RINGER_NAME + ", " + KEY + ", " + KEY_VALUE +
") values ('"+RingerDatabase.this.mContext.getString(R.string.default_ringer)
+ "', '" + KEY_RINGER_DESCRIPTION
+ "', '" + RingerDatabase.this.mContext.getString(R.string.about_default_ringer)+"')");
} }
/** /**
@@ -264,20 +268,6 @@ private class OpenHelper extends SQLiteOpenHelper {
} }
}).start(); }).start();
} }
}
/**
* Parses a string boolean from the database
* @param bool
* @return true or false
* @author ricky barrette
*/
public static boolean parseBoolean(String bool){
try {
return bool == null ? false : Integer.parseInt(bool) == 1 ? true : false;
} catch (NumberFormatException e) {
return false;
}
} }
/** /**
@@ -296,6 +286,20 @@ private class OpenHelper extends SQLiteOpenHelper {
this.mDb = new OpenHelper(this.mContext).getWritableDatabase(); this.mDb = new OpenHelper(this.mContext).getWritableDatabase();
} }
/**
* Parses a string boolean from the database
* @param bool
* @return true or false
* @author ricky barrette
*/
public static boolean parseBoolean(String bool){
try {
return bool == null ? false : Integer.parseInt(bool) == 1 ? true : false;
} catch (NumberFormatException e) {
return false;
}
}
/** /**
* Backs up the database * Backs up the database
* @return true if successful * @return true if successful

16
LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/RingerInformationActivity.java
View File

@@ -75,30 +75,28 @@ public class RingerInformationActivity extends FragmentActivity implements OnCon
/* /*
* set the title * set the title
*/ */
if(this.mRinger.containsKey(RingerDatabase.KEY_RINGER_NAME)) this.setTitle(this.mRinger.containsKey(RingerDatabase.KEY_RINGER_NAME) ?this.getString(R.string.editing)+" "+this.mRinger.getAsString(RingerDatabase.KEY_RINGER_NAME)
this.setTitle(this.getString(R.string.editing)+" "+this.mRinger.getAsString(RingerDatabase.KEY_RINGER_NAME)); : getString(R.string.new_ringer));
else
this.setTitle(R.string.new_ringer); boolean isDefault = getString(R.string.default_ringer).equals(this.mRinger.getAsString(RingerDatabase.KEY_RINGER_NAME));
/* /*
* Page titles * Page titles
*/ */
String[] titles = new String[]{ String[] titles = this.getResources().getStringArray(isDefault ? R.array.ringer_info_titles_default : R.array.ringer_info_titles);
this.getString(R.string.about),
this.getString(R.string.location),
this.getString(R.string.what)
};
ArrayList<Fragment> fragments = new ArrayList<Fragment>(); ArrayList<Fragment> fragments = new ArrayList<Fragment>();
/* /*
* about page * about page
*/ */
if(!isDefault)
fragments.add(new AboutRingerFragment(this.mRinger, this.mInfo, this)); fragments.add(new AboutRingerFragment(this.mRinger, this.mInfo, this));
/* /*
* Location page * Location page
*/ */
if(!isDefault)
fragments.add(new LocationInfomationFragment(this.mInfo, this, this)); fragments.add(new LocationInfomationFragment(this.mInfo, this, this));
/* /*