Skip to content
This repository was archived by the owner on Mar 17, 2019. It is now read-only.

ripple effects for buttons on Android L #57

Merged
stowellm merged 2 commits into from
Dec 4, 2014
Merged

ripple effects for buttons on Android L #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66a5b52
ripple effects for buttons
bdonald25 Dec 4, 2014
56b6631
fixed logic for chevron
bdonald25 Dec 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Apps/Motion/res/layout-v11/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
android:id="@+id/leftChevron"
android:layout_width="40dp"
android:layout_height="60dp"
style="?android:borderlessButtonStyle"
android:layout_toLeftOf="@+id/leftChevron"
android:layout_alignParentLeft="true"
android:text="@string/font_awesome_icon_left_chevron"
Expand All @@ -30,6 +31,7 @@
android:id="@+id/rightChevron"
android:layout_width="40dp"
android:layout_height="60dp"
style="?android:borderlessButtonStyle"
android:layout_alignParentRight="true"
android:background="@drawable/chevron"
android:textColor="@android:color/white"
Expand All @@ -53,8 +55,9 @@
android:id="@+id/b_rate"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@drawable/button_rsense"
android:text="Rate"
style="?android:selectableItemBackground"
android:background="@drawable/button_rsense"
android:text="Rate"
android:layout_weight="1"
android:textColor="#0066FF"
android:textSize="14sp"
Expand Down Expand Up @@ -129,7 +132,7 @@

<Button
android:id="@+id/b_upload"
style="?android:attr/buttonBarButtonStyle"
style="?android:selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
Expand Down
157 changes: 157 additions & 0 deletions Apps/Motion/res/layout-v21/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<Button
android:id="@+id/leftChevron"
android:layout_width="40dp"
android:layout_height="60dp"
style="?android:borderlessButtonStyle"
android:layout_toLeftOf="@+id/leftChevron"
android:layout_alignParentLeft="true"
android:text="@string/font_awesome_icon_left_chevron"
android:textColor="@android:color/white"
android:background="@drawable/chevron"/>

<android.support.v4.view.ViewPager
android:id="@+id/viewpager_fields"
android:layout_width="match_parent"
android:layout_toRightOf="@+id/leftChevron"
android:layout_toLeftOf="@+id/rightChevron"
android:layout_height= "60dp"/>

<Button
android:id="@+id/rightChevron"
android:layout_width="40dp"
android:layout_height="60dp"
style="?android:borderlessButtonStyle"
android:layout_alignParentRight="true"
android:background="@drawable/chevron"
android:textColor="@android:color/white"
android:text="@string/font_awesome_icon_right_chevron" />

</RelativeLayout>

<LinearLayout
android:id="@+id/ll_rateanddurationbuttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp">
<TextView
android:id="@+id/tv_rate"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="5dp"
android:text="Rate:" />

<Button
android:id="@+id/b_rate"
android:layout_width="match_parent"
android:layout_height="40dp"
style="?android:selectableItemBackground"
android:background="@drawable/button_rsense"
android:text="Rate"
android:layout_weight="1"
android:textColor="#0066FF"
android:textSize="14sp"
android:textStyle="bold" />

<TextView
android:id="@+id/tv_length"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="5dp"
android:text="Length:" />

<Button
android:id="@+id/b_length"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_weight="1"
android:background="@drawable/button_rsense"
android:text="Length"
android:textColor="#0066FF"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>

<Button
android:id="@+id/startStop"
android:layout_width="fill_parent"
android:background="@drawable/button_rsense_ripple_green"
android:layout_height="0dp"
android:layout_marginBottom="10dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="10dp"
android:layout_weight="0.79"
android:text="@string/holdToStart"
android:textColor="#0066FF"
android:textSize="30sp" />

<RelativeLayout
android:id="@+id/rl_nameandlogin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp">

<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginRight="10dp"
android:gravity="left|center_vertical"
android:text="@string/nameWithColon" />

<Button
android:id="@+id/b_name"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_toRightOf="@id/tv_name"
android:background="@drawable/button_rsense"
android:text="@string/john_smith"
android:textColor="#0066FF"
android:textSize="14sp"
android:textStyle="bold" />

</RelativeLayout>

<LinearLayout
android:id="@+id/ll_project"
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal">

<Button
android:id="@+id/b_upload"
style="?android:selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/button_bar_green"
android:text="@string/upload"
android:textColor="#FFF"
android:textSize="14sp"
android:textStyle="bold" />

<Button
android:id="@+id/b_project"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/button_bar_rsense"
android:text="@string/genericproj"
android:textColor="#0066FF"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>

