isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply bottom insets to about and settings screens

Browse Source
pull/2194/head
Alinson S. Xavier 3 months ago
parent e4348a2144
commit d57de9d10c
3 changed files with 90 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt
Unescape View File

@ -26,6 +26,7 @@ import org.isoron.uhabits.BuildConfig
import org.isoron.uhabits.R import org.isoron.uhabits.R
import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.PaletteColor
import org.isoron.uhabits.databinding.AboutBinding import org.isoron.uhabits.databinding.AboutBinding
import org.isoron.uhabits.utils.applyBottomInset
import org.isoron.uhabits.utils.applyRootViewInsets import org.isoron.uhabits.utils.applyRootViewInsets
import org.isoron.uhabits.utils.currentTheme import org.isoron.uhabits.utils.currentTheme
import org.isoron.uhabits.utils.setupToolbar import org.isoron.uhabits.utils.setupToolbar
@ -55,6 +56,7 @@ class AboutView(
binding.tvTranslate.setOnClickListener { screen.showTranslationWebsite() } binding.tvTranslate.setOnClickListener { screen.showTranslationWebsite() }
binding.tvVersion.setOnClickListener { screen.onPressDeveloperCountdown() } binding.tvVersion.setOnClickListener { screen.onPressDeveloperCountdown() }
binding.tvVersion.text = String.format(version, BuildConfig.VERSION_NAME) binding.tvVersion.text = String.format(version, BuildConfig.VERSION_NAME)
binding.outerLinearLayout.applyBottomInset()
applyRootViewInsets() applyRootViewInsets()
} }
} }

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt
Unescape View File

@ -26,6 +26,7 @@ import org.isoron.uhabits.R
import org.isoron.uhabits.activities.AndroidThemeSwitcher import org.isoron.uhabits.activities.AndroidThemeSwitcher
import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.PaletteColor
import org.isoron.uhabits.databinding.SettingsActivityBinding import org.isoron.uhabits.databinding.SettingsActivityBinding
import org.isoron.uhabits.utils.applyBottomInset
import org.isoron.uhabits.utils.applyRootViewInsets import org.isoron.uhabits.utils.applyRootViewInsets
import org.isoron.uhabits.utils.setupToolbar import org.isoron.uhabits.utils.setupToolbar
@ -44,6 +45,7 @@ class SettingsActivity : AppCompatActivity() {
theme = themeSwitcher.currentTheme theme = themeSwitcher.currentTheme
) )
binding.root.applyRootViewInsets() binding.root.applyRootViewInsets()
binding.root.applyBottomInset()
setContentView(binding.root) setContentView(binding.root)
} }
} }

