Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: fixes 2 crashes 

I dont wanna write a decent commit message today
This commit is contained in:
LucasGGamerM 2023-08-24 08:07:15 -03:00
parent e8138685a8
commit 3db74fb958
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
View File

@ -72,7 +72,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard implements HasAccoun
private MergeRecyclerAdapter adapter=new MergeRecyclerAdapter(); private MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
private String domain; private String domain;
private String accountID; private String accountID;
private Map<String, Integer> recentEmojis = AccountSessionManager.get(accountID).getLocalPreferences().recentEmojis; private Map<String, Integer> recentEmojis;
private int spanCount=6; private int spanCount=6;
private Listener listener; private Listener listener;
@ -90,6 +90,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard implements HasAccoun
this.domain=domain; this.domain=domain;
this.accountID=accountID; this.accountID=accountID;
this.forReaction=forReaction; this.forReaction=forReaction;
recentEmojis = AccountSessionManager.get(accountID).getLocalPreferences().recentEmojis;
} }
@Override @Override

30
mastodon/src/main/res/layout/fragment_profile.xml
View File

@ -200,6 +200,21 @@
android:visibility="gone" android:visibility="gone"
app:labelTextColor="@color/m3_outlined_text_field_label"> app:labelTextColor="@color/m3_outlined_text_field_label">
<EditText
android:id="@+id/name_edit"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:background="@null"
android:elevation="0dp"
android:hint="@string/display_name"
android:inputType="textPersonName|textCapWords"
android:padding="16dp"
tools:text="Eugen"
android:autofillHints="" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -252,21 +267,6 @@
<!-- android:textAppearance="@style/m3_body_large"--> <!-- android:textAppearance="@style/m3_body_large"-->
<!-- android:textSize="16sp"--> <!-- android:textSize="16sp"-->
<!-- tools:text="Founder, CEO and lead developer @Mastodon, Germany." />--> <!-- tools:text="Founder, CEO and lead developer @Mastodon, Germany." />-->
<EditText
android:id="@+id/name_edit"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:background="@null"
android:elevation="0dp"
android:hint="@string/display_name"
android:inputType="textPersonName|textCapWords"
android:padding="16dp"
tools:text="Eugen"
android:autofillHints="" />
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout> </org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout <org.joinmastodon.android.ui.views.FloatingHintEditTextLayout