Skip to content

Commit 491010a

Browse files
MuneefmMuneefm
committed
-Notification
-Handheld Preference
1 parent db0918f commit 491010a

File tree

61 files changed

+516
-65
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+516
-65
lines changed

‎mobile/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ dependencies {
3131
compile 'com.google.android.gms:play-services:10.0.1'
3232
compile 'com.android.support:appcompat-v7:25.1.0'
3333
compile 'com.android.support:design:25.1.0'
34+
compile 'com.android.support:preference-v7:25.1.0'
35+
compile 'com.android.support:preference-v14:25.1.0'
36+
3437
compile 'com.android.support:support-v4:25.1.0'
3538
compile 'com.jakewharton:butterknife:8.4.0'
3639
compile 'com.android.support:multidex:1.0.1'
3740
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
3841
testCompile 'junit:junit:4.12'
3942
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
43+
compile 'com.thebluealliance:spectrum:0.7.1'
44+
4045
}

‎mobile/src/main/assets/fonts/Cabin-Regular.ttf

101 KB
Binary file not shown.

‎mobile/src/main/assets/fonts/NunitoSans-Regular.ttf

93.5 KB
Binary file not shown.

‎mobile/src/main/assets/fonts/Roboto-Regular.ttf

159 KB
Binary file not shown.

‎mobile/src/main/assets/fonts/Yellowtail-Regular.ttf

61 KB
Binary file not shown.

‎mobile/src/main/java/mnf/android/wearnote/Activity/AppCompatPreferenceActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.content.res.Configuration;
44
import android.os.Bundle;
5+
56
import android.preference.PreferenceActivity;
67
import android.support.annotation.LayoutRes;
78
import android.support.annotation.Nullable;

‎mobile/src/main/java/mnf/android/wearnote/Activity/SettingsActivity.java

Lines changed: 68 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@
2323
import android.view.MenuItem;
2424
import android.view.View;
2525

26+
import com.thebluealliance.spectrum.SpectrumPreference;
27+
2628
import mnf.android.wearnote.ApplicationClass;
2729
import mnf.android.wearnote.MainActivity;
2830
import mnf.android.wearnote.R;
31+
import mnf.android.wearnote.tools.MobilePreferenceHandler;
2932
import mnf.android.wearnote.tools.WearPreferenceHandler;
3033

3134
import java.util.List;
@@ -179,8 +182,10 @@ protected boolean isValidFragment(String fragmentName) {
179182
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
180183
public static class WearPreferenceFragment extends PreferenceFragment {
181184
SwitchPreference switchTheme;
182-
ListPreference fontSize;
185+
ListPreference fontSize,fontStyle;
183186
WearPreferenceHandler pref;
187+
SpectrumPreference colorPicker;
188+
184189

185190
@Override
186191
public void onCreate(Bundle savedInstanceState) {
@@ -195,9 +200,13 @@ public void onCreate(Bundle savedInstanceState) {
195200
// guidelines.
196201
// bindPreferenceSummaryToValue(findPreference("example_text"));
197202
bindPreferenceSummaryToValue(findPreference("fontsize_list"));
198-
// bindPreferenceSummaryToValue(findPreference("switchTheme"));
203+
bindPreferenceSummaryToValue(findPreference("font_style"));
204+
205+
// bindPreferenceSummaryToValue(findPreference("switchTheme"));
199206

200207
//switchTheme =
208+
fontStyle = (ListPreference) findPreference("font_style");
209+
colorPicker = (SpectrumPreference) findPreference("color_pick");
201210
fontSize = (ListPreference) findPreference("fontsize_list");
202211
switchTheme = (SwitchPreference) findPreference("theme_switch");
203212
switchTheme.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@@ -225,6 +234,27 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
225234
return true;
226235
}
227236
});
237+
238+
colorPicker.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
239+
@Override
240+
public boolean onPreferenceChange(Preference preference, Object newValue) {
241+
Log.e("TAG","value String = "+newValue.toString());
242+
pref.setFontColor(Integer.parseInt(newValue.toString()));
243+
ApplicationClass.syncPrefToWear(pref);
244+
245+
return true;
246+
}
247+
});
248+
fontStyle.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
249+
@Override
250+
public boolean onPreferenceChange(Preference preference, Object newValue) {
251+
String[] items = getActivity().getResources().getStringArray(R.array.pref_style_title);
252+
fontStyle.setSummary(items[3-Integer.parseInt(newValue.toString())]);
253+
pref.setFontStyle(newValue.toString());
254+
ApplicationClass.syncPrefToWear(pref);
255+
return true;
256+
}
257+
});
228258
}
229259

