public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Placeholder styling of overlay buttons.

Browse source
This commit is contained in:
ojiikun 2013-08-13 06:50:17 +00:00
parent ca31679c4d
commit d84b119b67
9 changed files with 51 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
clients/android/NewsBlur/res/drawable/overlay_left_arrow_disabled.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
clients/android/NewsBlur/res/drawable/overlay_left_arrow_enabled.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
clients/android/NewsBlur/res/drawable/overlay_right_arrow_enabled.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
clients/android/NewsBlur/res/drawable/overlay_right_check.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

5
clients/android/NewsBlur/res/drawable/selector_overlay_left_icon.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_enabled="false" android:drawable="@drawable/overlay_left_arrow_disabled" />
<item android:state_enabled="true" android:drawable="@drawable/overlay_left_arrow_enabled" />
</selector>

5
clients/android/NewsBlur/res/drawable/selector_overlay_right_icon.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_enabled="false" android:drawable="@drawable/overlay_right_check" />
<item android:state_enabled="true" android:drawable="@drawable/overlay_right_arrow_enabled" />
</selector>

45
clients/android/NewsBlur/res/layout/activity_reading.xml
View file

@ -14,26 +14,37 @@
android:layout_height="1dip" android:layout_height="1dip"
android:layout_alignParentTop="true" /> android:layout_alignParentTop="true" />
<Button <LinearLayout
android:id="@+id/reading_overlay_next"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="8dp"
android:layout_marginRight="8dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true" >
android:layout_marginBottom="10dp"
android:layout_marginRight="10dp"
android:text="next"
android:onClick="overlayNext" />
<Button <Button
android:id="@+id/reading_overlay_prev" android:id="@+id/reading_overlay_left"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:text=" "
android:layout_toLeftOf="@+id/reading_overlay_next" android:textSize="12sp"
android:layout_marginBottom="10dp" android:layout_marginRight="8dp"
android:layout_marginRight="15dp" android:padding="6dp"
android:text="prev" android:drawableLeft="@drawable/selector_overlay_left_icon"
android:onClick="overlayPrev" /> android:onClick="overlayLeft" />
<Button
android:id="@+id/reading_overlay_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/overlay_next"
android:textColor="@color/half_darkgray"
android:textSize="12sp"
android:padding="6dp"
android:drawableRight="@drawable/selector_overlay_right_icon"
android:onClick="overlayRight" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>

3
clients/android/NewsBlur/res/values/strings.xml
View file

@ -58,6 +58,9 @@
<string name="save_this">SAVE THIS STORY</string> <string name="save_this">SAVE THIS STORY</string>
<string name="share_this">SHARE THIS STORY</string> <string name="share_this">SHARE THIS STORY</string>
<string name="overlay_next">NEXT</string>
<string name="overlay_done">DONE</string>
<string name="reply_to">Reply to \"%s\"</string> <string name="reply_to">Reply to \"%s\"</string>
<string name="alert_dialog_ok">Okay</string> <string name="alert_dialog_ok">Okay</string>

19
clients/android/NewsBlur/src/com/newsblur/activity/Reading.java
View file

@ -56,7 +56,7 @@ public abstract class Reading extends NbFragmentActivity implements OnPageChange
protected int currentState; protected int currentState;
protected ViewPager pager; protected ViewPager pager;
protected Button overlayPrev, overlayNext; protected Button overlayLeft, overlayRight;
protected FragmentManager fragmentManager; protected FragmentManager fragmentManager;
protected ReadingAdapter readingAdapter; protected ReadingAdapter readingAdapter;
protected ContentResolver contentResolver; protected ContentResolver contentResolver;
@ -76,8 +76,8 @@ public abstract class Reading extends NbFragmentActivity implements OnPageChange
super.onCreate(savedInstanceBundle); super.onCreate(savedInstanceBundle);
setContentView(R.layout.activity_reading); setContentView(R.layout.activity_reading);
this.overlayNext = (Button) findViewById(R.id.reading_overlay_next); this.overlayLeft = (Button) findViewById(R.id.reading_overlay_left);
this.overlayPrev = (Button) findViewById(R.id.reading_overlay_prev); this.overlayRight = (Button) findViewById(R.id.reading_overlay_right);
fragmentManager = getSupportFragmentManager(); fragmentManager = getSupportFragmentManager();
@ -206,14 +206,15 @@ public abstract class Reading extends NbFragmentActivity implements OnPageChange
} }
private void setOverlayAlpha(float a) { private void setOverlayAlpha(float a) {
UIUtils.setViewAlpha(this.overlayPrev, a); UIUtils.setViewAlpha(this.overlayLeft, a);
UIUtils.setViewAlpha(this.overlayNext, a); UIUtils.setViewAlpha(this.overlayRight, a);
} }
private void enableOverlays() { private void enableOverlays() {
int page = this.pager.getCurrentItem(); int page = this.pager.getCurrentItem();
this.overlayPrev.setEnabled(page > 0); this.overlayLeft.setEnabled(page > 0);
this.overlayNext.setEnabled(page < (this.readingAdapter.getCount()-1)); this.overlayRight.setEnabled(page < (this.readingAdapter.getCount()-1));
this.overlayRight.setText((page < (this.readingAdapter.getCount()-1)) ? R.string.overlay_next : R.string.overlay_done);
} }
@Override @Override
@ -301,11 +302,11 @@ public abstract class Reading extends NbFragmentActivity implements OnPageChange
public void onStopTrackingTouch(SeekBar seekBar) { public void onStopTrackingTouch(SeekBar seekBar) {
} }
public void overlayNext(View v) { public void overlayRight(View v) {
pager.setCurrentItem(pager.getCurrentItem()+1, true); pager.setCurrentItem(pager.getCurrentItem()+1, true);
} }
public void overlayPrev(View v) { public void overlayLeft(View v) {
pager.setCurrentItem(pager.getCurrentItem()-1, true); pager.setCurrentItem(pager.getCurrentItem()-1, true);
} }