mirror of
https://github.com/nuclearfog/Shitter.git
synced 2025-02-07 23:58:44 +01:00
bug fix, added new tab icons
This commit is contained in:
nuclearfog
parent
edab6b8852
commit
10875abeec
@ -233,8 +233,8 @@ public class FragmentAdapter extends FragmentStatePagerAdapter {
|
||||
fragments = new ListFragment[2];
|
||||
fragments[0] = new UserFragment();
|
||||
fragments[1] = new UserFragment();
|
||||
fragments[0].setArguments(paramFollowing);
|
||||
fragments[1].setArguments(paramFollower);
|
||||
fragments[0].setArguments(paramFollower);
|
||||
fragments[1].setArguments(paramFollowing);
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@ import android.graphics.Color;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Toast;
|
||||
|
||||
@ -32,7 +33,7 @@ import org.nuclearfog.twidda.backend.utils.ErrorHandler;
|
||||
import org.nuclearfog.twidda.database.GlobalSettings;
|
||||
|
||||
/**
|
||||
* todo
|
||||
* Activity to show lists of Twitter users
|
||||
*
|
||||
* @author nuclearfog
|
||||
*/
|
||||
@ -100,8 +101,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
|
||||
FragmentAdapter adapter = new FragmentAdapter(getSupportFragmentManager());
|
||||
pager.setAdapter(adapter);
|
||||
|
||||
tablayout.setupWithViewPager(pager);
|
||||
tablayout.addOnTabSelectedListener(this);
|
||||
settings = GlobalSettings.getInstance(this);
|
||||
|
||||
int mode = getIntent().getIntExtra(KEY_USERDETAIL_MODE, 0);
|
||||
long id = getIntent().getLongExtra(KEY_USERDETAIL_ID, -1);
|
||||
@ -110,18 +110,21 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
|
||||
case USERLIST_FRIENDS:
|
||||
adapter.setupFollowingPage(id);
|
||||
pager.setOffscreenPageLimit(1);
|
||||
tablayout.setVisibility(View.GONE);
|
||||
toolbar.setTitle(R.string.userlist_following);
|
||||
break;
|
||||
|
||||
case USERLIST_FOLLOWER:
|
||||
adapter.setupFollowerPage(id);
|
||||
pager.setOffscreenPageLimit(1);
|
||||
tablayout.setVisibility(View.GONE);
|
||||
toolbar.setTitle(R.string.userlist_follower);
|
||||
break;
|
||||
|
||||
case USERLIST_RETWEETS:
|
||||
adapter.setupRetweeterPage(id);
|
||||
pager.setOffscreenPageLimit(1);
|
||||
tablayout.setVisibility(View.GONE);
|
||||
toolbar.setTitle(R.string.toolbar_userlist_retweet);
|
||||
break;
|
||||
|
||||
@ -129,28 +132,30 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
|
||||
int title = settings.likeEnabled() ? R.string.toolbar_tweet_liker : R.string.toolbar_tweet_favoriter;
|
||||
adapter.setFavoriterPage(id);
|
||||
pager.setOffscreenPageLimit(1);
|
||||
tablayout.setVisibility(View.GONE);
|
||||
toolbar.setTitle(title);
|
||||
break;
|
||||
|
||||
case USERLIST_EXCLUDED_USERS:
|
||||
adapter.setupMuteBlockPage();
|
||||
pager.setOffscreenPageLimit(2);
|
||||
tablayout.setupWithViewPager(pager);
|
||||
tablayout.addOnTabSelectedListener(this);
|
||||
AppStyles.setTabIcons(tablayout, settings, R.array.user_exclude_icons);
|
||||
toolbar.setTitle("");
|
||||
break;
|
||||
|
||||
case USERLIST_REQUESTS:
|
||||
adapter.setupFollowRequestPage();
|
||||
pager.setOffscreenPageLimit(2);
|
||||
tablayout.setupWithViewPager(pager);
|
||||
tablayout.addOnTabSelectedListener(this);
|
||||
AppStyles.setTabIcons(tablayout, settings, R.array.user_requests_icon);
|
||||
toolbar.setTitle("");
|
||||
break;
|
||||
}
|
||||
|
||||
setSupportActionBar(toolbar);
|
||||
settings = GlobalSettings.getInstance(this);
|
||||
AppStyles.setTheme(root, settings.getBackgroundColor());
|
||||
AppStyles.setTabIcons(tablayout, settings, R.array.user_exclude_icons);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -166,7 +171,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
|
||||
AppStyles.setMenuIconColor(m, settings.getIconColor());
|
||||
AppStyles.setOverflowIcon(toolbar, settings.getIconColor());
|
||||
return super.onCreateOptionsMenu(m);
|
||||
}// todo add icons
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
19
app/src/main/res/drawable/follower_request.xml
Normal file
19
app/src/main/res/drawable/follower_request.xml
Normal file
@ -0,0 +1,19 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="328dp"
|
||||
android:height="328dp"
|
||||
android:viewportWidth="328"
|
||||
android:viewportHeight="328">
|
||||
<path
|
||||
android:pathData="m44.19,117.15c0,27.68 22.52,50.2 50.2,50.2 27.68,0 50.2,-22.52 50.2,-50.2C144.59,89.47 122.07,66.95 94.39,66.95 66.71,66.95 44.19,89.47 44.19,117.15Z"
|
||||
android:fillColor="#ffffff"/>
|
||||
<path
|
||||
android:pathData="m176.3,275.83c2.34,2.34 5.41,3.51 8.48,3.51 3.07,0 6.14,-1.17 8.49,-3.52 4.69,-4.69 4.69,-12.28 -0,-16.97l-15.51,-15.51 15.52,-15.52c4.69,-4.69 4.69,-12.28 -0,-16.97 -4.69,-4.69 -12.28,-4.68 -16.97,0l-24,24c-2.25,2.25 -3.51,5.3 -3.51,8.49 0,3.18 1.26,6.24 3.52,8.49z"
|
||||
android:fillColor="#ffffff"/>
|
||||
<path
|
||||
android:pathData="m14.39,295.35l100.48,0c15.4,19.48 39.22,32 65.92,32 46.32,0 84,-37.68 84,-84 0,-46.32 -37.68,-84 -84,-84 -27.59,0 -52.12,13.37 -67.44,33.98 -6.21,-1.3 -12.56,-1.98 -18.96,-1.98 -50.73,0 -92,41.27 -92,92 0,6.63 5.37,12 12,12zM180.79,183.35c33.08,0 60,26.92 60,60 0,33.08 -26.92,60 -60,60 -33.08,0 -60,-26.92 -60,-60 0,-33.08 26.92,-60 60,-60z"
|
||||
android:fillColor="#ffffff"/>
|
||||
<path
|
||||
android:pathData="m319.52,45.33c0,35.98 -39.98,33.54 -39.98,58.41v0.13c0,2.87 -2.33,5.2 -5.2,5.2h-21.81c-2.87,0 -5.2,-2.33 -5.2,-5.2v-1.47c0,-38.42 35.09,-35.98 35.09,-53.97 0,-7.77 -5.77,-12.44 -15.32,-12.44 -7.77,0 -15.71,3.4 -22.93,10.34 -1.85,1.78 -4.74,1.89 -6.76,0.31L223.08,35.43c-2.42,-1.89 -2.7,-5.47 -0.56,-7.68 11.98,-12.35 27.54,-19.74 48.15,-19.74 32.65,0 48.86,17.55 48.86,37.31zM283.99,149.49c0,11.1 -8.88,20.21 -20.21,20.21 -11.1,0 -20.21,-9.11 -20.21,-20.21 0,-11.1 9.11,-20.21 20.21,-20.21 11.33,0 20.21,9.11 20.21,20.21z"
|
||||
android:strokeWidth="0.4"
|
||||
android:fillColor="#ffffff"/>
|
||||
</vector>
|
||||
19
app/src/main/res/drawable/following_request.xml
Normal file
19
app/src/main/res/drawable/following_request.xml
Normal file
@ -0,0 +1,19 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="328dp"
|
||||
android:height="328dp"
|
||||
android:viewportWidth="328"
|
||||
android:viewportHeight="328">
|
||||
<path
|
||||
android:pathData="M145.32,116.53C145.32,88.85 122.8,66.33 95.12,66.33 67.44,66.33 44.92,88.85 44.92,116.53c0,27.68 22.52,50.2 50.2,50.2 27.68,0 50.2,-22.52 50.2,-50.2z"
|
||||
android:fillColor="#ffffff"/>
|
||||
<path
|
||||
android:pathData="m186.01,210.24c-4.69,-4.69 -12.28,-4.69 -16.97,-0 -4.69,4.69 -4.69,12.28 0,16.97l15.51,15.52 -15.51,15.51c-4.69,4.69 -4.69,12.28 0,16.97 2.34,2.34 5.41,3.52 8.49,3.52 3.07,0 6.14,-1.17 8.48,-3.51l24,-24c2.25,-2.25 3.52,-5.3 3.52,-8.49 0,-3.18 -1.26,-6.23 -3.52,-8.49z"
|
||||
android:fillColor="#ffffff"/>
|
||||
<path
|
||||
android:pathData="m181.52,158.73c-27.59,0 -52.12,13.37 -67.44,33.98 -6.21,-1.3 -12.56,-1.98 -18.96,-1.98 -50.73,0 -92,41.27 -92,92 0,6.63 5.37,12 12,12l100.48,0c15.4,19.48 39.22,32 65.92,32 46.32,0 84,-37.68 84,-84 0,-46.32 -37.68,-84 -84,-84zM181.52,302.73c-33.08,0 -60,-26.92 -60,-60 0,-33.08 26.92,-60 60,-60 33.08,0 60,26.92 60,60 0,33.08 -26.92,60 -60,60z"
|
||||
android:fillColor="#ffffff"/>
|
||||
<path
|
||||
android:pathData="m316.95,47.53c0,35.98 -39.98,33.54 -39.98,58.41v0.13c0,2.87 -2.33,5.2 -5.2,5.2h-21.81c-2.87,0 -5.2,-2.33 -5.2,-5.2v-1.47c0,-38.42 35.09,-35.98 35.09,-53.97 0,-7.77 -5.77,-12.44 -15.32,-12.44 -7.77,0 -15.71,3.4 -22.93,10.34 -1.85,1.78 -4.74,1.89 -6.76,0.31l-14.34,-11.22c-2.42,-1.89 -2.7,-5.47 -0.56,-7.68 11.98,-12.35 27.54,-19.74 48.15,-19.74 32.65,0 48.86,17.55 48.86,37.31zM281.41,151.69c0,11.1 -8.88,20.21 -20.21,20.21 -11.1,0 -20.21,-9.11 -20.21,-20.21 0,-11.1 9.11,-20.21 20.21,-20.21 11.33,0 20.21,9.11 20.21,20.21z"
|
||||
android:strokeWidth="0.4"
|
||||
android:fillColor="#ffffff"/>
|
||||
</vector>
|
||||
@ -17,11 +17,12 @@
|
||||
android:id="@+id/userexclude_tab"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@android:color/transparent" />
|
||||
android:background="@android:color/transparent"/>
|
||||
|
||||
<androidx.viewpager.widget.ViewPager
|
||||
android:id="@+id/userexclude_pager"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
android:layout_height="match_parent"
|
||||
tools:ignore="SpeakableTextPresentCheck" />
|
||||
|
||||
</LinearLayout>
|
||||
@ -241,4 +241,5 @@
|
||||
<string name="dialog_confirm_remember">merken</string>
|
||||
<string name="directmessage_media_button">Medienanhang</string>
|
||||
<string name="error_invalid_media">Ungültige Mediendatei!</string>
|
||||
<string name="menu_follow_requests">Anfragen</string>
|
||||
</resources>
|
||||
@ -23,6 +23,11 @@
|
||||
<item>@drawable/block</item>
|
||||
</integer-array>
|
||||
|
||||
<integer-array name="user_requests_icon">
|
||||
<item>@drawable/follower_request</item>
|
||||
<item>@drawable/following_request</item>
|
||||
</integer-array>
|
||||
|
||||
<integer-array name="profile_tab_icons">
|
||||
<item>@drawable/home</item>
|
||||
<item>@drawable/favorite</item>
|
||||
|
||||
@ -119,7 +119,7 @@
|
||||
<string name="menu_tweet_unhide">unhide</string>
|
||||
<string name="menu_tweet_open_browser">open in browser</string>
|
||||
<string name="menu_mute_user">mute</string>
|
||||
<string name="menu_follow_requests">requests</string>
|
||||
<string name="menu_follow_requests">Requests</string>
|
||||
<string name="menu_edit_profile">edit profile</string>
|
||||
<string name="menu_edit_save">save</string>
|
||||
<string name="menu_add_user">add user to list</string>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user