mirrors/nock-nock
1
0
Fork 0
mirror of https://github.com/afollestad/nock-nock.git synced 2025-04-20 19:45:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use styles to keep view styles consistent throughout the app

Browse source
This commit is contained in:
Aidan Follestad 2018-11-30 22:52:35 -08:00
parent 1a66d2bbd7
commit 62ce516972
10 changed files with 89 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/res/layout/activity_addsite.xml
View file

@ -52,12 +52,10 @@
android:id="@+id/inputName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/lato"
android:hint="@string/site_name"
android:inputType="textPersonName|textCapWords|textAutoCorrect"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
android:textSize="@dimen/body_font_size"
android:textColor="#FFFFFF"
style="@style/NockText.Body"
/>
</com.google.android.material.textfield.TextInputLayout>
@ -75,12 +73,10 @@
android:id="@+id/inputUrl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/lato"
android:hint="@string/site_url"
android:inputType="textUri"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
android:textSize="@dimen/body_font_size"
android:textColor="#FFFFFF"
style="@style/NockText.Body"
/>
</com.google.android.material.textfield.TextInputLayout>
@ -90,11 +86,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_text_spacing"
android:fontFamily="@font/lato_light"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/caption_font_size"
android:visibility="gone"
tools:text="Warning: this app checks for server availability with HTTP requests. It's recommended that you use an HTTP URL."
style="@style/NockText.Footnote"
/>
<include layout="@layout/include_divider"/>
@ -111,10 +105,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_inset"
android:fontFamily="@font/lato"
android:text="@string/response_validation_mode"
android:textColor="?colorAccent"
android:textSize="@dimen/caption_font_size"
style="@style/NockText.SectionHeader"
/>
<Spinner
@ -131,11 +123,10 @@
android:layout_marginLeft="-4dp"
android:layout_marginRight="-4dp"
android:layout_marginTop="-4dp"
android:fontFamily="@font/lato_light"
android:hint="@string/search_term"
android:textSize="@dimen/body_font_size"
android:visibility="gone"
tools:ignore="Autofill,TextFields"
style="@style/NockText.Body.Light"
/>
<com.afollestad.nocknock.viewcomponents.JavaScriptInputLayout
@ -152,10 +143,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/content_inset_half"
android:fontFamily="@font/lato_light"
android:lineSpacingMultiplier="1.2"
android:text="@string/validation_mode_status_desc"
android:textSize="@dimen/body_font_size"
style="@style/NockText.Body.Light"
/>
<com.google.android.material.button.MaterialButton

41
app/src/main/res/layout/activity_viewsite.xml
View file

@ -70,30 +70,26 @@
android:id="@+id/inputName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/lato"
android:hint="@string/site_name"
android:inputType="textPersonName|textCapWords|textAutoCorrect"
android:singleLine="true"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
android:textSize="@dimen/body_font_size"
android:textColor="#FFFFFF"
android:transitionName="site_name"
tools:ignore="Autofill,UnusedAttribute"
style="@style/NockText.Body"
/>
<EditText
android:id="@+id/inputUrl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/lato"
android:hint="@string/site_url"
android:inputType="textUri"
android:singleLine="true"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
android:textSize="@dimen/body_font_size"
android:textColor="#FFFFFF"
android:transitionName="site_url"
tools:ignore="Autofill,UnusedAttribute"
style="@style/NockText.Body"
/>
<TextView
@ -103,11 +99,9 @@
android:layout_marginEnd="4dp"
android:layout_marginStart="4dp"
android:layout_marginTop="@dimen/list_text_spacing"
android:fontFamily="@font/lato_light"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/caption_font_size"
android:visibility="gone"
tools:text="Warning: this app checks for server availability with HTTP requests. It's recommended that you use an HTTP URL."
style="@style/NockText.Footnote"
/>
</LinearLayout>
@ -140,10 +134,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_inset"
android:fontFamily="@font/lato"
android:text="@string/response_validation_mode"
android:textColor="?colorAccent"
android:textSize="@dimen/caption_font_size"
style="@style/NockText.SectionHeader"
/>
<Spinner
@ -160,11 +152,11 @@
android:layout_marginLeft="-4dp"
android:layout_marginRight="-4dp"
android:layout_marginTop="-4dp"
android:fontFamily="@font/lato_light"
android:hint="@string/search_term"
android:textSize="@dimen/body_font_size"
android:textColor="#FFFFFF"
android:visibility="gone"
tools:ignore="Autofill,TextFields"
style="@style/NockText.Body.Light"
/>
<com.afollestad.nocknock.viewcomponents.JavaScriptInputLayout
@ -181,10 +173,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/content_inset_half"
android:fontFamily="@font/lato"
android:lineSpacingMultiplier="1.2"
android:text="@string/validation_mode_status_desc"
android:textSize="@dimen/body_font_size"
style="@style/NockText.Body.Light"
/>
<include layout="@layout/include_divider"/>
@ -194,8 +185,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_inset"
android:text="@string/last_check_result"
android:textColor="?colorAccent"
android:textSize="@dimen/caption_font_size"
style="@style/NockText.SectionHeader"
/>
<TextView
@ -203,10 +193,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_text_spacing"
android:fontFamily="@font/lato"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_text_size"
tools:text="Everything checks out!"
style="@style/NockText.Body"
/>
<TextView
@ -214,8 +202,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_inset"
android:text="@string/next_check"
android:textColor="?colorAccent"
android:textSize="@dimen/caption_font_size"
style="@style/NockText.SectionHeader"
/>
<TextView
@ -223,10 +210,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_text_spacing"
android:fontFamily="@font/lato"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_text_size"
tools:text="In 2 hours"
style="@style/NockText.Body"
/>
<com.google.android.material.button.MaterialButton

