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

Merge branch 'master' of https://github.com/SecUSo/privacy-friendly-break-reminder

Browse source
This commit is contained in:
Sergej A 2016-08-28 22:40:28 +02:00
commit 319cd44997
10 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml generated
View file

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

6
app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java
View file

@ -297,10 +297,10 @@ public class BreakReminder extends AppCompatActivity
// Handle the profile action
Intent intent = new Intent(this, SettingsActivity.class);
this.startActivity(intent);
} else if (id == R.id.nav_statistics) {
//} else if (id == R.id.nav_statistics) {
// Show statistics
Intent intent = new Intent(this, StatisticsActivity.class);
this.startActivity(intent);
//Intent intent = new Intent(this, StatisticsActivity.class);
//this.startActivity(intent);
} else if (id == R.id.nav_help) {
// Show help
Intent intent = new Intent(this, HelpActivity.class);

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

@ -4,10 +4,6 @@
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"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder.BreakActivity">
<TextView

5
app/src/main/res/layout/activity_break_decider.xml
View file

@ -3,10 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:layout_margin="10dp"
tools:context=".BreakDeciderActivity">
<Button

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

@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:layout_margin="20dp">
android:layout_margin="10dp">
<TextView
android:layout_width="100dp"

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

@ -9,7 +9,7 @@
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/activity_horizontal_margin">
android:layout_margin="10dp">
<TextView
android:layout_width="wrap_content"

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

@ -7,7 +7,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="20dp"
android:layout_margin="10dp"
android:orientation="vertical"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:scrollbars="vertical"
@ -58,7 +58,7 @@
android:layout_toRightOf="@+id/imageView"
android:text="@string/help_start_screen"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="7pt"
android:textSize="5pt"
android:layout_marginLeft="5dp"/>
<TextView

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

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="20dp">
android:layout_margin="10dp">
<ImageView

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

@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="1"
android:layout_margin="20dp">
android:layout_margin="10dp">
<RelativeLayout
android:layout_width="fill_parent"

3
app/src/main/res/menu/activity_break_reminder_drawer.xml
View file

@ -9,10 +9,11 @@
android:id="@+id/nav_settings"
android:icon="@drawable/ic_menu_manage"
android:title="@string/title_activity_settings" />
<item
<!--<item
android:id="@+id/nav_statistics"
android:icon="@drawable/drawer_statistic_logo"
android:title="@string/statistics" />
-->
</group>
<group android:checkableBehavior="single">