Added calendar filter

This commit is contained in:
Tommaso Berlose
2017-10-10 14:52:12 +02:00
parent f62f9dc3bd
commit f7e99184c9
15 changed files with 193 additions and 70 deletions

View File

@ -3,7 +3,7 @@
<item>
<shape android:shape="rectangle">
<corners
android:radius="3dp" />
android:radius="2dp" />
<solid
android:color="@color/black_30"/>
</shape>

View File

@ -61,35 +61,17 @@
android:orientation="vertical"
android:paddingTop="20dp"
android:paddingBottom="20dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/settings_calendar_title"
style="@style/AnotherWidget.Settings.Header"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="32dp"
android:paddingRight="32dp"
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:id="@+id/action_change_unit"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AnotherWidget.Settings.Title"
android:text="@string/settings_unit_title"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/temp_unit"
style="@style/AnotherWidget.Settings.Subtitle"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingLeft="32dp"
android:paddingRight="32dp"
android:clickable="true"
@ -97,7 +79,6 @@
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:id="@+id/action_filter_calendar"
android:visibility="gone"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@ -113,8 +94,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingLeft="32dp"
android:paddingRight="32dp"
android:clickable="true"
@ -134,6 +115,37 @@
android:id="@+id/all_day_label"
style="@style/AnotherWidget.Settings.Subtitle"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_weather_title"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
style="@style/AnotherWidget.Settings.Header"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingLeft="32dp"
android:paddingRight="32dp"
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:id="@+id/action_change_unit"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AnotherWidget.Settings.Title"
android:text="@string/settings_unit_title"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/temp_unit"
style="@style/AnotherWidget.Settings.Subtitle"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
@ -236,18 +248,18 @@
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:id="@+id/action_share"
android:id="@+id/action_rate"
android:orientation="vertical">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:padding="2dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_action_sms"/>
android:src="@drawable/ic_action_rate"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/action_share"
android:text="@string/action_rate"
style="@style/AnotherWidget.Main.Button.TabBar"
android:background="@android:color/transparent"/>
</LinearLayout>
@ -261,18 +273,18 @@
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:id="@+id/action_project"
android:id="@+id/action_share"
android:orientation="vertical">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:padding="2dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_action_code"/>
android:src="@drawable/ic_action_sms"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/action_project"
android:text="@string/action_share"
style="@style/AnotherWidget.Main.Button.TabBar"
android:background="@android:color/transparent"/>
</LinearLayout>

View File

@ -29,4 +29,8 @@
<string name="settings_all_day_title">Eventi Giornalieri</string>
<string name="settings_all_day_subtitle_visible">Visibili</string>
<string name="settings_all_day_subtitle_gone">Non Visibili</string>
<string name="main_calendar">Calendario Account</string>
<string name="settings_calendar_title">Impostazioni Calendario</string>
<string name="settings_weather_title">Impostazioni Meteo</string>
<string name="settings_general_title">Impostazioni Generali</string>
</resources>

View File

@ -3,7 +3,7 @@
<color name="colorPrimary">#0092ca</color>
<color name="colorPrimaryDark">#0083B5</color>
<color name="colorNightDark">#124E96</color>
<color name="colorAccent">#FF008E</color>
<color name="colorAccent">#124E96</color>
<color name="colorPrimaryLight">#DAEAF6</color>
<color name="black_50">#80000000</color>
<color name="black_30">#48000000</color>

View File

@ -30,4 +30,8 @@
<string name="settings_all_day_title">All Day Events</string>
<string name="settings_all_day_subtitle_visible">Visible</string>
<string name="settings_all_day_subtitle_gone">Not Visible</string>
<string name="main_calendar">Account Calendar</string>
<string name="settings_calendar_title">Calendar Settings</string>
<string name="settings_weather_title">Weather Settings</string>
<string name="settings_general_title">General Settings</string>
</resources>

View File

@ -57,6 +57,17 @@
<item name="android:textSize">12sp</item>
</style>
<style name="AnotherWidget.Settings.Header" parent="TextAppearance.AppCompat.Button">
<item name="android:textSize">10sp</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:paddingRight">6dp</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">4dp</item>
<item name="android:background">@drawable/dark_card_background</item>
</style>
<style name="AnotherWidget.Settings.Title" parent="TextAppearance.AppCompat.Medium">
<item name="android:textColor">@android:color/white</item>
<item name="android:fontFamily">sans-serif-light</item>