Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to rounded buttons.

Browse Source
This commit is contained in:
Peter Serwylo 2017-03-14 14:59:10 +11:00
parent df5db32451
commit c275fae9b7
5 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/drawable/button_primary_background_selector.xml
View File

@ -2,25 +2,25 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="3dp" /> <corners android:radius="24dp" />
<solid android:color="@color/fdroid_blue_dark" /> <solid android:color="@color/fdroid_blue_dark" />
</shape> </shape>
</item> </item>
<item android:state_checked="true"> <item android:state_checked="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="3dp" /> <corners android:radius="24dp" />
<solid android:color="@color/fdroid_blue_dark" /> <solid android:color="@color/fdroid_blue_dark" />
</shape> </shape>
</item> </item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="3dp" /> <corners android:radius="24dp" />
<solid android:color="@color/fdroid_blue_dark" /> <solid android:color="@color/fdroid_blue_dark" />
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="3dp" /> <corners android:radius="24dp" />
<solid android:color="@color/fdroid_blue" /> <solid android:color="@color/fdroid_blue" />
</shape> </shape>
</item> </item>

8
app/src/main/res/drawable/button_secondary_background_selector.xml
View File

@ -2,25 +2,25 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="3dp" /> <corners android:radius="24dp" />
<solid android:color="@color/fdroid_blue" /> <solid android:color="@color/fdroid_blue" />
</shape> </shape>
</item> </item>
<item android:state_checked="true"> <item android:state_checked="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="3dp" /> <corners android:radius="24dp" />
<solid android:color="@color/fdroid_blue" /> <solid android:color="@color/fdroid_blue" />
</shape> </shape>
</item> </item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="3dp" /> <corners android:radius="24dp" />
<solid android:color="@color/fdroid_blue" /> <solid android:color="@color/fdroid_blue" />
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="3dp" /> <corners android:radius="24dp" />
<solid android:color="@android:color/white" /> <solid android:color="@android:color/white" />
<stroke android:color="@color/fdroid_blue" android:width="2dp" /> <stroke android:color="@color/fdroid_blue" android:width="2dp" />
</shape> </shape>

7
app/src/main/res/layout/app_details2_header.xml
View File

@ -114,6 +114,7 @@
android:layout_toRightOf="@id/icon" android:layout_toRightOf="@id/icon"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:clipToPadding="false"
android:visibility="gone" android:visibility="gone"
> >
@ -125,7 +126,8 @@
android:layout_weight="1" android:layout_weight="1"
android:maxLines="1" android:maxLines="1"
android:ellipsize="marquee" android:ellipsize="marquee"
android:text="THIS IS BUTTON 1" /> android:padding="12dp"
tools:text="THIS IS BUTTON 1" />
<Button <Button
android:id="@+id/primaryButtonView" android:id="@+id/primaryButtonView"
@ -137,7 +139,8 @@
android:layout_weight="1" android:layout_weight="1"
android:maxLines="1" android:maxLines="1"
android:ellipsize="marquee" android:ellipsize="marquee"
android:text="THIS IS 2" /> android:padding="12dp"
tools:text="THIS IS 2" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

18
app/src/main/res/layout/updateable_app_status_item.xml
View File

@ -32,14 +32,13 @@
android:ellipsize="end" android:ellipsize="end"
app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintEnd_toStartOf="@+id/action_button" app:layout_constraintEnd_toStartOf="@+id/action_button"
app:layout_constraintTop_toTopOf="@+id/icon" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/icon" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
tools:layout_editor_absoluteX="72dp" /> android:layout_marginTop="8dp"
app:layout_constraintVertical_bias="0.333" />
<ProgressBar <ProgressBar
android:id="@+id/progress_bar" android:id="@+id/progress_bar"
@ -73,15 +72,16 @@
<Button <Button
android:id="@+id/action_button" android:id="@+id/action_button"
style="@style/DetailsPrimaryButtonStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/icon" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/icon"
style="@style/DetailsPrimaryButtonStyle"
tools:text="Update" /> tools:text="Update" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

6
app/src/main/res/values/styles_detail.xml
View File

@ -14,11 +14,17 @@
<style name="DetailsPrimaryButtonStyle" parent="DetailsButtonStyle"> <style name="DetailsPrimaryButtonStyle" parent="DetailsButtonStyle">
<item name="android:textColor">#ffffff</item> <item name="android:textColor">#ffffff</item>
<item name="android:background">@drawable/button_primary_background_selector</item> <item name="android:background">@drawable/button_primary_background_selector</item>
<item name="android:padding">8dp</item>
<item name="android:minHeight">32dp</item>
<item name="android:minWidth">0dp</item>
</style> </style>
<style name="DetailsSecondaryButtonStyle" parent="DetailsButtonStyle"> <style name="DetailsSecondaryButtonStyle" parent="DetailsButtonStyle">
<item name="android:textColor">@color/fdroid_blue</item> <item name="android:textColor">@color/fdroid_blue</item>
<item name="android:background">@drawable/button_secondary_background_selector</item> <item name="android:background">@drawable/button_secondary_background_selector</item>
<item name="android:padding">8dp</item>
<item name="android:minHeight">32dp</item>
<item name="android:minWidth">0dp</item>
</style> </style>
<style name="DetailsMoreButtonStyle"> <style name="DetailsMoreButtonStyle">