Skip to content

myslałem, że wysłałem tę poprawkę dawno #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jskudlarski wants to merge 12 commits into
base: master
Choose a base branch
from
Open

myslałem, że wysłałem tę poprawkę dawno #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8a643bd
chyba juz się nie wywala tam gdzie wcześniej + po mojej ostatniej
Jan 6, 2014
c5529e7
Button to generate repeats
Jan 15, 2014
ea75bf4
fixed speech synthezator
Jan 15, 2014
705b272
you can change multimedia sound volume in Main screen and activity
Jan 23, 2014
bdf7597
poprawilem trochę blędów
Jan 26, 2014
c7ba6aa
removed one bug, removed repeats from workout and db (repeats are
Jan 30, 2014
cae9eff
google analytics stuff
Jan 31, 2014
816e39f
google analitics added id
Jan 31, 2014
a719d55
removed not working tests, fixed chart labels a bit (we have to test it
jskudlarski Mar 12, 2014
f4bc7fb
activity no map xml scheme
jskudlarski Mar 12, 2014
05d3158
not finished!!! I just need to move it to another computer
jskudlarski Mar 12, 2014
7a7f400
just making a backup
jskudlarski Mar 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ZPI1/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
android:configChanges="orientation"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name=".ActivityNoMapActivity"
android:configChanges="orientation"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name=".HistoryActivity"
android:configChanges="orientation"
Expand Down
Binary file added ZPI1/libs/libGoogleAnalyticsServices.jar
View file
Open in desktop
Binary file not shown.
Binary file added ZPI1/map_icon-web.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ZPI1/res/drawable-hdpi/map_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ZPI1/res/drawable-mdpi/map_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ZPI1/res/drawable-xhdpi/map_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ZPI1/res/drawable-xxhdpi/map_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions ZPI1/res/layout/activity_activity_buttons_and_display.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,5 +245,13 @@
android:layout_marginBottom="@dimen/very_small_margin"
android:background="@color/activity_blue"
android:src="@drawable/ic_gps_arrow" />

<ImageButton
android:id="@+id/imageButtonGoToActivityNoMap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/activity_button_background" />

</RelativeLayout>
145 changes: 145 additions & 0 deletions ZPI1/res/layout/activity_nomap_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gps="http://schemas.android.com/apk/res/com.pwr.zpi"
android:layout_width="match_parent"
android:layout_height="match_parent" >

<ImageButton
android:id="@+id/imageButtonGoToActivityActivity"
android:layout_width="@dimen/activity_button_size"
android:layout_height="0dp"
android:layout_alignBottom="@+id/linearLayoutNoMapField3_4"
android:layout_alignParentLeft="true"
android:layout_alignTop="@+id/linearLayoutNoMapField3_4"
android:layout_margin="@dimen/very_small_margin"
android:background="@color/activity_blue"
android:src="@drawable/map_icon" />

<LinearLayout
android:id="@+id/linearLayoutNoMapField1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/linearLayoutNoMapField2" >

<include
android:id="@+id/layoutNoMapField1"
layout="@layout/big_data_field" />
</LinearLayout>

<LinearLayout
android:id="@+id/linearLayoutNoMapField2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/linearLayoutNoMapField3_4" >

<include
android:id="@+id/layoutNoMapField2"
layout="@layout/big_data_field" />
</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="wrap_content">
</View>
<!-- Z jakiegoś powodu bez tego nie działa.... -->

<LinearLayout
android:id="@+id/linearLayoutNoMapField3_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/imageButtonGoToActivityActivity"
android:orientation="vertical" >

<include
android:id="@+id/layoutNoMapField3"
layout="@layout/big_data_field" />

<include
android:id="@+id/layoutNoMapField4"
layout="@layout/big_data_field" />
</LinearLayout>

<LinearLayout
android:id="@+id/linearLayoutGPSBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/linearLayoutNoMapStartStop"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:background="@color/activity_blue"
android:paddingLeft="@dimen/buttons_padding" >

<TextView
android:id="@+id/TextViewGPSAccuracy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gps_accuracy"
android:textColor="@color/white" />

<com.pwr.zpi.views.GPSSignalDisplayer
android:id="@+id/gpsDisplayerNoMapActivity"
android:layout_width="wrap_content"
android:layout_height="match_parent"
gps:displayType="narrow" />
</LinearLayout>

<LinearLayout
android:id="@+id/linearLayoutNoMapStartStop"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/activity_vertical_margin" >

<Button
android:id="@+id/buttonNoMapPause"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/very_small_margin"
android:layout_marginTop="@dimen/small_margin"
android:layout_weight="1"
android:background="@color/activity_blue"
android:clickable="false"
android:padding="@dimen/buttons_padding"
android:text="@string/pause"
android:textColor="@color/white" />

<Button
android:id="@+id/buttonNoMapStop"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_small_margin"
android:layout_marginTop="@dimen/small_margin"
android:layout_weight="1"
android:background="@color/activity_blue"
android:clickable="false"
android:padding="@dimen/buttons_padding"
android:text="@string/stop"
android:textColor="@color/white" />
</LinearLayout>

<Button
android:id="@+id/buttonNoMapResume"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/small_margin"
android:background="@color/activity_blue"
android:padding="@dimen/buttons_padding"
android:text="@string/resume"
android:textColor="@color/white"
android:visibility="gone" />

<TextView
android:id="@+id/textViewActivityNoMapCountDown"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textColor="@color/count_down_timer_color"
android:textSize="@dimen/count_down_timer_size" />

</RelativeLayout>
61 changes: 61 additions & 0 deletions ZPI1/res/layout/big_data_field.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >

<RelativeLayout
android:id="@+id/relativeLayoutNoMapField1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/very_small_margin"
android:layout_marginLeft="@dimen/very_small_margin"
android:layout_marginRight="@dimen/very_small_margin"
android:layout_marginTop="@dimen/very_small_margin"
android:background="@color/activity_blue" >

<TextView
android:id="@+id/textViewNoMapField1Discription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="@dimen/buttons_padding"
android:text="@string/time"
android:textColor="@color/white"
android:textSize="@dimen/medium_text_size" />

<TextView
android:id="@+id/textViewNoMapField1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/textViewNoMapField1Discription"
android:layout_below="@+id/textViewNoMapField1Discription"
android:layout_toLeftOf="@+id/textViewNoMapField1Unit"
android:gravity="center"
android:text="00:00:00 "
android:textColor="@color/white"
android:textSize="@dimen/bigger_text_size" />

<TextView
android:id="@+id/textViewNoMapField1Unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/textViewNoMapField1"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/textViewNoMapField1"
android:gravity="bottom"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_alignBottom="@+id/textViewNoMapField1Discription"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_alignTop="@+id/textViewNoMapField1Discription"
android:scaleType="fitEnd"
android:src="@drawable/down_arrow" />
</RelativeLayout>

</LinearLayout>
48 changes: 48 additions & 0 deletions ZPI1/res/layout/change_name_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >

<EditText
android:id="@+id/editTextChangeNameEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10" >

<requestFocus />
</EditText>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_vertical_margin" >

<Button
android:id="@+id/buttonChangeNameDialogOkButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/workouts_white_button_background"
android:padding="@dimen/buttons_bigger_padding"
android:text="@string/ok_caps"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/main_color"
android:textSize="@dimen/large_text_size"
android:textStyle="bold" />

<Button
android:id="@+id/buttonChangeNameDialogCancelButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/workouts_white_button_background"
android:padding="@dimen/buttons_bigger_padding"
android:text="@string/cancel_caps"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/main_color"
android:textSize="@dimen/large_text_size"
android:textStyle="bold" />
</LinearLayout>

</LinearLayout>
8 changes: 4 additions & 4 deletions ZPI1/res/layout/chart_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
chartview:gridLineColor="#E5E5E5"
chartview:gridLineWidth="1dp"
chartview:gridLinesHorizontal="5"
chartview:gridLinesVertical="5"
chartview:leftLabelWidth="40dp" />
chartview:gridLinesVertical="4"
chartview:leftLabelWidth="50dp" />

<RelativeLayout
android:id="@+id/progressBarSpeed"
Expand Down Expand Up @@ -82,8 +82,8 @@
chartview:gridLineColor="#E5E5E5"
chartview:gridLineWidth="1dp"
chartview:gridLinesHorizontal="5"
chartview:gridLinesVertical="5"
chartview:leftLabelWidth="40dp" />
chartview:gridLinesVertical="4"
chartview:leftLabelWidth="50dp" />

<RelativeLayout
android:id="@+id/progressBarAltitude"
Expand Down
Loading