TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DragButton wizard fragment

Browse Source
This commit is contained in:
serso 2015-01-29 21:32:21 +01:00
parent 3d358b60bf
commit a9ff72d36f
5 changed files with 121 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
android-app/src/main/java/org/solovyev/android/calculator/wizard/DragButtonWizardStep.java
View File

@ -23,7 +23,6 @@
package org.solovyev.android.calculator.wizard;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@ -40,9 +39,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Arrays;
import static android.view.View.GONE;
public class DragButtonWizardStep extends Fragment {
public class DragButtonWizardStep extends WizardFragment {
/*
**********************************************************************
@ -80,7 +77,15 @@ public class DragButtonWizardStep extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.cpp_wizard_step_drag_button, null);
final View view = super.onCreateView(inflater, container, savedInstanceState);
setupNextButton(R.string.acl_wizard_next);
setupPrevButton(R.string.acl_wizard_back);
return view;
}
@Override
protected int getViewResId() {
return R.layout.cpp_wizard_step_drag_button;
}
@Override
@ -116,7 +121,6 @@ public class DragButtonWizardStep extends Fragment {
private static enum DragButtonAction {
center(R.string.cpp_wizard_dragbutton_action_center, null),
up(R.string.cpp_wizard_dragbutton_action_up, DragDirection.up),
left(R.string.cpp_wizard_dragbutton_action_left, DragDirection.left),
down(R.string.cpp_wizard_dragbutton_action_down, DragDirection.down),
end(R.string.cpp_wizard_dragbutton_action_end, null);
@ -181,7 +185,7 @@ public class DragButtonWizardStep extends Fragment {
firstChange = true;
}
if (firstChange) {
descriptionTextView.setVisibility(GONE);
//descriptionTextView.setVisibility(GONE);
}
}
}

28
android-app/src/main/res/drawable-v21/metro_material_button.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
a:color="?attr/colorControlHighlight">
<item a:drawable="@drawable/metro_material_button_shape" />
</ripple>

28
android-app/src/main/res/drawable/metro_material_button.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed"/>
<item a:drawable="@drawable/metro_material_button_shape"/>
</selector>

26
android-app/src/main/res/drawable/metro_material_button_shape.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#5a595b"/>
<corners android:radius="1dp"/>
</shape>

55
android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
View File

@ -23,38 +23,39 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
xmlns:c="http://schemas.android.com/apk/res-auto"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:gravity="center"
a:orientation="vertical">
<TextView
a:id="@+id/wizard_dragbutton_description_textview"
a:text="@string/cpp_wizard_dragbutton_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"/>
a:id="@+id/wizard_dragbutton_description_textview"
a:text="@string/cpp_wizard_dragbutton_description"
style="@style/WizardLabel" />
<TextView
a:id="@+id/wizard_dragbutton_action_textview"
a:layout_marginTop="10dp"
a:textStyle="bold"
a:text="@string/cpp_wizard_dragbutton_action_center"
a:layout_height="wrap_content"
a:layout_width="match_parent"/>
a:id="@+id/wizard_dragbutton_action_textview"
a:textStyle="bold"
a:text="@string/cpp_wizard_dragbutton_action_center"
style="@style/WizardLabel"
a:minLines="2"
a:maxLines="2"/>
<org.solovyev.android.view.drag.DirectionDragButton
a:layout_margin="10dp"
a:layout_height="100dp"
a:layout_width="100dp"
a:minWidth="100dp"
a:minHeight="100dp"
a:layout_gravity="center"
a:id="@+id/wizard_dragbutton"
a:text="9"
c:textDown="^2"
c:textLeft="sin"
c:textUp="%"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_operation_button_style"/>
a:layout_margin="0dp"
a:layout_height="wrap_content"
a:layout_width="wrap_content"
a:minWidth="100dp"
a:minHeight="100dp"
a:layout_weight="0"
a:layout_gravity="center"
a:id="@+id/wizard_dragbutton"
a:background="@drawable/metro_material_button"
a:text="9"
c:textDown="^2"
c:textUp="%"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_control_button_style" />
</LinearLayout>