fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-04-06 22:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

removing some redundant xml tags

Browse Source
This commit is contained in:
tibbi 2020-05-28 17:53:27 +02:00
parent fffce3d081
commit 97a41471b0
2 changed files with 36 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
View File

@ -140,13 +140,13 @@ class MainActivity : SimpleActivity() {
view_pager.currentItem = tabToOpen view_pager.currentItem = tabToOpen
view_pager.offscreenPageLimit = TABS_COUNT - 1 view_pager.offscreenPageLimit = TABS_COUNT - 1
main_tabs_holder.onTabSelectionChanged( main_tabs_holder.onTabSelectionChanged(
tabUnselectedAction = { tabUnselectedAction = {
it.icon?.applyColorFilter(config.textColor) it.icon?.applyColorFilter(config.textColor)
}, },
tabSelectedAction = { tabSelectedAction = {
view_pager.currentItem = it.position view_pager.currentItem = it.position
it.icon?.applyColorFilter(getAdjustedPrimaryColor()) it.icon?.applyColorFilter(getAdjustedPrimaryColor())
} }
) )
setupTabColors(tabToOpen) setupTabColors(tabToOpen)
@ -177,11 +177,11 @@ class MainActivity : SimpleActivity() {
val licenses = LICENSE_STETHO or LICENSE_NUMBER_PICKER or LICENSE_RTL val licenses = LICENSE_STETHO or LICENSE_NUMBER_PICKER or LICENSE_RTL
val faqItems = arrayListOf( val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title, R.string.faq_1_text), FAQItem(R.string.faq_1_title, R.string.faq_1_text),
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons), FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons), FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons) FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons)
) )
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/settings_scrollview" android:id="@+id/settings_scrollview"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -29,8 +28,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin" android:text="@string/purchase_simple_thank_you" />
android:text="@string/purchase_simple_thank_you"/>
</RelativeLayout> </RelativeLayout>
@ -51,8 +49,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin" android:text="@string/customize_colors" />
android:text="@string/customize_colors"/>
</RelativeLayout> </RelativeLayout>
@ -74,9 +71,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/use_english_language" android:text="@string/use_english_language"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
@ -98,9 +94,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/prevent_phone_from_sleeping" android:text="@string/prevent_phone_from_sleeping"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
@ -122,9 +117,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/use_24_hour_time_format" android:text="@string/use_24_hour_time_format"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
@ -146,9 +140,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/sunday_first" android:text="@string/sunday_first"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
@ -157,11 +150,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin" android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginLeft="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin" android:layout_marginTop="@dimen/section_margin"
android:text="@string/clock_tab" android:text="@string/clock_tab"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/> android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_show_seconds_holder" android:id="@+id/settings_show_seconds_holder"
@ -181,9 +173,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_seconds" android:text="@string/show_seconds"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
@ -192,11 +183,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin" android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginLeft="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin" android:layout_marginTop="@dimen/section_margin"
android:text="@string/alarm_tab" android:text="@string/alarm_tab"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/> android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_alarm_max_reminder_holder" android:id="@+id/settings_alarm_max_reminder_holder"
@ -215,21 +205,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_alarm_max_reminder" android:layout_toStartOf="@+id/settings_alarm_max_reminder"
android:layout_toLeftOf="@+id/settings_alarm_max_reminder"
android:paddingLeft="@dimen/medium_margin" android:paddingLeft="@dimen/medium_margin"
android:paddingRight="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin"
android:text="@string/max_reminder_duration"/> android:text="@string/max_reminder_duration" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_alarm_max_reminder" android:id="@+id/settings_alarm_max_reminder"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null" android:background="@null"
android:clickable="false"/> android:clickable="false" />
</RelativeLayout> </RelativeLayout>
@ -251,9 +238,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/increase_volume_gradually" android:text="@string/increase_volume_gradually"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
@ -275,9 +261,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/use_same_snooze" android:text="@string/use_same_snooze"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
@ -298,21 +283,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_snooze_time" android:layout_toStartOf="@+id/settings_snooze_time"
android:layout_toLeftOf="@+id/settings_snooze_time"
android:paddingLeft="@dimen/medium_margin" android:paddingLeft="@dimen/medium_margin"
android:paddingRight="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin"
android:text="@string/snooze_time"/> android:text="@string/snooze_time" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_snooze_time" android:id="@+id/settings_snooze_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null" android:background="@null"
android:clickable="false"/> android:clickable="false" />
</RelativeLayout> </RelativeLayout>
@ -321,11 +303,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin" android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginLeft="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin" android:layout_marginTop="@dimen/section_margin"
android:text="@string/stopwatch_tab" android:text="@string/stopwatch_tab"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/> android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_vibrate_holder" android:id="@+id/settings_vibrate_holder"
@ -345,9 +326,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/vibrate_on_button_press" android:text="@string/vibrate_on_button_press"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -355,11 +335,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin" android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginLeft="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin" android:layout_marginTop="@dimen/section_margin"
android:text="@string/timer_tab" android:text="@string/timer_tab"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/> android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_timer_max_reminder_holder" android:id="@+id/settings_timer_max_reminder_holder"
@ -378,21 +357,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_timer_max_reminder" android:layout_toStartOf="@+id/settings_timer_max_reminder"
android:layout_toLeftOf="@+id/settings_timer_max_reminder"
android:paddingLeft="@dimen/medium_margin" android:paddingLeft="@dimen/medium_margin"
android:paddingRight="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin"
android:text="@string/max_reminder_duration"/> android:text="@string/max_reminder_duration" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_timer_max_reminder" android:id="@+id/settings_timer_max_reminder"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin" android:layout_marginEnd="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:background="@null" android:background="@null"
android:clickable="false"/> android:clickable="false" />
</RelativeLayout> </RelativeLayout>
@ -401,11 +377,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin" android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginLeft="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin" android:layout_marginTop="@dimen/section_margin"
android:text="@string/widgets" android:text="@string/widgets"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/> android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_use_text_shadow_holder" android:id="@+id/settings_use_text_shadow_holder"
@ -425,9 +400,8 @@
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/use_text_shadow" android:text="@string/use_text_shadow"
app:switchPadding="@dimen/medium_margin"/> app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@ -447,8 +421,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin" android:text="@string/customize_widget_colors" />
android:text="@string/customize_widget_colors"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>