From dd0cb5e27b43d465fe9e471f523b1bc28367a8c5 Mon Sep 17 00:00:00 2001 From: Abhinav Raj Date: Fri, 10 Aug 2018 09:45:48 +0530 Subject: [PATCH 01/14] Added toolbar in multimeter activity (#1348) --- .../io/pslab/activity/MultimeterActivity.java | 4 + .../res/layout-hdpi/activity_multimeter.xml | 781 ++++++++--------- .../res/layout-xhdpi/activity_multimeter.xml | 784 ++++++++--------- .../main/res/layout/activity_multimeter.xml | 787 +++++++++--------- app/src/main/res/values-hdpi/dimens.xml | 10 +- app/src/main/res/values/dimens.xml | 16 +- 6 files changed, 1233 insertions(+), 1149 deletions(-) diff --git a/app/src/main/java/io/pslab/activity/MultimeterActivity.java b/app/src/main/java/io/pslab/activity/MultimeterActivity.java index 3729b7e12..f75773bc8 100644 --- a/app/src/main/java/io/pslab/activity/MultimeterActivity.java +++ b/app/src/main/java/io/pslab/activity/MultimeterActivity.java @@ -8,6 +8,7 @@ import android.support.design.widget.BottomSheetBehavior; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.SwitchCompat; +import android.support.v7.widget.Toolbar; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; @@ -39,6 +40,8 @@ public class MultimeterActivity extends AppCompatActivity { private ScienceLab scienceLab; + @BindView(R.id.multimeter_toolbar) + Toolbar mToolbar; @BindView(R.id.quantity) TextView quantity; @BindView(R.id.unit) @@ -88,6 +91,7 @@ protected void onCreate(final Bundle savedInstanceState) { ButterKnife.bind(this); scienceLab = ScienceLabCommon.scienceLab; knobMarker = getResources().getStringArray(io.pslab.R.array.multimeter_knob_states); + setSupportActionBar(mToolbar); setUpBottomSheet(); multimeter_data = this.getSharedPreferences(NAME, MODE_PRIVATE); knobState = multimeter_data.getInt("KnobState", 2); diff --git a/app/src/main/res/layout-hdpi/activity_multimeter.xml b/app/src/main/res/layout-hdpi/activity_multimeter.xml index 3a49674eb..6511aa533 100644 --- a/app/src/main/res/layout-hdpi/activity_multimeter.xml +++ b/app/src/main/res/layout-hdpi/activity_multimeter.xml @@ -2,439 +2,466 @@ - - - - - - + + - - + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + + + + android:layout_marginBottom="8dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/top_app_bar_layout"> - - + android:id="@+id/quantity" + android:layout_width="wrap_content" + android:layout_height="@dimen/multimeter_length_0" + android:layout_marginEnd="@dimen/multimeter_layout_margin" + android:layout_marginRight="@dimen/multimeter_layout_margin" + android:layout_marginTop="@dimen/multimeter_constraint_2" + android:textSize="@dimen/multimeter_quantity_dimen" + app:layout_constraintBottom_toTopOf="@+id/view" + app:layout_constraintEnd_toEndOf="@+id/display_box" + app:layout_constraintTop_toTopOf="@+id/display_box" /> + android:layout_marginEnd="@dimen/multimeter_layout_margin_2" + android:layout_marginLeft="@dimen/multimeter_layout_margin_2" + android:layout_marginRight="@dimen/multimeter_layout_margin_2" + android:layout_marginStart="@dimen/multimeter_layout_margin_2" + android:background="@android:color/darker_gray" + app:layout_constraintBottom_toTopOf="@+id/unit" + app:layout_constraintEnd_toEndOf="@+id/display_box" + app:layout_constraintStart_toStartOf="@+id/display_box" /> - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/display_box"> + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintCircle="@id/knobs" + app:layout_constraintCircleAngle="@string/multimeter_angle_12" + app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2" /> + android:textSize="@dimen/multimeter_bottombutton_textsize" + app:layout_constraintCircle="@id/knobs" + app:layout_constraintCircleAngle="@string/multimeter_angle_4" + app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1" /> + + - + - + - + - - - + - + - + - + - + - + - + - +