230260
@Override
@@ -244,18 +274,52 @@ public boolean onOptionsItemSelected(MenuItem item) {
244274
*/
245275
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
246276
public static class PhonePreferenceFragment extends PreferenceFragment {
277+
ListPreference fontSize,fontStyle;
278+
MobilePreferenceHandler pref;
279+
247280
@Override
248281
public void onCreate(Bundle savedInstanceState) {
249282
super.onCreate(savedInstanceState);
250283
addPreferencesFromResource(R.xml.pref_notification);
251284
setHasOptionsMenu(true);
252-
Log.e("TAG","GeneralPreferenceFragment onCreate");
285+
pref= new MobilePreferenceHandler(getActivity());
286+
Log.e("TAG","PhonePreferenceFragment onCreate");
287+
bindPreferenceSummaryToValue(findPreference("fontsize_list_mobile"));
288+
bindPreferenceSummaryToValue(findPreference("font_style_mobile"));
289+
fontStyle = (ListPreference) findPreference("font_style_mobile");
290+
fontSize = (ListPreference) findPreference("fontsize_list_mobile");
291+
292+
fontStyle.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
293+
@Override
294+
public boolean onPreferenceChange(Preference preference, Object newValue) {
295+
Log.e("TAG","onPreferenceChange fontStyle mobile");
296+
String[] items = getActivity().getResources().getStringArray(R.array.pref_style_title);
297+
fontStyle.setSummary(items[3-Integer.parseInt(newValue.toString())]);
298+
pref.setFontStyle(newValue.toString());
299+
return true;
300+
}
301+
});
302+
303+
fontSize.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
304+
@Override
305+
public boolean onPreferenceChange(Preference preference, Object newValue) {
306+
Log.e("TAG","onPreferenceChange fontSize mobile = "+newValue.toString());
307+
308+
String[] items = getActivity().getResources().getStringArray(R.array.pref_text_size_list_titles);
309+
fontSize.setSummary(items[3-Integer.parseInt(newValue.toString())]);
310+
pref.setFontSize(newValue.toString());
311+
312+
return true;
313+
}
314+
});
315+
253316

254317
// Bind the summaries of EditText/List/Dialog/Ringtone preferences
255318
// to their values. When their values change, their summaries are
256319
// updated to reflect the new value, per the Android Design
257320
// guidelines.
258-
bindPreferenceSummaryToValue(findPreference("notifications_new_message_ringtone"));
321+
322+
259323
}
260324

261325
@Override

‎mobile/src/main/java/mnf/android/wearnote/Adapters/RecycleViewAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
7777

