github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Add version text to login form (#188)

Browse Source
This commit is contained in:
Rafał Borcz
2018-11-29 19:07:44 +01:00
committed by Mikołaj Pich
parent 834ef7c297
commit 60c7316742
7 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/res/layout/fragment_login_form.xml
View File

@ -8,8 +8,8 @@
android:id="@+id/loginFormProgressContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:gravity="center"
android:visibility="gone">
@ -21,8 +21,8 @@
android:layout_below="@id/loginFormProgressText"
android:layout_centerHorizontal="true"
android:indeterminate="true"
android:minHeight="30dp"
android:minWidth="220dp" />
android:minWidth="220dp"
android:minHeight="30dp" />
<TextView
android:id="@+id/loginFormProgressText"
@ -44,16 +44,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:layout_marginRight="16dp"
android:orientation="vertical">
<TextView
android:id="@+id/loginHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="24dp"
android:text="@string/login_header_default"
android:textSize="16sp" />
@ -126,12 +126,22 @@
style="?android:textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
android:text="@string/login_sign_in"
android:textColor="@android:color/white"
android:textStyle="bold"
app:backgroundTint="@color/colorPrimary" />
<TextView
android:id="@+id/loginVersion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="30dp"
android:text="@string/app_name"
android:textColor="@color/second_text"
android:visibility="gone" />
</LinearLayout>
</ScrollView>
</RelativeLayout>

6
app/src/main/res/layout/item_widget_timetable.xml
View File

@ -24,7 +24,7 @@
android:layout_toEndOf="@id/timetableWidgetItemNumber"
android:layout_toRightOf="@id/timetableWidgetItemNumber"
android:text="@string/app_name"
android:textColor="@color/second_text_color"
android:textColor="@color/second_text"
android:textSize="13sp" />
<TextView
@ -39,7 +39,7 @@
android:layout_toEndOf="@id/timetableWidgetItemTime"
android:layout_toRightOf="@id/timetableWidgetItemTime"
android:text="@string/app_name"
android:textColor="@color/second_text_color"
android:textColor="@color/second_text"
android:textSize="13sp" />
<TextView
@ -69,6 +69,6 @@
android:layout_toEndOf="@id/timetableWidgetItemNumber"
android:layout_toRightOf="@id/timetableWidgetItemNumber"
android:text="@string/app_name"
android:textColor="@color/second_text_color"
android:textColor="@color/second_text"
android:textSize="12sp" />
</RelativeLayout>

3
app/src/main/res/values/colors.xml
View File

@ -14,8 +14,7 @@
<color name="grade_one">#d65757</color>
<color name="grade_default">#3d5f9c</color>
<color name="secondary_text">#4c4c4c</color>
<color name="second_text_color">#333</color>
<color name="second_text">#474747</color>
<color name="bottom_nav_background">#303030</color>
<color name="bottom_nav_background_inverse">#ffffff</color>