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

Merge branch 'Feature/#50'

Browse Source
This commit is contained in:
Ricky Barrette
2012-05-25 11:42:05 -04:00
parent 95d3536887 0ac2e80c3d
commit 9e559d445e
6 changed files with 296 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LocationRinger/res/layout/fragment_container.xml
View File

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

29
LocationRinger/res/layout/fragment_list_contianer.xml
View File

@@ -1,12 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="match_parent" >
<LinearLayout
android:id="@+id/fragment_list_contianer"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/add_feature_button"
android:layout_alignParentTop="true"
android:paddingBottom="5dip" >
<LinearLayout
android:id="@+id/fragment_list_contianer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</ScrollView>
<ImageButton
android:id="@id/add_feature_button"
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@android:drawable/ic_menu_add" />
</ScrollView>
</RelativeLayout>

6
LocationRinger/res/values/features.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="features">
<item>@string/ringtone</item>
<item>@string/notification_ringtone</item>
@@ -7,7 +8,6 @@
<item>@string/music_volume</item>
<item>@string/bluetooth</item>
<item>@string/wifi</item>
<item>@string/update_interval</item>
</string-array>
</resources>
</resources>

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

@@ -120,21 +120,39 @@ public class RingerInformationActivity extends FragmentActivity implements OnCon
* update interval
*/
ArrayList<Fragment> what = new ArrayList<Fragment>();
ArrayList<Integer> added = new ArrayList<Integer>();
// if(this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE) || this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE_IS_SILENT) || this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE_VOLUME))
if(this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE) || this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE_IS_SILENT) || this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE_VOLUME)){
what.add(new RingtoneFragment(this.mInfo, this, AudioManager.STREAM_RING));
// if(this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_RINGTONE) || this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_IS_SILENT) || this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME))
added.add(0);
}
if(this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_RINGTONE) || this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_IS_SILENT) || this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME)){
what.add(new RingtoneFragment(this.mInfo, this, AudioManager.STREAM_NOTIFICATION));
// if(this.mInfo.containsKey(RingerDatabase.KEY_ALARM_VOLUME))
added.add(1);
}
if(this.mInfo.containsKey(RingerDatabase.KEY_ALARM_VOLUME)){
what.add(new VolumeFragment(this.mInfo, this, this, AudioManager.STREAM_ALARM));
// if(this.mInfo.containsKey(RingerDatabase.KEY_MUSIC_VOLUME))
added.add(2);
}
if(this.mInfo.containsKey(RingerDatabase.KEY_MUSIC_VOLUME)){
what.add(new VolumeFragment(this.mInfo, this, this, AudioManager.STREAM_MUSIC));
// if(this.mInfo.containsKey(RingerDatabase.KEY_WIFI))
what.add(new ToggleButtonFragment(this.getString(R.string.wifi), RingerDatabase.KEY_WIFI, this.mInfo, this));
// if(this.mInfo.containsKey(RingerDatabase.KEY_BT))
added.add(3);
}
if(this.mInfo.containsKey(RingerDatabase.KEY_BT)){
what.add(new ToggleButtonFragment(this.getString(R.string.bluetooth), RingerDatabase.KEY_BT, this.mInfo, this));
added.add(4);
}
if(this.mInfo.containsKey(RingerDatabase.KEY_WIFI)){
what.add(new ToggleButtonFragment(this.getString(R.string.wifi), RingerDatabase.KEY_WIFI, this.mInfo, this));
added.add(5);
}
fragments.add(new FeatureListFragment(this.mInfo, this, what));
fragments.add(new FeatureListFragment(this.mInfo, this, what, added));
//Populate the pager
this.mPager = (ViewPager)findViewById(R.id.pager);

141
LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/BaseFragmentListFragment.java Normal file
View File

