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

Last fixes for Pixelfed

This commit is contained in:
stom79 2019-01-16 11:33:18 +01:00
parent b95ad41724
commit 559439193d
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -939,13 +939,14 @@ public abstract class BaseMainActivity extends BaseActivity
iconNotif.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN);
}
toot.setImageResource(R.drawable.ic_cloud_upload);
tabLayout.addTab(pfTabHome);
tabLayout.addTab(pfTabLocal);
tabLayout.addTab(pfTabNotification);
// tabLayout.addTab(pfTabDiscover);
tabLayout.setTabMode(TabLayout.MODE_FIXED);
tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
main_app_container = findViewById(R.id.main_app_container);
@ -2092,7 +2093,7 @@ public abstract class BaseMainActivity extends BaseActivity
fragmentManager.beginTransaction()
.replace(R.id.main_app_container, settingsPeertubeFragment, fragmentTag).commit();
}else if (id == R.id.nav_favorites) {
}else if (id == R.id.nav_favorites || id == R.id.nav_pixelfed_favorites) {
toot.hide();
statusFragment = new DisplayStatusFragment();
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.FAVOURITES);
@ -2115,7 +2116,7 @@ public abstract class BaseMainActivity extends BaseActivity
fragmentTag = "MY_VIDEOS";
fragmentManager.beginTransaction()
.replace(R.id.main_app_container, fragment, fragmentTag).commit();
} else if (id == R.id.nav_blocked) {
} else if (id == R.id.nav_blocked || id == R.id.nav_pixelfed_blocked) {
toot.hide();
accountsFragment = new DisplayAccountsFragment();
bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.BLOCKED);
@ -2135,7 +2136,7 @@ public abstract class BaseMainActivity extends BaseActivity
fragmentTag = "HOW_TO_VIDEOS";
fragmentManager.beginTransaction()
.replace(R.id.main_app_container, displayHowToFragment, fragmentTag).commit();
}else if (id == R.id.nav_muted) {
}else if (id == R.id.nav_muted || id == R.id.nav_pixelfed_muted) {
toot.hide();
accountsFragment = new DisplayAccountsFragment();
bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.MUTED);

6
app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
View File

@ -824,8 +824,8 @@ public class API {
params.put("page", max_id);
statuses = new ArrayList<>();
try {
HttpsConnectionPix httpsConnection = new HttpsConnectionPix(context);
String response = httpsConnection.getPixelfed(getAbsoluteUrlRemote(remoteInstance, "/timelines/public/"), 60, params, prefKeyOauthTokenT);
HttpsConnection httpsConnection = new HttpsConnection(context);
String response = httpsConnection.get(getAbsoluteUrlRemote(remoteInstance, "/timelines/public/"), 60, params, prefKeyOauthTokenT);
apiResponse.setSince_id(httpsConnection.getSince_id());
apiResponse.setMax_id(httpsConnection.getMax_id());
statuses = parseStatuses(context, new JSONArray(response));
@ -837,7 +837,7 @@ public class API {
e.printStackTrace();
} catch (JSONException e) {
e.printStackTrace();
} catch (HttpsConnectionPix.HttpsConnectionException e) {
} catch (HttpsConnection.HttpsConnectionException e) {
e.printStackTrace();
}
apiResponse.setStatuses(statuses);

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

@ -91,10 +91,12 @@
android:icon="@drawable/ic_favorite_peertube_full"
android:title="@string/peertube_favorites" />
-->
<!--
<item
android:id="@+id/nav_my_photo"
android:icon="@drawable/ic_pixelfed_media"
android:title="@string/my_videos" />
android:title="@string/my_pictures" />
-->
<item
android:id="@+id/nav_pixelfed_favorites"
android:icon="@drawable/ic_pixelfed_favorite"
@ -107,11 +109,12 @@
android:id="@+id/nav_pixelfed_muted"
android:icon="@drawable/ic_volume_mute"
android:title="@string/muted_menu" />
<!--
<item
android:id="@+id/nav_pixelfed_settings"
android:icon="@drawable/ic_settings"
android:title="@string/settings" />
-->
</group>
</menu>
</item>

1
app/src/main/res/values/strings.xml
View File

@ -827,6 +827,7 @@
<string name="add_image_to_favorite">Add media to favorites</string>
<string name="leave_a_comment">Leave a comment</string>
<string name="share">Share</string>
<string name="my_pictures">My pictures</string>
<!-- end languages -->