</LinearLayout>
2 changes: 1 addition & 1 deletion Apps/Motion/res/layout/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
android:layout_marginRight="20dp"
android:layout_marginTop="10dp"
android:layout_weight="0.79"
android:background="@drawable/button_rsense"
android:background="@drawable/button_rsense_ripple_green"
android:text="@string/holdToStart"
android:textColor="#0066FF"
android:textSize="30sp" />
Expand Down
34 changes: 24 additions & 10 deletions Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,16 @@ public void run() {
leftChevronB.setTypeface(typeface);
rightChevronB.setTypeface(typeface);


if (RecordingService.running) {
startStop.setBackgroundResource(R.drawable.button_rsense_green);
startStop.setText("Recording");
} else {
} else if(getApiLevel() < 21) {
startStop.setBackgroundResource(R.drawable.button_rsense);
startStop.setText("Hold to Start");
}
} else if(getApiLevel() >= 21) {
startStop.setBackgroundResource(R.drawable.button_rsense_ripple_green);
startStop.setText("Hold to Start");
}

SharedPreferences namePrefs = getSharedPreferences(
EnterName.PREFERENCES_KEY_USER_INFO, MODE_PRIVATE);
Expand Down Expand Up @@ -269,7 +271,11 @@ public void onReceive(Context context, Intent intent) {
invalidateOptionsMenu();

} else if(intent.hasExtra("BUTTONSTOP")) {
startStop.setBackgroundResource(R.drawable.button_rsense);
if(getApiLevel() < 21) {
startStop.setBackgroundResource(R.drawable.button_rsense);
} else {
startStop.setBackgroundResource(R.drawable.button_rsense_ripple_green);
}
startStop.setText("Hold to Start");

useMenu = true;
Expand All @@ -295,8 +301,12 @@ public boolean onLongClick(View arg0) {
mMediaPlayer.start();

if (RecordingService.running) {
startStop.setBackgroundResource(R.drawable.button_rsense);
startStop.setText("Hold to Start");
if(getApiLevel() < 21) {
startStop.setBackgroundResource(R.drawable.button_rsense);
} else {
startStop.setBackgroundResource(R.drawable.button_rsense_ripple_green);
}
startStop.setText("Hold to Start");
useMenu = true;
if (android.os.Build.VERSION.SDK_INT >= 11)
invalidateOptionsMenu();
Expand Down Expand Up @@ -380,8 +390,8 @@ public void onClick(View v) {
@Override
public void onClick(View v) {
int current = fields.getCurrentItem();
if (current-1 > 0)
fields.setCurrentItem(current - 1);
if (current > 0)
fields.setCurrentItem(current-1);
}
});

Expand Down Expand Up @@ -433,8 +443,12 @@ public void onResume() {
//this sets the layout the correct layout for when it is not recording
//this is relevant if recording finishes while the app is in the background
if(!RecordingService.running) {
startStop.setBackgroundResource(R.drawable.button_rsense);
startStop.setText("Hold to Start");
if(getApiLevel() < 21) {
startStop.setBackgroundResource(R.drawable.button_rsense);
} else {
startStop.setBackgroundResource(R.drawable.button_rsense_ripple_green);
}
startStop.setText("Hold to Start");

useMenu = true;
if (android.os.Build.VERSION.SDK_INT >= 11)
Expand Down
21 changes: 21 additions & 0 deletions Libs/iSENSE Imports/res/drawable-v21/button_bar_green.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">

<item android:state_enabled="false"><shape>
<gradient android:angle="90" android:endColor="#C0C0C0" android:startColor="#B0B0B0" />

<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
</shape></item>
<item android:state_pressed="true"><shape>
<gradient android:angle="270" android:endColor="#265906" android:startColor="#2B6605" />

<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
</shape></item>
<item><shape>
<gradient android:angle="90" android:endColor="#46A807" android:startColor="#408911" />

<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
</shape></item>

</ripple>
21 changes: 21 additions & 0 deletions Libs/iSENSE Imports/res/drawable-v21/button_bar_rsense.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">

<item android:state_enabled="false"><shape>
<gradient android:angle="90" android:endColor="#C0C0C0" android:startColor="#B0B0B0" />

<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
</shape></item>
<item android:state_pressed="true"><shape>
<gradient android:angle="270" android:endColor="#D8D8D8" android:startColor="#D0D0D0" />

<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
</shape></item>
<item><shape>
<gradient android:angle="90" android:endColor="#D8D8D8" android:startColor="#E0E0E0" />

<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
</shape></item>

</ripple>
Loading