Skip to content

#369: added main_fontSize #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roki512 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#369: added main_fontSize #383

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
92d94dd
#369: added main_fontSize in dimens
roki512 May 28, 2019
d7e9dcb
#369: added main_fontSize in activity_main - Buttons
roki512 May 28, 2019
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: 8 additions & 1 deletion Friendly-plans/app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:onClick="@{events::eventActivatePlan}"
android:textSize="@dimen/main_fontSize"
android:text="@string/main_activate_plan" />

<!-- plan-->
Expand All @@ -40,6 +41,7 @@
android:layout_alignParentStart="true"
android:layout_below="@+id/button_activatePlan"
android:onClick="@{events::eventCreatePlan}"
android:textSize="@dimen/main_fontSize"
android:text="@string/main_create_plan" />

<!-- task-->
Expand All @@ -51,6 +53,7 @@
android:layout_alignParentStart="true"
android:layout_below="@+id/button_createPlan"
android:onClick="@{events::eventCreateTask}"
android:textSize="@dimen/main_fontSize"
android:text="@string/main_create_task" />

<!--list of plans-->
Expand All @@ -62,6 +65,7 @@
android:layout_alignParentStart="true"
android:layout_below="@+id/button_createTask"
android:onClick="@{events::eventShowPlanList}"
android:textSize="@dimen/main_fontSize"
android:text="@string/main_list_of_plans_edit_plan" />

<!--list of tasks-->
Expand All @@ -73,6 +77,7 @@
android:layout_alignParentStart="true"
android:layout_below="@+id/button_listOfPlans"
android:onClick="@{events::eventShowTaskList}"
android:textSize="@dimen/main_fontSize"
android:text="@string/main_list_of_tasks_edit_task" />

<!--settings-->
Expand All @@ -84,6 +89,7 @@
android:layout_alignParentStart="true"
android:layout_below="@+id/button_listOfTasks"
android:onClick="@{events::eventChildSettings}"
android:textSize="@dimen/main_fontSize"
android:text="@string/main_active_child_settings" />

<!--add/remove child-->
Expand All @@ -95,7 +101,8 @@
android:layout_alignParentStart="true"
android:layout_below="@+id/button_activeChildSettings"
android:onClick="@{events::eventShowChildrenList}"
android:textSize="@dimen/main_fontSize"
android:text="@string/main_add_remove_child" />
</RelativeLayout>
</ScrollView>
</layout>
</layout>
1 change: 1 addition & 0 deletions Friendly-plans/app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="main_fontSize">32sp</dimen>
</resources>