107
uhabits-android/src/main/res/layout/about.xml
Unescape View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org> ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
~ ~
~ This file is part of Loop Habit Tracker. ~ This file is part of Loop Habit Tracker.
@ -28,7 +27,7 @@
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
app:popupTheme="?toolbarPopupTheme" app:popupTheme="?toolbarPopupTheme"
style="@style/Toolbar"/> style="@style/Toolbar" />
<ScrollView <ScrollView
android:id="@+id/scrollView" android:id="@+id/scrollView"
@ -37,6 +36,7 @@
android:layout_below="@id/toolbar"> android:layout_below="@id/toolbar">
<LinearLayout <LinearLayout
android:id="@+id/outerLinearLayout"
style="@style/CardList"> style="@style/CardList">
<LinearLayout <LinearLayout
@ -47,7 +47,7 @@
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_margin="6dp" android:layout_margin="6dp"
android:src="@drawable/intro_icon_1"/> android:src="@drawable/intro_icon_1" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -57,14 +57,14 @@
android:textSize="16sp" android:textSize="16sp"
android:layout_margin="6dp" android:layout_margin="6dp"
android:textColor="?aboutScreenColor" android:textColor="?aboutScreenColor"
android:text="@string/app_name"/> android:text="@string/app_name" />
<TextView <TextView
android:id="@+id/tvVersion" android:id="@+id/tvVersion"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text=""/> android:text="" />
</LinearLayout> </LinearLayout>
@ -75,32 +75,32 @@
<TextView <TextView
style="@style/CardHeader" style="@style/CardHeader"
android:text="@string/links" android:text="@string/links"
android:textColor="?aboutScreenColor"/> android:textColor="?aboutScreenColor" />
<TextView <TextView
android:id="@+id/tvRate" android:id="@+id/tvRate"
style="@style/About.Item.Clickable" style="@style/About.Item.Clickable"
android:text="@string/pref_rate_this_app"/> android:text="@string/pref_rate_this_app" />
<TextView <TextView
android:id="@+id/tvFeedback" android:id="@+id/tvFeedback"
style="@style/About.Item.Clickable" style="@style/About.Item.Clickable"
android:text="@string/pref_send_feedback"/> android:text="@string/pref_send_feedback" />
<TextView <TextView
android:id="@+id/tvTranslate" android:id="@+id/tvTranslate"
style="@style/About.Item.Clickable" style="@style/About.Item.Clickable"
android:text="@string/help_translate"/> android:text="@string/help_translate" />
<TextView <TextView
android:id="@+id/tvSource" android:id="@+id/tvSource"
style="@style/About.Item.Clickable" style="@style/About.Item.Clickable"
android:text="@string/pref_view_source_code"/> android:text="@string/pref_view_source_code" />
<TextView <TextView
android:id="@+id/tvPrivacy" android:id="@+id/tvPrivacy"
style="@style/About.Item.Clickable" style="@style/About.Item.Clickable"
android:text="@string/pref_view_privacy"/> android:text="@string/pref_view_privacy" />
</LinearLayout> </LinearLayout>
@ -111,7 +111,7 @@
<TextView <TextView
style="@style/CardHeader" style="@style/CardHeader"
android:text="@string/developers" android:text="@string/developers"
android:textColor="?aboutScreenColor"/> android:textColor="?aboutScreenColor" />
<!-- <!--
This file lists developers who contributed with at least 100 lines This file lists developers who contributed with at least 100 lines
@ -120,31 +120,76 @@
linked at the bottom of the list. If you qualify, please feel free to linked at the bottom of the list. If you qualify, please feel free to
submit a pull request adding yourself here. submit a pull request adding yourself here.
--> -->
<TextView style="@style/About.Item" android:text="Álinson S. Xavier (@iSoron)"/> <TextView
<TextView style="@style/About.Item" android:text="Quentin Hibon (@hiqua)"/> style="@style/About.Item"
<TextView style="@style/About.Item" android:text="Oleg Ivashchenko (@olegivo)"/> android:text="Álinson S. Xavier (@iSoron)" />
<TextView style="@style/About.Item" android:text="Kristian Tashkov (@KristianTashkov)"/>
<TextView style="@style/About.Item" android:text="Jakub Kalinowski (@kalina559)"/> <TextView
<TextView style="@style/About.Item" android:text="Rechee Jozil (@recheej)"/> style="@style/About.Item"
<TextView style="@style/About.Item" android:text="Sebastian Gallese (@sgallese)"/> android:text="Quentin Hibon (@hiqua)" />
<TextView style="@style/About.Item" android:text="Luboš Luňák (@llunak)"/>
<TextView style="@style/About.Item" android:text="Bindu (@vbh)"/> <TextView
<TextView style="@style/About.Item" android:text="Victor Yu (@vyu1)"/> style="@style/About.Item"
<TextView style="@style/About.Item" android:text="Christoph Hennemann (@chennemann)"/> android:text="Oleg Ivashchenko (@olegivo)" />
<TextView style="@style/About.Item" android:text="Денис (@sciamano)"/>
<TextView style="@style/About.Item" android:text="Joseph Tran (@JotraN)"/> <TextView
<TextView style="@style/About.Item" android:text="Nikhil (@regularcoder)"/> style="@style/About.Item"
<TextView style="@style/About.Item" android:text="JanetQC"/> android:text="Kristian Tashkov (@KristianTashkov)" />
<TextView
style="@style/About.Item"
android:text="Jakub Kalinowski (@kalina559)" />
<TextView
style="@style/About.Item"
android:text="Rechee Jozil (@recheej)" />
<TextView
style="@style/About.Item"
android:text="Sebastian Gallese (@sgallese)" />
<TextView
style="@style/About.Item"
android:text="Luboš Luňák (@llunak)" />
<TextView
style="@style/About.Item"
android:text="Bindu (@vbh)" />
<TextView
style="@style/About.Item"
android:text="Victor Yu (@vyu1)" />
<TextView
style="@style/About.Item"
android:text="Christoph Hennemann (@chennemann)" />
<TextView
style="@style/About.Item"
android:text="Денис (@sciamano)" />
<TextView
style="@style/About.Item"
android:text="Joseph Tran (@JotraN)" />
<TextView
style="@style/About.Item"
android:text="Nikhil (@regularcoder)" />
<TextView
style="@style/About.Item"
android:text="JanetQC" />
<TextView <TextView
android:id="@+id/tvContributors" android:id="@+id/tvContributors"
style="@style/About.Item.Clickable" style="@style/About.Item.Clickable"
android:text="@string/view_all_contributors"/> android:text="@string/view_all_contributors" />
</LinearLayout> </LinearLayout>
<include layout="@layout/about_translators"/> <include layout="@layout/about_translators" />
> >
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

Write Preview
Loading…
Cancel
Save