@@ -0,0 +1,141 @@
/**
* BaseFragmentListFragment.java
* @date May 24, 2012
* @author ricky barrette
* @author Twenty Codes, LLC
*/
package com.TwentyCodes.android.LocationRinger.ui.fragments;
import java.util.ArrayList;
import java.util.Collections;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.TwentyCodes.android.LocationRinger.debug.Debug;
/**
* This fragment will be used to display a list of fragments
* @author ricky barrette
*/
public abstract class BaseFragmentListFragment extends Fragment {
private static final String TAG = "BaseFragmentListFragment";
private final ArrayList<Fragment> mFragments;
private final int mContainer;
private final int mLayout;
/**
* Creates a new BaseFragmentListFragment
* @author ricky barrette
*/
public BaseFragmentListFragment(ArrayList<Fragment> fragments, int layout, int container) {
super();
mFragments = fragments;
mLayout = layout;
mContainer = container;
}
/**
* Adds the fragment to the list
* @param fragment
* @author ricky barrette
*/
public void add(final Fragment fragment){
this.mFragments.add(fragment);
final FragmentTransaction transaction = this.getFragmentManager().beginTransaction();
transaction.add(mContainer, fragment, fragment.getTag());
transaction.commit();
}
/**
* Loads all the fragments
* @author ricky barrette
*/
private void loadFragments() {
final FragmentTransaction transaction = this.getFragmentManager().beginTransaction();
for(Fragment fragment : this.mFragments)
transaction.add(mContainer, fragment, fragment.getTag());
transaction.commit();
}
/**
* (non-Javadoc)
* @see android.support.v4.app.Fragment#onActivityResult(int, int, android.content.Intent)
*/
@Override
public void onActivityResult(int arg0, int arg1, Intent arg2) {
removeFragments();
loadFragments();
super.onActivityResult(arg0, arg1, arg2);
}
/**
* (non-Javadoc)
* @see android.support.v4.app.ListFragment#onCreateView(android.view.LayoutInflater,
* android.view.ViewGroup, android.os.Bundle)
*/
@Override
public View onCreateView(LayoutInflater inflator, ViewGroup container, Bundle bundle) {
return inflator.inflate(mLayout, null);
}
/**
* (non-Javadoc)
* @see android.support.v4.app.Fragment#onPause()
*/
@Override
public void onPause() {
try{
removeFragments();
} catch(IllegalStateException e){
e.printStackTrace();
//do nothing
}
Collections.reverse(this.mFragments);
super.onPause();
}
/**
* (non-Javadoc)
* @see android.support.v4.app.Fragment#onResume()
*/
@Override
public void onResume() {
if (Debug.DEBUG)
Log.v(TAG, "onResume()");
loadFragments();
super.onResume();
}
/**
* Removes a fragment from the list
* @param fragment
* @author ricky barrette
*/
public void remove(final Fragment fragment){
this.mFragments.remove(fragment);
final FragmentTransaction transaction = this.getFragmentManager().beginTransaction();
transaction.remove(fragment);
transaction.commit();
}
/**
* Removes all fragments from the the view
* @throws IllegalStateException
* @author ricky barrette
*/
private void removeFragments() throws IllegalStateException {
final FragmentTransaction transaction = this.getFragmentManager().beginTransaction();
for(Fragment fragment : this.mFragments){
transaction.remove(fragment);
}
transaction.commit();
}
}

198
LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java
View File

