Some Changes

Added DBHandler for handling database
Updated BreakActivity and Layout activity_break for it
This commit is contained in:
Sergej A 2016-08-24 15:51:06 +02:00
commit f2bec9ab01
8 changed files with 343 additions and 63 deletions

Binary file not shown.

View file

@ -4,7 +4,6 @@ import android.app.Notification;
import android.app.NotificationManager;
import android.content.Context;
import android.content.SharedPreferences;
import android.media.MediaPlayer;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
@ -14,27 +13,32 @@ import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.List;
public class BreakActivity extends AppCompatActivity implements View.OnClickListener {
private TextView ct_text;
private CountDownTimer ct;
private String stopTime = "";
private boolean isRunning = false;
private List<Exercise> exerciseList;
private SharedPreferences sharedPrefs;
private TextView description, side_repetition, break_exercise_type;
private int currentExercise, breakTime = 0;
private ImageView image, image_mid, image_right;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_break);
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
currentExercise = 0;
sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
int mins = sharedPrefs.getInt("break_value", 5);
String bufferZeroMinute = "";
@ -44,23 +48,45 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
ct_text = (TextView) findViewById(R.id.textViewBreak);
ct_text.setText(bufferZeroMinute + mins + ":00");
Button playStopButton = (Button) findViewById(R.id.button_playStopBreak);
playStopButton.setOnClickListener(this);
Button resetButton = (Button) findViewById(R.id.button_cancel);
resetButton.setOnClickListener(this);
Button skipButton = (Button) findViewById(R.id.button_next);
skipButton.setOnClickListener(this);
ct_text.setOnClickListener(this);
LinearLayout ll = (LinearLayout) findViewById(R.id.layout_break);
// TODO Do it dynamically
for (int i = 0; i < 20; i++) {
ImageView image = new ImageView(this);
image.setLayoutParams(new android.view.ViewGroup.LayoutParams(80, 60));
image.setImageResource(R.drawable.statistic_logo);
ll.addView(image);
// LinearLayout ll = (LinearLayout) findViewById(R.id.layout_break);
// // TODO Do it dynamically
// for (int i = 0; i < 20; i++) {
// ImageView image = new ImageView(this);
// image.setLayoutParams(new android.view.ViewGroup.LayoutParams(80, 60));
// image.setImageResource(R.drawable.statistic_logo);
// ll.addView(image);
// }
DBHandler dbHandler = new DBHandler(this);
String[] allProfiles = sharedPrefs.getString("profiles", "").split(";");
String currentProfile = sharedPrefs.getString("name_text", "");
String[] exercises = new String[8];
for (int i = 0; i < allProfiles.length; i++) {
if (allProfiles[i].split(",")[0].equals(currentProfile)) {
System.out.println("Hi: " + allProfiles[i].split(",")[4]);
exercises = allProfiles[i].split(",")[4].split("\\.");
}
}
exerciseList = dbHandler.getExercisesFromSection(exercises[currentExercise]);
description = (TextView) findViewById(R.id.textViewDescription);
description.setText(exerciseList.get(currentExercise).getDescription());
side_repetition = (TextView) findViewById(R.id.textSideRepetition);
side_repetition.setText("Break");
break_exercise_type = (TextView) findViewById(R.id.break_exercise_type);
break_exercise_type.setText(exerciseList.get(currentExercise).getSection());
image = (ImageView) findViewById(R.id.imageView);
image_mid = (ImageView) findViewById(R.id.imageMid);
image_right = (ImageView) findViewById(R.id.imageRight);
image.setImageResource(R.drawable.train_left);
image_right.setImageResource(R.drawable.train_right);
}
public void onClick(View v) {
@ -101,7 +127,6 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
switch (v.getId()) {
case R.id.textViewBreak:
case R.id.button_playStopBreak:
if (isRunning) {
ct.cancel();
stopTime = (String) ct_text.getText();
@ -122,6 +147,9 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
ct_text.setText(bufferZeroMinute + (millisUntilFinished / 1000) / 60 + ":" + bufferZeroSecond + millisUntilFinished / 1000 % 60);
//FIXME 10 Sec break -> 10 + 10 exercise -> 10 sec break
update();
//Show how much time is left
timeLeft = sharedPrefs.getBoolean("notifications_new_message_timeLeft", false);
if (timeLeft) {
@ -179,9 +207,67 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList
}
break;
case R.id.button_cancel:
finish();
case R.id.button_next:
//TODO Update Timer
currentExercise++;
System.out.println("Current Ex#: " + currentExercise + " , All Ex#: " + exerciseList.size());
side_repetition.setText("Break");
if (currentExercise > exerciseList.size() - 1)
currentExercise = 0;
switch (currentExercise % 3) {
case 0:
image.setImageResource(R.drawable.train_left);
image_mid.setImageResource(android.R.color.transparent);
image_right.setImageResource(R.drawable.train_right);
break;
case 1:
image.setImageResource(android.R.color.transparent);
image_mid.setImageResource(R.drawable.train_left);
image_right.setImageResource(android.R.color.transparent);
break;
case 2:
image.setImageResource(android.R.color.transparent);
image_mid.setImageResource(R.drawable.train_right);
image_right.setImageResource(android.R.color.transparent);
break;
}
description.setText(exerciseList.get(currentExercise).getDescription());
//finish();
break;
}
}
private void update() {
breakTime++;
switch (breakTime) {
case 10:
System.out.println("Time for Exercise: Left!");
image_mid.setImageResource(R.drawable.train_left);
image_right.setImageResource(android.R.color.transparent);
image.setImageResource(android.R.color.transparent);
side_repetition.setText("Side/Repetition 1");
break;
case 20:
System.out.println("Time for Exercise: Right!");
image_mid.setImageResource(R.drawable.train_right);
side_repetition.setText("Side/Repetition 2");
break;
case 30:
System.out.println("Next Exercise!");
image.setImageResource(R.drawable.train_left);
image_mid.setImageResource(android.R.color.transparent);
image_right.setImageResource(R.drawable.train_right);
breakTime = 0;
currentExercise++;
description.setText(exerciseList.get(currentExercise).getDescription());
side_repetition.setText("Break");
}
}
}

