Skip to content

Commit

Permalink
Version 0.5.1 Updates: Layout Changes
Browse files Browse the repository at this point in the history
- Implement New Settings
- Create New Toolbar
- UX Changes Post to Steem Screen
  • Loading branch information
mcfarhat committed Nov 26, 2018
1 parent 39b79b7 commit 9998246
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 20 deletions.
8 changes: 0 additions & 8 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@
android:textSize="20dp"
/>
</LinearLayout>
<TextView
android:id="@+id/fitbitweight"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:paddingBottom="30dp"
android:gravity="left"
android:textColor="@color/actifitRed"
android:textSize="20dp" />

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
Expand Down
46 changes: 37 additions & 9 deletions app/src/main/res/layout/activity_post_steemit.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>



<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:id="@+id/post_steemit_container"
>

<include
android:id="@+id/post_toolbar"
layout="@layout/toolbar_post_steemit"
/>


<android.support.v4.widget.NestedScrollView
android:layout_height="match_parent"
Expand All @@ -15,6 +22,7 @@
android:id="@+id/nestedScrollView"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="50dp"
android:layout_weight="5">

<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
Expand Down Expand Up @@ -136,16 +144,36 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/full_afit_pay" />

<EditText
android:id="@+id/steemit_step_count"

<LinearLayout
android:id="@+id/activity_data_section"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ems="10"
android:enabled="false"
android:inputType="textMultiLine"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/steemit_step_count_lbl" />
app:layout_constraintTop_toBottomOf="@+id/steemit_step_count_lbl">

<EditText
android:id="@+id/steemit_step_count"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:ems="10"
android:enabled="false"
android:inputType="textMultiLine"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/steemit_step_count_lbl" />

<Button
android:id="@+id/fitbit_sync"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:ems="10"
android:text="FITBIT SYNC"
/>

</LinearLayout>

<TextView
android:id="@+id/steemit_activity_type_lbl"
Expand All @@ -156,7 +184,7 @@
android:text="Activity Type"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/steemit_step_count" />
app:layout_constraintTop_toTopOf="@+id/activity_data_section" />


<io.actifit.fitnesstracker.actifitfitnesstracker.MultiSelectionSpinner
Expand Down Expand Up @@ -513,7 +541,7 @@

</android.support.v4.widget.NestedScrollView>

<LinearLayout
<!--<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
Expand All @@ -531,6 +559,6 @@
android:layout_weight="1"
/>
</LinearLayout>
</LinearLayout>-->

</RelativeLayout>
42 changes: 39 additions & 3 deletions app/src/main/res/layout/activity_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,42 @@

</RelativeLayout>

<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />

<TextView
android:id="@+id/steem_post_payout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:textSize="18dp"
android:text="STEEM Post Payout" />

<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:orientation="horizontal"
android:paddingLeft="20dp">

<RadioButton
android:id="@+id/sbd_sp_pay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="50% SBD - 50% SP"
/>

<RadioButton
android:id="@+id/full_sp_pay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="100% SP" />

</RadioGroup>

<View
android:id="@+id/divider"
android:layout_width="match_parent"
Expand All @@ -137,15 +173,15 @@

<TextView
android:id="@+id/available_measure_systems"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:textSize="18dp"
android:text="Measurement System" />

<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:orientation="horizontal"
Expand Down Expand Up @@ -173,7 +209,7 @@

<TextView
android:id="@+id/donate_charity_lbl"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Donate to Charity"
android:paddingLeft="20dp"
Expand Down
35 changes: 35 additions & 0 deletions app/src/main/res/layout/toolbar_post_steemit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/colorPrimary"
android:elevation="4dp"
>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Actifit Fitness Tracker"
android:textSize="20sp"
android:textColor="@color/ic_launcher_background"
android:paddingRight="10dp"
/>

<android.support.v7.widget.AppCompatButton
android:id="@+id/post_to_steem_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Post to Steem"
android:layout_gravity="right"
android:textSize="16sp"
android:textColor="@color/colorPrimary"
android:shadowColor="#A8A8A8"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="5"
app:backgroundTint="@color/colorWhite"
/>

</android.support.v7.widget.Toolbar>

0 comments on commit 9998246

Please sign in to comment.