18
app/src/main/res/layout/list_item_server.xml
View file

@ -40,15 +40,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/content_inset_half"
android:layout_toStartOf="@+id/textInterval"
android:fontFamily="@font/lato"
android:singleLine="true"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/title_font_size"
android:transitionName="site_name"
tools:text="Website Name"
style="@style/NockText.Title"
/>
<TextView
@ -57,11 +54,8 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:fontFamily="@font/lato_black"
android:singleLine="true"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/caption_font_size"
tools:text="1h"
style="@style/NockText.Caption"
/>
</RelativeLayout>
@ -71,12 +65,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_text_spacing"
android:fontFamily="@font/lato_light"
android:singleLine="true"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/body_font_size"
android:transitionName="site_url"
tools:text="https://yourwebsitehere.com"
style="@style/NockText.Body.Light"
/>
<TextView
@ -84,11 +76,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_text_spacing"
android:fontFamily="@font/lato"
android:singleLine="true"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/body_font_size"
tools:text="Everything checks out!"
style="@style/NockText.Body"
/>
</LinearLayout>

7
viewcomponents/src/main/res/font/lato_bold.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="name=Lato&amp;weight=700"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

8
viewcomponents/src/main/res/layout/check_interval_layout.xml
View file

@ -12,10 +12,8 @@
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/lato"
android:text="@string/check_interval"
android:textColor="?colorAccent"
android:textSize="@dimen/caption_font_size"
style="@style/NockText.SectionHeader"
/>
<LinearLayout
@ -33,12 +31,12 @@
android:layout_marginEnd="@dimen/content_inset_half"
android:layout_marginStart="-4dp"
android:layout_weight="1"
android:fontFamily="@font/lato_light"
android:hint="0"
android:inputType="number"
android:maxLength="6"
android:textSize="@dimen/body_font_size"
android:textColor="#FFFFFF"
tools:ignore="Autofill,HardcodedText,LabelFor"
style="@style/NockText.Body.Light"
/>
<Spinner

5
viewcomponents/src/main/res/layout/list_item_spinner.xml
View file

@ -3,8 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/button_height"
android:fontFamily="@font/lato"
android:gravity="center_vertical|start"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/body_font_size"
android:textColor="#FFFFFF"
style="@style/NockText.Body"
/>

5
viewcomponents/src/main/res/layout/list_item_spinner_dropdown.xml
View file

@ -3,10 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/button_height"
android:fontFamily="@font/lato"
android:gravity="center_vertical|start"
android:paddingLeft="@dimen/content_inset"
android:paddingRight="@dimen/content_inset"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/body_font_size"
android:textColor="#FFFFFF"
style="@style/NockText.Body"
/>

2
viewcomponents/src/main/res/values/dimens.xml
View file

@ -12,9 +12,9 @@
<dimen name="content_inset_double">32dp</dimen>
<dimen name="title_font_size">20sp</dimen>
<dimen name="medium_text_size">16sp</dimen>
<dimen name="body_font_size">14sp</dimen>
<dimen name="code_font_size">14sp</dimen>
<dimen name="footnote_font_size">12sp</dimen>
<dimen name="caption_font_size">12sp</dimen>
<dimen name="button_height">52dp</dimen>

13
viewcomponents/src/main/res/values/preloaded_fonts.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="preloaded_fonts" translatable="false">
<item>@font/fira_mono</item>
<item>@font/lato</item>
<item>@font/lato_black</item>
<item>@font/lato_light</item>
</array>
<array name="preloaded_fonts" translatable="false">
<item>@font/fira_mono</item>
<item>@font/lato</item>
<item>@font/lato_black</item>
<item>@font/lato_bold</item>
<item>@font/lato_light</item>
</array>
</resources>

42
viewcomponents/src/main/res/values/styles.xml Normal file
View file

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="NockText"/>
<style name="NockText.SectionHeader">
<item name="android:textSize">@dimen/caption_font_size</item>
<item name="android:fontFamily">@font/lato_bold</item>
<item name="android:textColor">?colorAccent</item>
</style>
<style name="NockText.Title">
<item name="android:textSize">@dimen/title_font_size</item>
<item name="android:fontFamily">@font/lato</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="NockText.Body">
<item name="android:textSize">@dimen/body_font_size</item>
<item name="android:fontFamily">@font/lato</item>
<item name="android:textColor">?android:textColorSecondary</item>
</style>
<style name="NockText.Body.Light" parent="NockText.Body">
<item name="android:fontFamily">@font/lato_light</item>
</style>
<style name="NockText.Caption">
<item name="android:textSize">@dimen/caption_font_size</item>
<item name="android:fontFamily">@font/lato_black</item>
<item name="android:textColor">?android:textColorSecondary</item>
<item name="android:singleLine">true</item>
</style>
<style name="NockText.Footnote">
<item name="android:textSize">@dimen/caption_font_size</item>
<item name="android:fontFamily">@font/lato_light</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColorHint">?android:textColorSecondary</item>
</style>
</resources>