diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java index dae246d..a265036 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java @@ -1,9 +1,17 @@ package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; +import android.view.View; +import android.widget.ImageView; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; public class HelpActivity extends AppCompatActivity { @@ -12,6 +20,7 @@ public class HelpActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.help); setupActionBar(); + } private void setupActionBar() { @@ -33,4 +42,45 @@ public class HelpActivity extends AppCompatActivity { } return super.onOptionsItemSelected(item); } + + public void clickHandler(View v){ + switch (v.getId()){ + case R.id.imageView: + setContentView(R.layout.help2); + ImageView img = (ImageView) findViewById(R.id.img_back); + img.setImageResource(R.drawable.start_screen); + break; + case R.id.imageView1: + setContentView(R.layout.help2); + img = (ImageView) findViewById(R.id.img_back); + img.setImageResource(R.drawable.settings_screen); + break; + case R.id.imageView2: + setContentView(R.layout.help2); + img = (ImageView) findViewById(R.id.img_back); + img.setImageResource(R.drawable.create_profile_screen); + break; + case R.id.imageView3: + setContentView(R.layout.help2); + img = (ImageView) findViewById(R.id.img_back); + img.setImageResource(R.drawable.create_profile_screen); + break; + case R.id.imageView4: + setContentView(R.layout.help2); + img = (ImageView) findViewById(R.id.img_back); + img.setImageResource(R.drawable.general_screen); + break; + case R.id.imageView5: + setContentView(R.layout.help2); + img = (ImageView) findViewById(R.id.img_back); + img.setImageResource(R.drawable.notification_screen); + break; + case R.id.img_back: + setContentView(R.layout.help); + break; + default: + + } + } + } diff --git a/app/src/main/res/drawable/create_profile_screen.png b/app/src/main/res/drawable/create_profile_screen.png new file mode 100644 index 0000000..b7a09e6 Binary files /dev/null and b/app/src/main/res/drawable/create_profile_screen.png differ diff --git a/app/src/main/res/drawable/general_screen.png b/app/src/main/res/drawable/general_screen.png new file mode 100644 index 0000000..07e1574 Binary files /dev/null and b/app/src/main/res/drawable/general_screen.png differ diff --git a/app/src/main/res/drawable/notification_screen.png b/app/src/main/res/drawable/notification_screen.png new file mode 100644 index 0000000..431f2e7 Binary files /dev/null and b/app/src/main/res/drawable/notification_screen.png differ diff --git a/app/src/main/res/drawable/settings_screen.png b/app/src/main/res/drawable/settings_screen.png new file mode 100644 index 0000000..dfa14bb Binary files /dev/null and b/app/src/main/res/drawable/settings_screen.png differ diff --git a/app/src/main/res/drawable/start_screen.png b/app/src/main/res/drawable/start_screen.png new file mode 100644 index 0000000..17100a4 Binary files /dev/null and b/app/src/main/res/drawable/start_screen.png differ diff --git a/app/src/main/res/layout/help.xml b/app/src/main/res/layout/help.xml index 282ad30..ea7af8e 100644 --- a/app/src/main/res/layout/help.xml +++ b/app/src/main/res/layout/help.xml @@ -1,15 +1,225 @@ - + + + + android:weightSum="1" + android:layout_margin="20dp" + android:scrollbarAlwaysDrawVerticalTrack="true" + android:scrollbars="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + android:layout_toRightOf="@+id/imageView2" + android:layout_below="@+id/textView13" + android:textSize="6pt"/> + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/help2.xml b/app/src/main/res/layout/help2.xml new file mode 100644 index 0000000..1086572 --- /dev/null +++ b/app/src/main/res/layout/help2.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fb514e3..574d42f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -119,4 +119,19 @@ 6 + + + + 1. Spinner to select the used profile \n2. Clock shows time and is clickable. Can starts and stop the time. \n3. Button start and stops the time. \n4. Resets the time + Main Screen + 1. Open the drawer and select \'Settings\' \n2. Select \'General\' to enter the profile settings. There you can change name, time and exercises of the profile. \n3. Select \'Notifications\' to activate or deactivate notifications. + 1. If selected it allows to vibrate, to use ringtones and message-notifications. If its disabled, non of the notifications will work.\n2. Select a ringtone. \n3. Choose if the mobile phone should vibrate, when the countdown ends. \n4. Choose if you want message notifications.\n5. If the flag is set the screen will stay on, while on main or exercise screen. + 1. Choose the profile to change \n2. Enter the new name \n3. Alter the working time \n4. Alter the break time \n5. Choose if the \'Continuously\' flag is set or not. if it is, the break will start directly. if not, you can choose to take or to skip it. \n6. Choose the sections you want to train in the breaks. + Settings Screen + 1. Choose the name of the profile \n2. Choose the time of your work-interval \n3. Choose the break-time of this profile \n4. Press on \'Select\', if you want to enter the exercise screen to select the training region of your profile. Ignore it, if you don\'t want to train on this profile. \n5. Check it if you want to take the break directly. Uncheck it, if you want to decide every time if you\'ll take the break. + Create New Profile Screen + Break Screen + PLACEHOLDER + To see the images in real size simply click on them. To return back to this view re-click on the image! + diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml index fcba5ef..d449fc4 100644 --- a/app/src/main/res/xml/pref_notification.xml +++ b/app/src/main/res/xml/pref_notification.xml @@ -1,18 +1,10 @@ - - - @@ -20,14 +12,12 @@