diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2d28fef5067089beb235c45e4c3831cff66b6b01..e5afcfacc2c476c4a93c4680908e0fb1fefb42ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:supportsRtl="true" android:largeHeap="true" android:theme="@style/AppTheme"> - <activity android:name=".MainActivity"> + <activity android:name=".SitupActivity`"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java new file mode 100644 index 0000000000000000000000000000000000000000..f2c55050bdaced806e8df2b83252ff0e13579fcf --- /dev/null +++ b/app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java @@ -0,0 +1,31 @@ +package com.example.leo.fitnessdiy; + +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.View; + +/** + * Created by Heil on 2/19/2018. + */ + +public class SitupActivity extends AppCompatActivity{ + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_situp); + } + + public void openVideo(View view) { + String url = (String)view.getTag(); + + Intent intent = new Intent(); + intent.setAction(Intent.ACTION_VIEW); + intent.addCategory(Intent.CATEGORY_BROWSABLE); + + intent.setData(Uri.parse(url)); + startActivity(intent); + } +} diff --git a/app/src/main/res/drawable/pushup_video1.png b/app/src/main/res/drawable/pushup_video_1.png similarity index 100% rename from app/src/main/res/drawable/pushup_video1.png rename to app/src/main/res/drawable/pushup_video_1.png diff --git a/app/src/main/res/drawable/pushup_video2.png b/app/src/main/res/drawable/pushup_video_2.png similarity index 100% rename from app/src/main/res/drawable/pushup_video2.png rename to app/src/main/res/drawable/pushup_video_2.png diff --git a/app/src/main/res/drawable/situp_video_1.png b/app/src/main/res/drawable/situp_video_1.png new file mode 100644 index 0000000000000000000000000000000000000000..09dd0f57d2ee8808b76de822bd7ebebd5145e2df Binary files /dev/null and b/app/src/main/res/drawable/situp_video_1.png differ diff --git a/app/src/main/res/drawable/situp_video_2.png b/app/src/main/res/drawable/situp_video_2.png new file mode 100644 index 0000000000000000000000000000000000000000..63075dafe854147faa9e46291dd9f30eabd916d2 Binary files /dev/null and b/app/src/main/res/drawable/situp_video_2.png differ diff --git a/app/src/main/res/layout/activity_pushup.xml b/app/src/main/res/layout/activity_pushup.xml index 174aad103fa2aa91563d3e0d2a765aa080f24197..fa868f51b942b0c7338e2dfb35632dccd2d48e42 100644 --- a/app/src/main/res/layout/activity_pushup.xml +++ b/app/src/main/res/layout/activity_pushup.xml @@ -52,7 +52,7 @@ <ImageView android:layout_width="260dp" android:layout_height="158dp" - android:src="@drawable/pushup_video1" /> + android:src="@drawable/pushup_video_1" /> <TextView android:layout_width="wrap_content" @@ -73,7 +73,7 @@ <ImageView android:layout_width="258dp" android:layout_height="148dp" - android:src="@drawable/pushup_video2" /> + android:src="@drawable/pushup_video_2" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/activity_situp.xml b/app/src/main/res/layout/activity_situp.xml new file mode 100644 index 0000000000000000000000000000000000000000..7abc8d0167113352287b610a44998bdab1e6eba4 --- /dev/null +++ b/app/src/main/res/layout/activity_situp.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:context="com.example.leo.fitnessdiy.PushupActivity"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="100dp" + android:text="@string/situp" /> + <!--<Button--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:layout_gravity="center_horizontal"--> + <!--android:layout_marginBottom="30dp"--> + <!--android:onClick="countDownPlank"--> + <!--android:text="start" />--> + + <!--<TextView--> + <!--android:id="@+id/count_timer"--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:layout_gravity="center_horizontal"--> + <!--android:textSize="32sp"--> + <!--android:text="2 : 00" />--> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="30dp" + android:text="@string/situp_video" /> + + + + <!--<ScrollView--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content">--> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:clickable="true" + android:focusable="true" + android:onClick="openVideo" + android:orientation="horizontal" + android:tag="https://www.youtube.com/watch?v=IODxDxX7oi4"> + + <ImageView + android:layout_width="260dp" + android:layout_height="158dp" + android:src="@drawable/situp_video_1" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/situp_demo" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" + android:tag="https://www.youtube.com/watch?v=lHjj5vmzpy0" + android:clickable="true" + android:focusable="true" + android:onClick="openVideo" + android:layout_margin="4dp"> + + <ImageView + android:layout_width="258dp" + android:layout_height="148dp" + android:src="@drawable/situp_video_2" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/motivation_situp"/> + </LinearLayout> + + <!--</ScrollView>--> + + +</LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a71b3740580515963df1478ba2fcdd0ec4ed7bde..fa66b1961ce6fd78ecf0fdfc4d734b403d088cf8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,4 +22,8 @@ <string name="motivation_pushup">Push Up Challenge : Before and After</string> <string name="pushup_demo">How to Push Up Properly</string> <string name="pushup_video">Push Up Video</string> + <string name="situp">Sit Up</string> + <string name="motivation_situp">Sit Up Challenge : Before and After</string> + <string name="situp_demo">How to do sit up properly</string> + <string name="situp_video">Sit Up Video</string> </resources>