@@ -7,33 +7,36 @@
package com.TwentyCodes.android.LocationRinger.ui.fragments;
import java.util.ArrayList;
import java.util.Collections;
import android.app.AlertDialog;
import android.content.ContentValues;
import android.content.Intent;
import android.content.DialogInterface;
import android.media.AudioManager;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import com.TwentyCodes.android.LocationRinger.OnContentChangedListener;
import com.TwentyCodes.android.LocationRinger.R;
import com.TwentyCodes.android.LocationRinger.debug.Debug;
import com.TwentyCodes.android.LocationRinger.db.RingerDatabase;
/**
* This fragment will be used to display a list of fragments
* This fragment will be used to display a list of features
* TODO
* + create button bar that had a plus button and a hint + add/remove features
*
* @author ricky
*/
public class FeatureListFragment extends Fragment {
public class FeatureListFragment extends BaseFragmentListFragment implements OnClickListener, android.content.DialogInterface.OnClickListener {
private static final String TAG = "FeatureListFragment";
private final ArrayList<Fragment> mFragments;
private final ContentValues mInfo;
private final OnContentChangedListener mListener;
private final ArrayList<Integer> mAdded;
/**
* Creates a new FeatureListFragment
@@ -42,105 +45,110 @@ public class FeatureListFragment extends Fragment {
* @param fragments
* @author ricky barrette
*/
public FeatureListFragment(ContentValues info, OnContentChangedListener listener, ArrayList<Fragment> fragments) {
super();
mFragments = fragments;
}
/**
* Adds the fragment to the list
* @param fragment
* @author ricky barrette
*/
public void add(final Fragment fragment){
this.mFragments.add(fragment);
final FragmentTransaction transaction = this.getFragmentManager().beginTransaction();
transaction.add(R.id.fragment_list_contianer, fragment, fragment.getTag());
transaction.commit();
}
/**
* Loads all the fragments
* @author ricky barrette
*/
private void loadFragments() {
final FragmentTransaction transaction = this.getFragmentManager().beginTransaction();
for(Fragment fragment : this.mFragments)
transaction.add(R.id.fragment_list_contianer, fragment, fragment.getTag());
transaction.commit();
public FeatureListFragment(ContentValues info, OnContentChangedListener listener, ArrayList<Fragment> fragments, ArrayList<Integer> added) {
super(fragments, R.layout.fragment_list_contianer, R.id.fragment_list_contianer);
mInfo = info;
mListener = listener;
mAdded = added;
}
/**
* Called when an item is picked from the add featue list
* (non-Javadoc)
* @see android.support.v4.app.Fragment#onActivityResult(int, int, android.content.Intent)
* @see android.content.DialogInterface.OnClickListener#onClick(android.content.DialogInterface, int)
*/
@Override
public void onActivityResult(int arg0, int arg1, Intent arg2) {
removeFragments();
loadFragments();
super.onActivityResult(arg0, arg1, arg2);
public void onClick(DialogInterface dialog, int which) {
Fragment f = null;
switch(which){
case 0:
f= new RingtoneFragment(this.mInfo, this.mListener, AudioManager.STREAM_RING);
mAdded.add(0);
break;
case 1:
f = new RingtoneFragment(this.mInfo, this.mListener, AudioManager.STREAM_NOTIFICATION);
mAdded.add(1);
break;
case 2:
f = new VolumeFragment(this.mInfo, this.getActivity(), this.mListener, AudioManager.STREAM_ALARM);
mAdded.add(2);
break;
case 3:
f = new VolumeFragment(this.mInfo, this.getActivity(), this.mListener, AudioManager.STREAM_MUSIC);
mAdded.add(3);
break;
case 4:
f = new ToggleButtonFragment(this.getString(R.string.bluetooth), RingerDatabase.KEY_BT, this.mInfo, this.mListener);
mAdded.add(4);
break;
case 5:
f = new ToggleButtonFragment(this.getString(R.string.wifi), RingerDatabase.KEY_WIFI, this.mInfo, this.mListener);
mAdded.add(5);
break;
// case 6:
// f =
// break;
}
if(f != null)
add(f);
}
/**
* Called when the add feature button is clicked
* (non-Javadoc)
* @see android.view.View.OnClickListener#onClick(android.view.View)
*/
@Override
public void onClick(View v) {
new AlertDialog.Builder(this.getActivity())
.setTitle(R.string.add_feature)
.setAdapter(
new ArrayAdapter<String>(this.getActivity(), android.R.layout.simple_list_item_1, this.getResources().getStringArray(R.array.features)){
/**
* we override this, because we want to filter which items are enabled
* (non-Javadoc)
* @see android.widget.BaseAdapter#areAllItemsEnabled()
*/
@Override
public boolean areAllItemsEnabled(){
return false;
}
/**
* here we want to grey out disabled items in the list
* (non-Javadoc)
* @see android.widget.ArrayAdapter#getView(int, android.view.View, android.view.ViewGroup)
*/
@Override
public View getView(int position, View convertView, ViewGroup parent){
final View v = super.getView(position, convertView, parent);
v.setEnabled(isEnabled(position));
return v;
}
/**
* here we can notify the adaptor if an item should be enabled or not
* (non-Javadoc)
* @see android.widget.BaseAdapter#isEnabled(int)
*/
@Override
public boolean isEnabled(int position){
return ! mAdded.contains(position);
}
}, this)
.show();
}
/**
* (non-Javadoc)
* @see android.support.v4.app.ListFragment#onCreateView(android.view.LayoutInflater,
* android.view.ViewGroup, android.os.Bundle)
* @see com.TwentyCodes.android.LocationRinger.ui.fragments.BaseFragmentListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)
*/
@Override
public View onCreateView(LayoutInflater inflator, ViewGroup container, Bundle bundle) {
return inflator.inflate(R.layout.fragment_list_contianer, null);
}
/**
* (non-Javadoc)
* @see android.support.v4.app.Fragment#onPause()
*/
@Override
public void onPause() {
try{
removeFragments();
} catch(IllegalStateException e){
e.printStackTrace();
//do nothing
}
Collections.reverse(this.mFragments);
super.onPause();
}
/**
* (non-Javadoc)
* @see android.support.v4.app.Fragment#onResume()
*/
@Override
public void onResume() {
if (Debug.DEBUG)
Log.v(TAG, "onResume()");
loadFragments();
super.onResume();
}
/**
* Removes a fragment from the list
* @param fragment
* @author ricky barrette
*/
public void remove(final Fragment fragment){
this.mFragments.remove(fragment);
final FragmentTransaction transaction = this.getFragmentManager().beginTransaction();
transaction.remove(fragment);
transaction.commit();
}
/**
* Removes all fragments from the the view
* @throws IllegalStateException
* @author ricky barrette
*/
private void removeFragments() throws IllegalStateException {
final FragmentTransaction transaction = this.getFragmentManager().beginTransaction();
for(Fragment fragment : this.mFragments){
transaction.remove(fragment);
}
transaction.commit();
final View v = super.onCreateView(inflator, container, bundle);
v.findViewById(R.id.add_feature_button).setOnClickListener(this);
return v;
}
}