fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

update Commons with just one shade of divider grey

Browse Source
This commit is contained in:
tibbi
2018-01-15 14:36:25 +01:00
parent 510989fa39
commit cb20b0a814
11 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -42,7 +42,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.7.1' implementation 'com.simplemobiletools:commons:3.7.3'
implementation 'joda-time:joda-time:2.9.9' implementation 'joda-time:joda-time:2.9.9'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support:multidex:1.0.2' implementation 'com.android.support:multidex:1.0.2'

3
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View File

@@ -520,8 +520,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
private fun exportEvents() { private fun exportEvents() {
FilePickerDialog(this, pickFile = false, showFAB = true) { FilePickerDialog(this, pickFile = false, showFAB = true) {
val path = it ExportEventsDialog(this, it) { exportPastEvents, file, eventTypes ->
ExportEventsDialog(this, path) { exportPastEvents, file, eventTypes ->
Thread { Thread {
val events = dbHelper.getEventsToExport(exportPastEvents).filter { eventTypes.contains(it.eventType.toString()) } val events = dbHelper.getEventsToExport(exportPastEvents).filter { eventTypes.contains(it.eventType.toString()) }
if (events.isEmpty()) { if (events.isEmpty()) {

2
app/src/main/res/drawable/divider_width.xml
View File

@@ -7,6 +7,6 @@
android:width="5000dp" android:width="5000dp"
android:height="1dp"/> android:height="1dp"/>
<solid android:color="@color/divider_weak"/> <solid android:color="@color/divider_grey"/>
</shape> </shape>

2
app/src/main/res/drawable/stroke_bottom.xml
View File

@@ -10,7 +10,7 @@
<solid android:color="@android:color/transparent"/> <solid android:color="@android:color/transparent"/>
<stroke <stroke
android:width="1px" android:width="1px"
android:color="@color/divider_strong"/> android:color="@color/divider_grey"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

2
app/src/main/res/drawable/stroke_bottom_right.xml
View File

@@ -10,7 +10,7 @@
<solid android:color="@android:color/transparent"/> <solid android:color="@android:color/transparent"/>
<stroke <stroke
android:width="1px" android:width="1px"
android:color="@color/divider_strong"/> android:color="@color/divider_grey"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

2
app/src/main/res/drawable/stroke_right.xml
View File

@@ -10,7 +10,7 @@
<solid android:color="@android:color/transparent"/> <solid android:color="@android:color/transparent"/>
<stroke <stroke
android:width="1px" android:width="1px"
android:color="@color/divider_strong"/> android:color="@color/divider_grey"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

12
app/src/main/res/layout/activity_event.xml
View File

@@ -82,7 +82,7 @@
android:layout_below="@+id/event_description" android:layout_below="@+id/event_description"
android:layout_marginBottom="@dimen/normal_margin" android:layout_marginBottom="@dimen/normal_margin"
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:background="@color/darker_divider" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<ImageView <ImageView
@@ -178,7 +178,7 @@
android:layout_below="@+id/event_end_date" android:layout_below="@+id/event_end_date"
android:layout_marginBottom="@dimen/medium_margin" android:layout_marginBottom="@dimen/medium_margin"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:background="@color/darker_divider" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<ImageView <ImageView
@@ -245,7 +245,7 @@
android:layout_below="@+id/event_reminder_3" android:layout_below="@+id/event_reminder_3"
android:layout_marginBottom="@dimen/medium_margin" android:layout_marginBottom="@dimen/medium_margin"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:background="@color/darker_divider" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<ImageView <ImageView
@@ -352,7 +352,7 @@
android:layout_height="1px" android:layout_height="1px"
android:layout_below="@+id/event_repetition_limit_holder" android:layout_below="@+id/event_repetition_limit_holder"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:background="@color/darker_divider" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<ImageView <ImageView
@@ -414,7 +414,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:layout_below="@+id/event_caldav_calendar_holder" android:layout_below="@+id/event_caldav_calendar_holder"
android:background="@color/darker_divider" android:background="@color/divider_grey"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:visibility="gone"/> android:visibility="gone"/>
@@ -472,7 +472,7 @@
android:layout_height="1px" android:layout_height="1px"
android:layout_below="@+id/event_type_holder" android:layout_below="@+id/event_type_holder"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:background="@color/darker_divider" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>

20
app/src/main/res/layout/activity_settings.xml
View File

@@ -258,7 +258,7 @@
android:id="@+id/caldav_divider" android:id="@+id/caldav_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="@color/divider_strong" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@@ -271,7 +271,7 @@
android:alpha="0.6" android:alpha="0.6"
android:text="@string/caldav" android:text="@string/caldav"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_strong" android:textColor="@color/divider_grey"
android:textSize="@dimen/small_text_size"/> android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
@@ -320,7 +320,7 @@
android:id="@+id/weekly_view_divider" android:id="@+id/weekly_view_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="@color/divider_strong" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@@ -333,7 +333,7 @@
android:alpha="0.6" android:alpha="0.6"
android:text="@string/weekly_view" android:text="@string/weekly_view"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_strong" android:textColor="@color/divider_grey"
android:textSize="@dimen/small_text_size"/> android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
@@ -409,7 +409,7 @@
android:id="@+id/monthly_view_divider" android:id="@+id/monthly_view_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="@color/divider_strong" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@@ -422,7 +422,7 @@
android:alpha="0.6" android:alpha="0.6"
android:text="@string/monthly_view" android:text="@string/monthly_view"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_strong" android:textColor="@color/divider_grey"
android:textSize="@dimen/small_text_size"/> android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
@@ -449,7 +449,7 @@
android:id="@+id/events_list_view_divider" android:id="@+id/events_list_view_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="@color/divider_strong" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@@ -462,7 +462,7 @@
android:alpha="0.6" android:alpha="0.6"
android:text="@string/event_lists" android:text="@string/event_lists"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_strong" android:textColor="@color/divider_grey"
android:textSize="@dimen/small_text_size"/> android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
@@ -503,7 +503,7 @@
android:id="@+id/widgets_divider" android:id="@+id/widgets_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="@color/divider_strong" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@@ -516,7 +516,7 @@
android:alpha="0.6" android:alpha="0.6"
android:text="@string/widgets" android:text="@string/widgets"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_strong" android:textColor="@color/divider_grey"
android:textSize="@dimen/small_text_size"/> android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout

2
app/src/main/res/layout/calendar_item_account.xml
View File

@@ -11,6 +11,6 @@
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.6" android:alpha="0.6"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_strong" android:textColor="@color/divider_grey"
android:textSize="@dimen/small_text_size" android:textSize="@dimen/small_text_size"
tools:text="Account"/> tools:text="Account"/>

2
app/src/main/res/layout/dialog_export_events.xml
View File

@@ -70,7 +70,7 @@
android:layout_height="1px" android:layout_height="1px"
android:layout_marginBottom="@dimen/medium_margin" android:layout_marginBottom="@dimen/medium_margin"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:background="@color/darker_divider" android:background="@color/divider_grey"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView

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

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="dark_theme_dialog_background">#ff444444</color> <color name="dark_theme_dialog_background">#ff444444</color>
<color name="darker_divider">#66808080</color>
<color name="red_text">#FFF62F2F</color> <color name="red_text">#FFF62F2F</color>
<color name="default_birthdays_color">#FF303DF6</color> <color name="default_birthdays_color">#FF303DF6</color>
<color name="default_holidays_color">#FF64DD17</color> <color name="default_holidays_color">#FF64DD17</color>