bitPickups/bitPicksAktivpause
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor fixes and added german translation.

Browse source
This commit is contained in:
Christopher Beckmann 2017-09-09 01:01:19 +02:00
commit 167e792d00
7 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -29,6 +29,6 @@ dependencies {
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.nex3z:flow-layout:1.0.0'
compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:+'
compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
testCompile 'junit:junit:4.12'
}

1
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/ExerciseActivity.java
View file

@ -152,7 +152,6 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo
breakTimerText.setTextColor(Color.WHITE);
breakTimerText.setTextSize(20);
breakTimerText.setGravity(center_vertical);
breakTimerText.setText("00:00");
breakTimerText.setPadding(16, 0, 16, 0);
//breakTimerText.set(10, 0, 10, 0);

4
app/src/main/res/layout/activity_exercise.xml
View file

@ -180,7 +180,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:text="Execution"
android:text="@string/execution"
android:textStyle="bold"
app:layout_constraintLeft_toRightOf="@+id/progressBarLayout"
app:layout_constraintTop_toBottomOf="@+id/section_card" />
@ -203,7 +203,7 @@
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="Description"
android:text="@string/description"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/exercise_image" />

2
app/src/main/res/layout/app_bar_break_reminder.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="org.secuso.privacyfriendlybreakreminder.org.secuso.privacyfriendlybreakreminder.privacyfriendlybreakreminder.BreakReminder">
tools:context="org.secuso.privacyfriendlybreakreminder.activities.old.BreakReminder">
<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"

4
app/src/main/res/layout/dialog_exercise.xml
View file

@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="0dp"
android:text="Execution"
android:text="@string/execution"
android:textStyle="bold"
app:layout_constraintLeft_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/section_card" />
@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:text="Description"
android:text="@string/description"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/exercise_image" />

2
app/src/main/res/layout/layout_exercise_set.xml
View file

@ -75,7 +75,7 @@
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:text="This set contains no exercises."
android:text="@string/set_contains_no_exercises"
android:textColor="@color/black"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

9
app/src/main/res/values/strings.xml
View file

@ -28,7 +28,7 @@
<!-- settings for BreakReminder -->
<string name="new_profile">New Profile...</string>
<string name="new_profile">New Profile…</string>
<string name="play_stop" translatable="false">Play/Stop</string>
<string name="reset" translatable="false">Reset</string>
<string name="break_reminder_time" translatable="false">30:00</string>
@ -148,7 +148,7 @@
<string name="tutorial_reset">Reset the clock</string>
<string name="tutorial_clock_description">By pressing one of them, the clock starts or stops</string>
<string name="tutorial_or">or</string>
<string name="tutorial_profile_description">By clicking on the current profile (\'Random\'), 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\nIn the beginning there will be 4 predefined profiles</string>
<string name="tutorial_profile_description">By clicking on the current profile (\'Random\'), 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\nIn the beginning there will be 4 predefined profiles</string>
<string name="tutorial_clock">Start/Stop the clock</string>
<string name="tutorial_description">Welcome to the Privacy Friendly Break Reminder</string>
<string name="pref_current_profile_value" translatable="false">0</string>
@ -180,7 +180,7 @@
<string name="activity_title_new_exercise_set">New Exercise Set</string>
<string name="dialog_add_exercise_set_setname">exercise set name</string>
<string name="dialog_add_exercise_set_title">Add New Exercise Set</string>
<string name="activity_title_break_reminder">@string/app_name</string>
<string name="activity_title_break_reminder" translatable="false">@string/app_name</string>
<string name="dialog_add_exercise_set_name">Exercise Set Name</string>
<string name="keep_editing">keep editing</string>
<string name="discard">discard</string>
@ -315,6 +315,9 @@
<string name="toast_please_select_an_item_to_delete">Please select an item to delete.</string>
<string name="dialog_end_break_confirmation">Do you want to go back to the main menu?</string>
<string name="dialog_end_break_confirmation_title">Break time is up!</string>
<string name="execution">Execution</string>
<string name="description">Description</string>
<string name="set_contains_no_exercises">This set contains no exercises.</string>
</resources>