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

Change about page

This commit is contained in:
stom79 2018-11-09 07:02:55 +01:00
parent 27cd6c5d9a
commit b3833cb4a6
4 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
View File

@ -67,11 +67,13 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
private List<Account> contributors = new ArrayList<>();
private List<Account> designers = new ArrayList<>();
private List<Account> banners = new ArrayList<>();
private List<Account> uxuidesigners = new ArrayList<>();
private AccountSearchDevAdapter accountSearchWebAdapterDeveloper;
private AccountSearchDevAdapter accountSearchWebAdapterDesigner;
private AccountSearchDevAdapter accountSearchWebAdapterContributors;
private AccountSearchDevAdapter accountSearchWebAdapterBanners;
private AccountSearchDevAdapter accountSearchWebAdapterUxUiDesigners;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -127,6 +129,8 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
ExpandableHeightListView lv_designers = findViewById(R.id.lv_designers);
ExpandableHeightListView lv_contributors = findViewById(R.id.lv_contributors);
ExpandableHeightListView lv_banners = findViewById(R.id.lv_banners);
ExpandableHeightListView lv_ux = findViewById(R.id.lv_ux);
Button about_code = findViewById(R.id.about_code);
Button about_license = findViewById(R.id.about_license);
Button about_thekinrar = findViewById(R.id.about_thekinrar);
@ -222,6 +226,7 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
lv_developers.setExpanded(true);
lv_designers.setExpanded(true);
lv_banners.setExpanded(true);
lv_ux.setExpanded(true);
accountSearchWebAdapterContributors = new AccountSearchDevAdapter(AboutActivity.this, contributors);
lv_contributors.setAdapter(accountSearchWebAdapterContributors);
@ -231,9 +236,11 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
lv_developers.setAdapter(accountSearchWebAdapterDeveloper);
accountSearchWebAdapterBanners = new AccountSearchDevAdapter(AboutActivity.this, banners);
lv_banners.setAdapter(accountSearchWebAdapterBanners);
accountSearchWebAdapterUxUiDesigners = new AccountSearchDevAdapter(AboutActivity.this, uxuidesigners);
lv_ux.setAdapter(accountSearchWebAdapterUxUiDesigners);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "tom79", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "mmarif", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "NateLikesSheep", "mastodon.art", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "daycode", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "PhotonQyv", "mastodon.xyz", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@ -278,6 +285,10 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
designers.add(account);
accountSearchWebAdapterDesigner.notifyDataSetChanged();
break;
case "mmarif":
uxuidesigners.add(account);
accountSearchWebAdapterUxUiDesigners.notifyDataSetChanged();
break;
default:
contributors.add(account);
accountSearchWebAdapterContributors.notifyDataSetChanged();
@ -311,6 +322,11 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(),AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
if( uxuidesigners != null){
for(Account account: uxuidesigners){
new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(),AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
}
@Override
@ -348,5 +364,12 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
break;
}
}
for( int i = 0 ; i < uxuidesigners.size() ; i++){
if( uxuidesigners.get(i).getId() != null && uxuidesigners.get(i).getId().equals(relationship.getId())){
uxuidesigners.get(i).setFollowing(relationship.isFollowing() || userId.trim().equals(relationship.getId()));
accountSearchWebAdapterUxUiDesigners.notifyDataSetChanged();
break;
}
}
}
}

21
app/src/main/res/layout-sw600dp/activity_about.xml
View File

@ -111,6 +111,27 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:ignore="HardcodedText" />
<!-- About UX/UI designer -->
<TextView
android:padding="5dp"
android:layout_marginTop="10dp"
android:id="@+id/about_thanks_ux"
android:layout_width="match_parent"
android:textColor="?colorAccent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="16sp"
android:text="@string/thanks_text_ux"/>
<fr.gouv.etalab.mastodon.helper.ExpandableHeightListView
android:id="@+id/lv_ux"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
<!-- About banner designer -->
<TextView
android:id="@+id/about_thanks_banner"

21
app/src/main/res/layout/activity_about.xml
View File

@ -106,6 +106,27 @@
android:layout_height="wrap_content"
tools:ignore="HardcodedText" />
<!-- About UX/UI designer -->
<TextView
android:padding="5dp"
android:layout_marginTop="10dp"
android:id="@+id/about_thanks_ux"
android:layout_width="match_parent"
android:textColor="?colorAccent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="16sp"
android:text="@string/thanks_text_ux"/>
<fr.gouv.etalab.mastodon.helper.ExpandableHeightListView
android:id="@+id/lv_ux"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
<!-- About logo designer -->
<!-- About banner designer -->
<TextView
android:padding="5dp"

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

@ -656,6 +656,7 @@
<string name="set_display_emoji">Use Emoji One</string>
<string name="information">Information</string>
<string name="set_display_card">Display previews in all toots</string>
<string name="thanks_text_ux">New UX/UI designer</string>
<string-array name="filter_expire">
<item>Never</item>