Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crashes

This commit is contained in:
stom79 2018-11-05 18:01:17 +01:00
parent d1fecd3f78
commit 7c611e29a3
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
View File

@ -264,7 +264,7 @@ public abstract class BaseMainActivity extends BaseActivity
icon.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon));
if( close != null)
close.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_icon));
EditText editText = ((EditText) toolbar_search.findViewById(android.support.v7.appcompat.R.id.search_src_text));
EditText editText = toolbar_search.findViewById(android.support.v7.appcompat.R.id.search_src_text);
editText.setHintTextColor(getResources().getColor(R.color.dark_icon));
editText.setTextColor(getResources().getColor(R.color.dark_icon));
}

2
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
View File

@ -435,7 +435,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
while (position < this.statuses.size() && Long.parseLong(statuses.get(0).getId()) < Long.parseLong(this.statuses.get(position).getId())) {
position++;
}
while (position < this.notFilteredStatuses.size() && Long.parseLong(statuses.get(0).getId()) < Long.parseLong(this.notFilteredStatuses.get(position).getId())) {
while (positionNotFiltered < this.notFilteredStatuses.size() && Long.parseLong(statuses.get(0).getId()) < Long.parseLong(this.notFilteredStatuses.get(positionNotFiltered).getId())) {
positionNotFiltered++;
}
ArrayList<Status> tmpStatuses = new ArrayList<>();

11
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -1414,12 +1414,19 @@ public class Helper {
.build();
if( actionButton != null) {
actionButton.setFocusable(true);
actionButton.setFocusableInTouchMode(true);
actionButton.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
actionMenu.close(true);
try {
if( !activity.isFinishing() ){
if( hasFocus && !actionMenu.isOpen())
actionMenu.open(true);
else if( !hasFocus && actionMenu.isOpen())
actionMenu.close(true);
}
}catch (Exception ignored){}
}
});
}

9
app/src/main/res/drawable-anydpi/ic_bookmark_menu.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
</vector>

2
app/src/main/res/menu/activity_main_drawer.xml
View File

@ -29,7 +29,7 @@
android:title="@string/owner_cached_toots" />
<item
android:id="@+id/nav_bookmarks"
android:icon="@drawable/ic_bookmark"
android:icon="@drawable/ic_bookmark_menu"
android:title="@string/bookmarks" />
<item
android:id="@+id/nav_peertube"