View file

@ -0,0 +1,145 @@
package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder;
import android.content.Context;
import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
public class DBHandler extends SQLiteOpenHelper {
private Context mContext;
private SQLiteDatabase dataBase;
private static final String DATABASE_NAME = "exercises.sqlite";
private static final String DATABASE_PATH = "/data/data/orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder/databases/";
private static final int DATABASE_VERSION = 1;
private static String DEVICE_LANGUAGE = "";
public static final String EXERCISES_ID = "id";
public static final String EXERCISES_IMAGE_ID = "imageID";
public static final String EXERCISES_SECTION = "section";
public static final String EXERCISES_DESCRIPTION = "description";
public static final String EXERCISES_EXECUTION = "execution";
public DBHandler(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);
mContext = context;
DEVICE_LANGUAGE = Locale.getDefault().getLanguage();
System.out.println("Current Language: " + DEVICE_LANGUAGE);
//If Database exists open
if (checkDataBase()) {
openDataBase();
} else {
try {
this.getReadableDatabase();
copyDataBase();
this.close();
openDataBase();
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void onCreate(SQLiteDatabase db) {
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
}
public List<Exercise> getExercises() {
Exercise exercise;
List<Exercise> exerciseList = new ArrayList<>();
dataBase = this.getReadableDatabase();
Cursor res = dataBase.rawQuery("SELECT * FROM EXERCISES_" + DEVICE_LANGUAGE, null);
res.moveToFirst();
while (!res.isAfterLast()) {
exercise = new Exercise(res.getInt(0), res.getString(1), res.getString(2), res.getInt(3), res.getString(4));
exerciseList.add(exercise);
res.moveToNext();
}
res.close();
return exerciseList;
}
public List<Exercise> getExercisesFromSection(String section) {
Exercise exercise;
List<Exercise> exerciseList = new ArrayList<>();
dataBase = this.getReadableDatabase();
if (DEVICE_LANGUAGE.equals("de"))
section = "nacken";
Cursor res = dataBase.rawQuery("SELECT * FROM EXERCISES_" + DEVICE_LANGUAGE + " WHERE " + EXERCISES_SECTION + " LIKE " + "\"%" + section + "%\"", null);
res.moveToFirst();
while (!res.isAfterLast()) {
exercise = new Exercise(res.getInt(0), res.getString(1), res.getString(2), res.getInt(3), res.getString(4));
exerciseList.add(exercise);
res.moveToNext();
}
res.close();
return exerciseList;
}
private boolean checkDataBase() {
dataBase = null;
boolean exist = false;
try {
String dbPath = DATABASE_PATH + DATABASE_NAME;
dataBase = SQLiteDatabase.openDatabase(dbPath, null,
SQLiteDatabase.OPEN_READONLY);
} catch (SQLiteException e) {
Log.v("db log", "Database doesn't exist!!");
}
if (dataBase != null) {
exist = true;
closeDataBase();
}
return exist;
}
public void openDataBase() throws SQLException {
String dbPath = DATABASE_PATH + DATABASE_NAME;
dataBase = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.OPEN_READWRITE);
}
public void closeDataBase() {
if (dataBase != null)
dataBase.close();
}
private void copyDataBase() throws IOException {
InputStream myInput = mContext.getAssets().open(DATABASE_NAME);
String outFileName = DATABASE_PATH + DATABASE_NAME;
OutputStream myOutput = new FileOutputStream(outFileName);
byte[] buffer = new byte[1024];
int length;
while ((length = myInput.read(buffer)) > 0) {
myOutput.write(buffer, 0, length);
}
myOutput.flush();
myOutput.close();
myInput.close();
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

View file

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
@ -10,72 +11,118 @@
tools:context="orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder.BreakActivity">
<TextView
android:id="@+id/break_exercise_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/_10_00"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="@string/exercise_type"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/textViewBreak"
android:layout_width="160dp"
android:layout_height="130dp"
android:layout_below="@+id/break_exercise_type"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:background="@drawable/circle"
android:clickable="true"
android:enabled="true"
android:textStyle="bold"
android:textSize="60sp"
android:gravity="center"
android:text="@string/_10_00"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textIsSelectable="false"
android:layout_centerHorizontal="true" />
android:textSize="50sp"
android:textStyle="bold" />
<Button
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/break_play_stop"
android:id="@+id/button_playStopBreak"
android:layout_below="@+id/textViewBreak"
android:background="@drawable/button_normal"
android:layout_centerHorizontal="true" />
<Button
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/break_cancel"
android:id="@+id/button_cancel"
android:layout_alignParentBottom="true"
android:background="@drawable/button_normal"
android:layout_centerHorizontal="true" />
<HorizontalScrollView
<TextView
android:id="@+id/textSideRepetition"
android:layout_width="match_parent"
android:layout_height="92dp"
android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/textViewBreak"
android:layout_alignLeft="@+id/textViewBreak"
android:layout_alignRight="@+id/textViewBreak"
android:layout_alignStart="@+id/textViewBreak"
android:layout_below="@+id/textViewBreak"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/side_repetition"
android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView
android:id="@+id/imageView"
android:layout_width="fill_parent"
android:layout_height="80dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:id="@+id/horizontalScrollView2">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:id="@+id/layout_break">
</LinearLayout>
</HorizontalScrollView>
android:layout_alignWithParentIfMissing="false"
android:layout_below="@+id/textSideRepetition"
android:layout_toLeftOf="@+id/break_exercise_type"
android:layout_toStartOf="@+id/break_exercise_type"
android:contentDescription="Current Exercise" />
<TextView
<ImageView
android:id="@+id/imageMid"
android:layout_width="fill_parent"
android:layout_height="120dp"
android:layout_alignBottom="@+id/imageView"
android:layout_alignEnd="@+id/break_exercise_type"
android:layout_alignRight="@+id/break_exercise_type"
android:layout_alignWithParentIfMissing="false"
android:layout_below="@+id/textSideRepetition"
android:layout_toRightOf="@+id/imageView"
android:contentDescription="Current Exercise" />
<ImageView
android:id="@+id/imageRight"
android:layout_width="fill_parent"
android:layout_height="80dp"
android:layout_alignTop="@+id/imageMid"
android:layout_alignWithParentIfMissing="false"
android:layout_toEndOf="@+id/imageMid"
android:layout_toRightOf="@+id/imageMid"
android:contentDescription="Current Exercise" />
<Button
android:id="@+id/button_next"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/name_of_the_exercise"
android:id="@+id/textViewExercise"
android:layout_above="@+id/horizontalScrollView2"
android:layout_centerHorizontal="true" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/break_explanation"
android:id="@+id/textViewDescription"
android:layout_below="@+id/horizontalScrollView2"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:gravity="center" />
android:background="@drawable/button_normal"
android:text="@string/break_next"
android:textColor="@color/white" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/button_next"
android:layout_alignEnd="@+id/imageRight"
android:layout_alignRight="@+id/imageRight"
android:layout_below="@+id/imageMid">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/textViewDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="41dp"
android:gravity="left|center"
android:text="@string/break_explanation"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="30dp" />
</LinearLayout>
</ScrollView>
</RelativeLayout>

View file

@ -97,6 +97,7 @@
<string name="add_widget">Add widget</string>
<!-- settings for BreakActivity -->
<string name="break_next">Next</string>
<string name="exercise_summary">Your break will contain exercises for:</string>
<string name="continuously">If checked, there will be no possibillity to skip the exercises</string>
<string name="exercise_description">Make sure, to select some exercises! If nothing is selected, there will be no training in the breaks!</string>
@ -133,5 +134,6 @@
<string name="help_break_screen_title">Break Screen</string>
<string name="help_break_screen">PLACEHOLDER</string>
<string name="help_click_information">To see the images in real size simply click on them. To return back to this view re-click on the image!</string>
<string name="side_repetition">Side/Repetition</string>
</resources>