7878
@Override
7979
public void onBindViewHolder(ViewHolder holder, int position) {
80-
Typeface face=Typeface.createFromAsset(c.getAssets(), "fonts/Quicksand-Regular.ttf");
80+
Typeface face=Typeface.createFromAsset(c.getAssets(), "fonts/Cabin-Regular.ttf");
8181
holder.body.setTypeface(face);
8282
Typeface faceTitle=Typeface.createFromAsset(c.getAssets(), "fonts/Poppins-Regular.ttf");
8383
// Typeface faceTitle=Typeface.createFromAsset(c.getAssets(), "fonts/Farsan-Regular.ttf");

‎mobile/src/main/java/mnf/android/wearnote/ApplicationClass.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ public static void syncPrefToWear(WearPreferenceHandler prefVar){
131131
final DataMap mapPref = putRequestPref.getDataMap();
132132
mapPref.putString("font_size", pref.getFontSize());
133133
mapPref.putBoolean("theme",pref.getTheme());
134+
mapPref.putInt("font_color",pref.getFontColor());
135+
mapPref.putString("font_style",pref.getFontStyle());
134136
Wearable.DataApi.putDataItem(mGoogleApiClient, putRequestPref.asPutDataRequest());
135137
}
136138

‎mobile/src/main/java/mnf/android/wearnote/MainActivity.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,18 +217,13 @@ public boolean onNavigationItemSelected(MenuItem item) {
217217
// Handle navigation view item clicks here.
218218
int id = item.getItemId();
219219

220-
if (id == R.id.nav_camera) {
220+
if (id == R.id.nav_note) {
221221
// Handle the camera action
222-
} else if (id == R.id.nav_gallery) {
223-
224-
} else if (id == R.id.nav_slideshow) {
225-
226-
} else if (id == R.id.nav_manage) {
227-
228-
} else if (id == R.id.nav_share) {
229-
230-
} else if (id == R.id.nav_send) {
222+
getSupportFragmentManager().beginTransaction().replace(R.id.content_main,new ListNote().newInstance("","")).commit();
231223

224+
} else if (id == R.id.nav_settings) {
225+
Intent set = new Intent(MainActivity.this, SettingsActivity.class);
226+
startActivity(set);
232227
}
233228

234229
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);

‎mobile/src/main/java/mnf/android/wearnote/NoteFragment.java

Lines changed: 95 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package mnf.android.wearnote;
22

33
import android.content.Context;
4+
import android.content.Intent;
45
import android.database.DatabaseUtils;
6+
import android.graphics.Typeface;
57
import android.net.Uri;
68
import android.os.Bundle;
79
import android.support.v4.app.Fragment;
@@ -10,6 +12,9 @@
1012
import android.text.TextWatcher;
1113
import android.util.Log;
1214
import android.view.LayoutInflater;
15+
import android.view.Menu;
16+
import android.view.MenuInflater;
17+
import android.view.MenuItem;
1318
import android.view.View;
1419
import android.view.ViewGroup;
1520
import android.widget.EditText;
@@ -23,7 +28,10 @@
2328

2429
import butterknife.BindView;
2530
import butterknife.ButterKnife;
31+
import mnf.android.wearnote.Activity.SettingsActivity;
2632
import mnf.android.wearnote.Model.Note;
33+
import mnf.android.wearnote.tools.MobilePreferenceHandler;
34+
import mnf.android.wearnote.tools.SendNotification;
2735

2836

2937
/**
@@ -39,13 +47,13 @@ public class NoteFragment extends Fragment {
3947
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
4048
private static final String ARG_PARAM1 = "param1";
4149
private static final String ARG_PARAM2 = "param2";
42-
50+
Note note;
4351
// TODO: Rename and change types of parameters
4452
private String mParam1;
4553
private String mParam2;
46-
54+
Context context;
4755
private OnFragmentInteractionListener mListener;
48-
56+
MobilePreferenceHandler pref;
4957
public NoteFragment() {
5058
// Required empty public constructor
5159
}
@@ -72,6 +80,7 @@ public static NoteFragment newInstance(String param1, String param2) {
7280
@Override
7381
public void onCreate(Bundle savedInstanceState) {
7482
super.onCreate(savedInstanceState);
83+
setHasOptionsMenu(true);
7584
if (getArguments() != null) {
7685
mParam1 = getArguments().getString(ARG_PARAM1);
7786
mParam2 = getArguments().getString(ARG_PARAM2);
@@ -85,15 +94,68 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
8594
// Inflate the layout for this fragment
8695
View v = inflater.inflate(R.layout.fragment_note, container, false);
8796
ButterKnife.bind(this,v);
97+
pref = new MobilePreferenceHandler(getActivity());
98+
context = getActivity();
8899

89100
Log.e("TAG","id recieved is "+mParam1);
90101

91-
if(mParam1!=null&&!mParam1.equals("")) {
92-
Note note = new Select()
102+
// Typeface face=Typeface.createFromAsset(getActivity().getAssets(), "fonts/Cabin-Regular.ttf");
103+
// edtNote.setTypeface(face);
104+
105+
Typeface faceYellowtail=Typeface.createFromAsset(getActivity().getAssets(), "fonts/Yellowtail-Regular.ttf");
106+
Typeface faceCabin=Typeface.createFromAsset(getActivity().getAssets(), "fonts/Cabin-Regular.ttf");
107+
Typeface faceRoboto=Typeface.createFromAsset(getActivity().getAssets(), "fonts/Roboto-Regular.ttf");
108+
Typeface faceNunitoSans=Typeface.createFromAsset(getActivity().getAssets(), "fonts/NunitoSans-Regular.ttf");
109+
110+
Log.e("TAG","pref values "+pref.getFontStyle()+" -- "+pref.getFontSize());
111+
switch (pref.getFontStyle()){
112+
case "0":
113+
edtNote.setTypeface(faceYellowtail);
114+
break;
115+
case "1":
116+
edtNote.setTypeface(faceRoboto);
117+
break;
118+
case "2":
119+
edtNote.setTypeface(faceNunitoSans);
120+
break;
121+
case "3":
122+
edtNote.setTypeface(faceCabin);
123+
break;
124+
default:
125+
edtNote.setTypeface(faceRoboto);
126+
break;
127+
128+
}
129+
130+
131+
switch (pref.getFontSize()){
132+
case "0":
133+
edtNote.setTextSize(10f);
134+
break;
135+
case "1":
136+
edtNote.setTextSize(15f);
137+
break;
138+
case "2":
139+
edtNote.setTextSize(20f);
140+
break;
141+
case "3":
142+
edtNote.setTextSize(30f);
143+
break;
144+
default:
145+
edtNote.setTextSize(25f);
146+
break;
147+
}
148+
149+
150+
151+
if(mParam1!=null&&!mParam1.equals("")) {
152+
note = new Select()
93153
.from(Note.class)
94154
.where("idn = ?", mParam1)
95155
.executeSingle();
96156

157+
158+
97159
edtNote.setText(note.getBody());
98160
}
99161

@@ -163,6 +225,34 @@ public void onDetach() {
163225
mListener = null;
164226
}
165227

228+
@Override
229+
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
230+
// super.onCreateOptionsMenu(menu, inflater);
231+
inflater.inflate(R.menu.note_fragment_menu, menu);
232+
Log.e("TAG","onCreateOptionsMenu NoteFragment");
233+
super.onCreateOptionsMenu(menu, inflater);
234+
}
235+
236+
@Override
237+
public boolean onOptionsItemSelected(MenuItem item) {
238+
int id = item.getItemId();
239+
Log.e("TAG","onOptionsItemSelected NoteFragment");
240+
241+
//noinspection SimplifiableIfStatement
242+
if (id == R.id.send_notification) {
243+
Log.e("TAG","send_notification select");
244+
Note noteGet = new Select()
245+
.from(Note.class)
246+
.where("idn = ?", mParam1)
247+
.executeSingle();
248+
new SendNotification(context,noteGet.body,noteGet.getTitle()).sendNotificationWear();
249+
250+
251+
return true;
252+
}
253+
return super.onOptionsItemSelected(item);
254+
}
255+
166256
/**
167257
* This interface must be implemented by activities that contain this
168258
* fragment to allow an interaction in this fragment to be communicated

0 commit comments

Comments
 (0)