- All committed to main

This commit is contained in:
2021-04-20 20:30:55 +01:00
parent 2cb2400156
commit 4812a523b0
56 changed files with 68 additions and 465 deletions

View File

@@ -46,7 +46,6 @@
<LinearLayout
android:id="@+id/list_temp_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

View File

@@ -17,7 +17,6 @@
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/imageView"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginRight="12dp"

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 881 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@@ -2,7 +2,6 @@
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_navigation"
app:startDestination="@id/nav_home"
tools:ignore="UnusedNavigation">

View File

@@ -3,52 +3,10 @@
<string name="action_settings">Settings</string>
<!-- Example settings for Data & Sync -->
<string name="pref_header_data_sync">Data &amp; sync</string>
<string-array name="list_preference_temp">
<item>°C</item>
<item>°F</item>
</string-array>
<string-array name="list_preference_wind">
<item>MpH</item>
<item>kpH</item>
</string-array>
<string-array name="list_preference_wind_values">
<item>mph</item>
<item>kph</item>
</string-array>
<string-array name="list_preference_precip">
<item>mm</item>
<item>In</item>
</string-array>
<string-array name="list_preference_precip_values">
<item>mm</item>
<item>in</item>
</string-array>
<string-array name="list_preference_vis">
<item>KM</item>
<item>Miles</item>
</string-array>
<string-array name="list_preference_vis_values">
<item>km</item>
<item>miles</item>
</string-array>
<string name="pref_title_new_message_notifications">New message notifications</string>
<string name="pref_title_vibrate">Vibrate</string>
<string name="submit">submit</string>
<string name="appwidget_text">EXAMPLE</string>
<string name="add_widget">Add widget</string>
<string name="title_home">Home</string>
<string name="title_world">World</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>

View File

@@ -58,23 +58,8 @@
<!--<item name="android:textColor">@color/colour_five</item>-->
</style>
<style name="titlebar" parent="@android:style/TextAppearance">
<!-- <item name="android:fontFamily">@font/archeologicaps</item>-->
<!--<item name="android:textColor">@color/colour_five</item>-->
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
</style>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="textView_minor">
<item name="android:textColor">@android:color/white</item>
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">16sp</item>
</style>
<style name="textView_major">
<item name="android:textColor">@android:color/white</item>
<item name="android:includeFontPadding">false</item>