From a670230b6fa88f5e0f064bfc5f56e6fce08dc719 Mon Sep 17 00:00:00 2001 From: Jannik Date: Wed, 24 Aug 2016 17:32:08 +0200 Subject: [PATCH] Tutorial and Bug Fix New Tutorial And Bug Fix in SettingsActivity --- .../BreakReminder.java | 37 ++++++- .../SettingsActivity.java | 14 +-- app/src/main/res/drawable/clock.png | Bin 0 -> 9176 bytes app/src/main/res/drawable/play_button.png | Bin 0 -> 2364 bytes app/src/main/res/drawable/reset_button.png | Bin 0 -> 1603 bytes app/src/main/res/drawable/spinner.png | Bin 0 -> 14392 bytes app/src/main/res/layout/first_dialog.xml | 101 ++++++++++++++++++ app/src/main/res/layout/new_profile.xml | 4 +- app/src/main/res/values/strings.xml | 19 ++++ app/src/main/res/xml/pref_general.xml | 4 +- 10 files changed, 161 insertions(+), 18 deletions(-) create mode 100644 app/src/main/res/drawable/clock.png create mode 100644 app/src/main/res/drawable/play_button.png create mode 100644 app/src/main/res/drawable/reset_button.png create mode 100644 app/src/main/res/drawable/spinner.png create mode 100644 app/src/main/res/layout/first_dialog.xml diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java index edadefe..caf8027 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java @@ -1,5 +1,9 @@ package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder; +import android.app.Activity; +import android.app.Dialog; +import android.app.DialogFragment; +import android.app.FragmentManager; import android.app.Notification; import android.app.NotificationManager; import android.appwidget.AppWidgetManager; @@ -15,6 +19,8 @@ import android.os.CountDownTimer; import android.os.Vibrator; import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; +import android.support.v7.app.AlertDialog; +import android.view.LayoutInflater; import android.view.View; import android.support.design.widget.NavigationView; import android.support.v4.view.GravityCompat; @@ -30,7 +36,6 @@ import android.widget.Button; import android.widget.Spinner; import android.widget.TextView; -import java.util.Arrays; public class BreakReminder extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, View.OnClickListener { @@ -68,12 +73,16 @@ public class BreakReminder extends AppCompatActivity String allProfiles = sharedPrefs.getString("profiles", ""); if (allProfiles.equals("")) { System.out.println("Es gibt noch keine Profile!!"); - allProfiles = "Sport,5,1,false,-1;Exams,90,15,false,-1;Pomodoro,30,5,false,-1;"; + allProfiles = "Random,90,5,false,Arms.Legs.Head.Neck.Pelvis.Spinal Column.Trunk.;Upper-Body,90,15,true,Arms.Neck.Head.;Torso,30,5,true,Spinal Column.Trunk.;Under-Body,30,5,true,Legs.Pelvis.;"; editor.putString("profiles", allProfiles); - editor.apply(); + + WelcomeDialog welcomeDialog = new WelcomeDialog(); + welcomeDialog.show(getFragmentManager(), "WelcomeDialog"); } + + System.out.println("Alle Profile: " + sharedPrefs.getString("profiles", "FAIL")); // If chosen, set screen to "stay on" @@ -482,4 +491,26 @@ public class BreakReminder extends AppCompatActivity Intent intent = new Intent(this, BreakDeciderActivity.class); this.startActivity(intent); } + + public static class WelcomeDialog extends DialogFragment { + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + + LayoutInflater i = getActivity().getLayoutInflater(); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + + builder.setView(i.inflate(R.layout.first_dialog, null)); + builder.setIcon(R.mipmap.ic_launcher); + builder.setTitle(getActivity().getString(R.string.app_name_long)); + builder.setPositiveButton("Ok", null); + + return builder.create(); + } + } } diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SettingsActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SettingsActivity.java index 63e1fb5..3bb6b1d 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SettingsActivity.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SettingsActivity.java @@ -241,14 +241,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity { @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { - if(key.equals("exercise")) { - System.out.println("GOGOGOGOGOG"); - - System.out.println(sharedPreferences.getString("exercise", "Damn")); - - } - - if (key.equals("current_profile")) { ListPreference listPref = (ListPreference) findPreference("current_profile"); int i = Integer.parseInt(listPref.getValue()); @@ -259,11 +251,13 @@ public class SettingsActivity extends AppCompatPreferenceActivity { editor.putBoolean("change_profiles", true); String[] allProfile = sharedPreferences.getString("profiles", "").split(";"); - //FIXME Deactivate the onPrefListener in SettingsActivity + // Deactivate the onPrefListener in SettingsActivity getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this); editor.putString("name_text", allProfile[i].split(",")[0]); editor.putInt("work_value", Integer.parseInt(allProfile[i].split(",")[1])); editor.putInt("break_value", Integer.parseInt(allProfile[i].split(",")[2])); + editor.putBoolean("cont_value", Boolean.parseBoolean(allProfile[i].split(",")[3])); + editor.putString("exercise_value", allProfile[i].split(",")[4]); editor.apply(); getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this); @@ -273,8 +267,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity { return; } - if(key.equals("cont_value")) - System.out.println("Cont: " + sharedPreferences.getBoolean("cont_value", false)); // Set seekbar summary : int radius = PreferenceManager.getDefaultSharedPreferences(this.getActivity()).getInt("work_value", 50); diff --git a/app/src/main/res/drawable/clock.png b/app/src/main/res/drawable/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..d2bc80b55d4d9c42304dc855cda406c5cf4cc838 GIT binary patch literal 9176 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 b_1}B4Bi)|OZ4sK_X&gLlgg(4p4H@%4B?4}m literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/play_button.png b/app/src/main/res/drawable/play_button.png new file mode 100644 index 0000000000000000000000000000000000000000..d86db000103686f78de193234d56861f22f0e803 GIT binary patch literal 2364 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 Q?T66UKCAUW!y)>A0W>G$EC2ui literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/first_dialog.xml b/app/src/main/res/layout/first_dialog.xml new file mode 100644 index 0000000..d034b17 --- /dev/null +++ b/app/src/main/res/layout/first_dialog.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/new_profile.xml b/app/src/main/res/layout/new_profile.xml index 6ad52fe..5a2ebbd 100644 --- a/app/src/main/res/layout/new_profile.xml +++ b/app/src/main/res/layout/new_profile.xml @@ -26,8 +26,8 @@ android:layout_width="150dp" android:layout_height="wrap_content" android:inputType="text" - android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" - android:maxLength="9" + android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-" + android:maxLength="10" android:textSize="25sp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 387b84b..d1970cd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -136,4 +136,23 @@ To see the images in real size simply click on them. To return back to this view re-click on the image! Side/Repetition + + + + + DISCLAIMER PLACEHOLDER + + + + + Select profiles + Press the button to reset the clock + Reset the clock + By pressing one of them, the clock starts or stops + or + By clicking on the current profile (sport), you will see all the currently available profiles. \nYou can add new profiles by clicking on \'New Profiles...\' and edit the current ones in the settings + Start/Stop the clock + Welcome to the Privacy Friendly Break Reminder + + diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 0e64c9f..32943fc 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -12,10 +12,10 @@