Skip to content

Commit

Permalink
improve video xml
Browse files Browse the repository at this point in the history
  • Loading branch information
sraturi committed Aug 31, 2020
1 parent 0216625 commit 24f07c2
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 52 deletions.
5 changes: 1 addition & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@
</activity>
<!-- windowSoftInputMode=adjustResize so that wizard's bottom buttons stay visible -->
<activity
android:name=".view.VideoActivity"
android:label="@string/title_activity_help"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
android:name=".view.VideoActivity" />
<activity
android:name=".view.ReadingActivity"
android:label="@string/title_activity_reading"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/cradle/neptune/sync/SyncStepper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.cradle.neptune.sync
/**
* This is the main interface for the whole sync process
* describes all the different steps required to do our one button sync
* There is a google doc that explains all the steps and the order of the steps as well
*/
interface SyncStepper {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class SyncStepperImplementation(

/**
* step 2 -> starts uploading readings and patients starting with patients.
* Be careful changing code in this function.
*/
override fun setupUploadingPatientReadings(lastSyncTime: Long) {
var newPatientsToUpload: ArrayList<PatientAndReadings>
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/java/com/cradle/neptune/view/VideoActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,16 @@ import android.os.Bundle
import android.widget.MediaController
import android.widget.VideoView
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import com.cradle.neptune.R

class VideoActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_help)
val toolbar =
findViewById<Toolbar>(R.id.toolbar)
setSupportActionBar(toolbar)
setContentView(R.layout.activity_video)

if (supportActionBar != null) {
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.title = "CRADLE VSA Instructions"
}
// setup UI components
// setupBottomBarNavigation();
Expand Down
Binary file modified app/src/main/res/drawable/poster_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 0 additions & 42 deletions app/src/main/res/layout/activity_help.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".view.VideoActivity"
tools:showIn="@layout/activity_help">
tools:showIn="@layout/activity_video">

<TextView
android:id="@+id/textView9"
Expand Down

0 comments on commit 24f07c2

Please sign in to comment.