Skip to content

Commit 33c5f44

Browse files
committed
added close button to reference ratings
1 parent 9249e89 commit 33c5f44

7 files changed

Lines changed: 29 additions & 6 deletions

File tree

2.29 KB
Loading
1.12 KB
Loading
2.05 KB
Loading
2.84 KB
Loading
4.72 KB
Loading

SUDEAU/res/layout/html_viewer_activity.xml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
android:id="@+id/ratingButton"
3030
android:layout_width="wrap_content"
3131
android:layout_height="wrap_content"
32-
android:src="@drawable/ic_erulet_new"
32+
android:src="@drawable/ic_star"
3333
android:layout_alignParentRight="true"
3434
android:layout_alignParentBottom="true"
3535
android:visibility="gone"/>
3636

37-
<LinearLayout
37+
<RelativeLayout
3838
android:id="@+id/ratingArea"
3939
android:layout_alignParentBottom="true"
4040
android:layout_alignParentLeft="true"
@@ -53,17 +53,31 @@
5353
android:layout_height="wrap_content"
5454
android:layout_marginLeft="5dp"
5555
android:padding="2dp"
56+
android:layout_alignParentLeft="true"
57+
android:layout_alignParentTop="true"
5658
android:textSize="@dimen/label_infoblock_highlighted"
5759
android:text="@string/your_rating"
5860
android:textColor="@color/blue_glow"
5961
android:background="@color/black"/>
6062

63+
<Button
64+
android:id="@+id/ratingAreaCloseButton"
65+
android:layout_width="wrap_content"
66+
android:layout_height="wrap_content"
67+
android:padding="2dp"
68+
android:layout_alignParentRight="true"
69+
android:layout_alignParentTop="true"
70+
android:text="x"/>
71+
72+
6173
<RatingBar
6274
android:id="@+id/ratBarUser"
6375
android:layout_width="wrap_content"
64-
android:layout_height="wrap_content" />
76+
android:layout_height="wrap_content"
77+
android:layout_marginTop="10dp"
78+
android:layout_below="@id/tvUserRating"/>
6579

66-
</LinearLayout>
80+
</RelativeLayout>
6781

6882
</RelativeLayout>
6983

SUDEAU/src/net/movelab/sudeau/HTMLViewerActivity.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import android.widget.ImageButton;
3838
import android.widget.LinearLayout;
3939
import android.widget.RatingBar;
40+
import android.widget.RelativeLayout;
4041
import android.widget.TextView;
4142

4243
public class HTMLViewerActivity extends FragmentActivity {
@@ -130,7 +131,7 @@ public void onClick(View view) {
130131
if(hl != null){
131132
Log.i("ratings", "hl not null");
132133

133-
final LinearLayout ratingArea = (LinearLayout) findViewById(R.id.ratingArea);
134+
final RelativeLayout ratingArea = (RelativeLayout) findViewById(R.id.ratingArea);
134135
final ImageButton ratingButton = (ImageButton) findViewById(R.id.ratingButton);
135136
ratingButton.setVisibility(View.VISIBLE);
136137
wv.setOnClickListener(new View.OnClickListener() {
@@ -141,6 +142,14 @@ public void onClick(View view) {
141142
}
142143
});
143144

145+
Button ratingAreaCloseButton = (Button) findViewById(R.id.ratingAreaCloseButton);
146+
ratingAreaCloseButton.setOnClickListener(new View.OnClickListener() {
147+
@Override
148+
public void onClick(View view) {
149+
ratingArea.setVisibility(View.GONE);
150+
ratingButton.setVisibility(View.VISIBLE);
151+
}
152+
});
144153
ratingButton.setOnClickListener(new View.OnClickListener() {
145154
@Override
146155
public void onClick(View view) {
@@ -153,7 +162,7 @@ public void onClick(View view) {
153162
TextView ratingLabel = (TextView) findViewById(R.id.tvUserRating);
154163
String rating_text = getString(R.string.your_rating);
155164
if(hl.getGlobalRating() >=0){
156-
rating_text = "Ave. rating: " + hl.getGlobalRating()+ "\n" + rating_text;
165+
rating_text = "Average rating: " + hl.getGlobalRating()+ "\n\n" + rating_text;
157166
}
158167
ratingLabel.setText(rating_text);
159168
RatingBar myRating = (RatingBar)findViewById(R.id.ratBarUser);

0 commit comments

Comments
 (0)