rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
aayush262 2024-03-05 14:36:46 +05:30
commit 8a1097cd35
15 changed files with 261 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/res/layout/fragment_profile.xml
View file

@ -332,7 +332,7 @@
<LinearLayout
android:id="@+id/userInfoContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
@ -347,12 +347,13 @@
android:textSize="16sp"
tools:ignore="HardcodedText" />
<TextView
<WebView
android:id="@+id/profileUserBio"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:textAlignment="textStart"
android:ellipsize="end"
android:padding="16dp"
tools:text="@string/slogan" />

2
app/src/main/res/values/colors.xml
View file

@ -226,7 +226,7 @@
<!-- theme 4 -->
<color name="seed_4">#e800ac</color>
<color name="md_theme_light_4_primary">#B30084</color>
<color name="md_theme_light_4_primary">#FF92E2</color>
<color name="md_theme_light_4_onPrimary">#FFFFFF</color>
<color name="md_theme_light_4_primaryContainer">#FFD8EA</color>
<color name="md_theme_light_4_onPrimaryContainer">#3C002A</color>

2
app/src/main/res/values/themes.xml
View file

@ -42,7 +42,7 @@
<style name="Theme.Dantotsu.PopupOverlay" parent="Theme.Dantotsu" />
<style name="Theme.Dantotsu.NeverCutout" parent="@style/Theme.Dantotsu.NoActionBar">
<item name="android:navigationBarColor">@color/nav_bg</item>
<item name="android:navigationBarColor">?android:colorBackground</item>
</style>
<style name="Theme.Dantotsu.ALLBLACK" parent="Theme.Base">