sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-21 13:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve button style

Browse source
This commit is contained in:
Phillip Thelen 2022-07-05 15:15:29 +02:00
parent 716544c902
commit 277ffe1626
7 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
View file

@ -44,7 +44,7 @@ class ContinuePhoneActivity : BaseActivity<ActivityContinuePhoneBinding, Continu
val set = AnimationSet(true)
set.interpolator = AnticipateOvershootInterpolator()
set.duration = 600
set.startOffset = 200
set.startOffset = 100
set.fillBefore = true
set.fillAfter = true
set.addAnimation(alphaAnimation)

13
wearos/src/main/res/layout/activity_login.xml
View file

@ -37,7 +37,7 @@
android:id="@+id/sign_in_on_phone_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ChipButton"
style="@style/ChipButton.Icon"
android:text="@string/sign_in_on_phone"
android:drawableStart="@drawable/handoff"
android:layout_marginBottom="@dimen/spacing_small"/>
@ -45,7 +45,7 @@
android:id="@+id/other_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ChipButton"
style="@style/ChipButton.Icon"
android:drawableStart="@drawable/ic_keyboard"
android:text="@string/other_options"/>
@ -57,7 +57,7 @@
android:drawableStart="@drawable/google_icon"
android:text="@string/login_btn_google"
android:layout_marginBottom="@dimen/spacing_small"
style="@style/ChipButton"/>
style="@style/ChipButton.Icon"/>
<Button
android:id="@+id/username_password_button"
android:layout_width="match_parent"
@ -65,14 +65,14 @@
android:text="@string/sign_in_password"
android:layout_marginBottom="@dimen/spacing_small"
android:drawableStart="@drawable/ic_keyboard"
style="@style/ChipButton"/>
style="@style/ChipButton.Icon"/>
<Button
android:id="@+id/register_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/create_account"
android:drawableStart="@drawable/handoff"
style="@style/ChipButton"/>
style="@style/ChipButton.Icon"/>
<EditText
android:id="@+id/username_edit_text"
@ -105,6 +105,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/sign_in"
style="@style/ChipButton.Purple"/>
style="@style/ChipButton.Purple"
android:textSize="16sp"/>
</LinearLayout>
</com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>

4
wearos/src/main/res/layout/activity_rya.xml
View file

@ -34,7 +34,6 @@
android:layout_height="wrap_content"
android:text="@string/review_dailies"
style="@style/ChipButton.Purple"
android:gravity="center"
android:layout_marginBottom="@dimen/spacing_small"/>
<Button
android:id="@+id/phone_button"
@ -42,7 +41,7 @@
android:layout_height="wrap_content"
android:text="@string/check_on_phone"
android:drawableStart="@drawable/handoff"
style="@style/ChipButton"
style="@style/ChipButton.Icon"
android:gravity="center"/>
<LinearLayout
@ -58,7 +57,6 @@
style="@style/ChipButton.Purple"
android:text="@string/start_new_day"
android:layout_marginTop="2dp"
android:gravity="center"
android:visibility="gone"/>
<TextView
android:layout_width="match_parent"

2
wearos/src/main/res/layout/activity_task_detail.xml
View file

@ -45,7 +45,7 @@
android:id="@+id/edit_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ChipButton"
style="@style/ChipButton.Icon"
android:drawableStart="@drawable/handoff"
android:text="@string/edit_on_phone"
android:layout_marginTop="12dp"/>

6
wearos/src/main/res/layout/activity_task_form.xml
View file

@ -39,9 +39,8 @@
android:id="@+id/save_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ChipButton"
style="@style/ChipButton.Icon"
android:text="@string/save"
android:gravity="start|center_vertical"
android:layout_marginTop="20dp"
android:layout_marginBottom="4dp"
android:drawableStart="@drawable/save"/>
@ -49,8 +48,7 @@
android:id="@+id/edit_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/ChipButton"
android:gravity="start|center_vertical"
style="@style/ChipButton.Icon"
android:text="@string/action_edit"
android:drawableStart="@drawable/edit"/>
</LinearLayout>

4
wearos/src/main/res/layout/logout_layout.xml
View file

@ -22,7 +22,7 @@
<Button
android:id="@+id/logout_button"
style="@style/ChipButton"
style="@style/ChipButton.Icon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_small"
@ -31,7 +31,7 @@
<Button
android:id="@+id/cancel_button"
style="@style/ChipButton"
style="@style/ChipButton.Icon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/cancel"

13
wearos/src/main/res/values/styles.xml
View file

@ -25,19 +25,28 @@
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/watch_white</item>
<item name="fontFamily">sans-serif-medium</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:gravity">center</item>
<item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item>
<item name="android:letterSpacing">0.01</item>
<item name="android:drawablePadding">8dp</item>
<item name="android:foreground">@drawable/touch_feedback</item>
</style>
<style name="ChipButton.Icon" parent="ChipButton">
<item name="android:gravity">start|center_vertical</item>
<item name="android:drawablePadding">8dp</item>
</style>
<style name="ChipButton.Small" parent="ChipButton">
<item name="android:textSize">14sp</item>
<item name="android:minHeight">32dp</item>
</style>
<style name="ChipButton.Icon.Purple" parent="ChipButton.Icon">
<item name="android:backgroundTint">@color/watch_purple_100</item>
<item name="android:textColor">@color/watch_black</item>
</style>
<style name="ChipButton.Purple" parent="ChipButton">
<item name="android:backgroundTint">@color/watch_purple_100</item>
<item name="android:textColor">@color/watch_black</item>