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

Fix issue #787

This commit is contained in:
stom79 2019-02-08 19:11:54 +01:00
parent dd4a7e1516
commit 70010afa92
3 changed files with 199 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ import es.dmoral.toasty.Toasty;
import fr.gouv.etalab.mastodon.R;
import fr.gouv.etalab.mastodon.asynctasks.RetrieveRelationshipAsyncTask;
import fr.gouv.etalab.mastodon.asynctasks.RetrieveRemoteDataAsyncTask;
import fr.gouv.etalab.mastodon.asynctasks.UpdateAccountInfoAsyncTask;
import fr.gouv.etalab.mastodon.client.Entities.Account;
import fr.gouv.etalab.mastodon.client.Entities.Error;
import fr.gouv.etalab.mastodon.client.Entities.Relationship;
@ -139,6 +140,17 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
Button about_thekinrar = findViewById(R.id.about_thekinrar);
Button about_trunk = findViewById(R.id.about_trunk);
TextView txt_developers, txt_ux, txt_support, txt_banners, txt_designers, txt_thankyou1, txt_thankyou2;
txt_developers = findViewById(R.id.txt_developers);
txt_ux = findViewById(R.id.txt_ux);
txt_support = findViewById(R.id.txt_support);
txt_banners = findViewById(R.id.txt_banners);
txt_designers = findViewById(R.id.txt_designers);
txt_thankyou1 = findViewById(R.id.txt_thankyou1);
txt_thankyou2 = findViewById(R.id.txt_thankyou2);
about_code.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -245,13 +257,86 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
accountSearchWebAdapterSupport = new AccountSearchDevAdapter(AboutActivity.this, support);
lv_support.setAdapter(accountSearchWebAdapterSupport);
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(), "guzzisti", "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(), "kasun", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "PhotonQyv", "mastodon.xyz", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "angrytux", "social.tchncs.de", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA ) {
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(), "guzzisti", "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(), "kasun", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "PhotonQyv", "mastodon.xyz", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "angrytux", "social.tchncs.de", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}else{
SpannableString name = new SpannableString("@tom79@mastodon.social");
name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
txt_developers.setText(name);
txt_developers.setVisibility(View.VISIBLE);
txt_developers.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.openBrowser(AboutActivity.this, "https://mastodon.social/@tom79");
}
});
name = new SpannableString("@mmarif@mastodon.social");
name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
txt_ux.setText(name);
txt_ux.setVisibility(View.VISIBLE);
txt_ux.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.openBrowser(AboutActivity.this, "https://mastodon.social/@mmarif");
}
});
name = new SpannableString("@guzzisti@mastodon.social");
name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
txt_support.setText(name);
txt_support.setVisibility(View.VISIBLE);
txt_support.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.openBrowser(AboutActivity.this, "https://mastodon.social/@guzzisti");
}
});
name = new SpannableString("@NateLikesSheep@mastodon.art");
name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
txt_banners.setText(name);
txt_banners.setVisibility(View.VISIBLE);
txt_banners.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.openBrowser(AboutActivity.this, "https://mastodon.art/@NateLikesSheep");
}
});
name = new SpannableString("@kasun@mastodon.social");
name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
txt_designers.setText(name);
txt_designers.setVisibility(View.VISIBLE);
txt_designers.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.openBrowser(AboutActivity.this, "https://mastodon.social/@kasun");
}
});
name = new SpannableString("@PhotonQyv@mastodon.xyz");
name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
txt_thankyou1.setText(name);
txt_thankyou1.setVisibility(View.VISIBLE);
txt_thankyou1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.openBrowser(AboutActivity.this, "https://mastodon.xyz/@PhotonQyv");
}
});
name = new SpannableString("@angrytux@social.tchncs.de");
name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
txt_thankyou2.setText(name);
txt_thankyou2.setVisibility(View.VISIBLE);
txt_thankyou2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Helper.openBrowser(AboutActivity.this, "https://social.tchncs.de/@angrytux");
}
});
}
}

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

@ -68,7 +68,16 @@
android:layout_marginRight="150dp"
android:divider="@null"
android:scrollbars="none"/>
<TextView
android:id="@+id/txt_developers"
android:visibility="gone"
android:textSize="18sp"
android:layout_marginBottom="20dp"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="150dp"
android:layout_marginRight="150dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button
android:id="@+id/about_support"
android:layout_gravity="center"
@ -134,7 +143,15 @@
android:layout_marginRight="150dp"
android:divider="@null"
android:scrollbars="none" />
<TextView
android:id="@+id/txt_ux"
android:visibility="gone"
android:textSize="16sp"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="150dp"
android:layout_marginRight="150dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About Help desk -->
<TextView
android:id="@+id/about_thanks_support"
@ -157,7 +174,15 @@
android:layout_marginRight="150dp"
android:divider="@null"
android:scrollbars="none" />
<TextView
android:id="@+id/txt_support"
android:visibility="gone"
android:textSize="16sp"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="150dp"
android:layout_marginRight="150dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About banner designer -->
<TextView
android:id="@+id/about_thanks_banner"
@ -179,6 +204,15 @@
android:layout_marginRight="150dp"
android:divider="@null"
android:scrollbars="none"/>
<TextView
android:id="@+id/txt_banners"
android:visibility="gone"
android:textSize="16sp"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="150dp"
android:layout_marginRight="150dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About logo designer -->
<TextView
android:id="@+id/about_thanks_logo"
@ -200,7 +234,15 @@
android:layout_marginRight="150dp"
android:divider="@null"
android:scrollbars="none"/>
<TextView
android:id="@+id/txt_designers"
android:visibility="gone"
android:textSize="16sp"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="150dp"
android:layout_marginRight="150dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About contributors -->
<TextView
@ -224,6 +266,24 @@
android:layout_marginRight="150dp"
android:divider="@null"
android:scrollbars="none"/>
<TextView
android:id="@+id/txt_thankyou1"
android:visibility="gone"
android:textSize="16sp"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="150dp"
android:layout_marginRight="150dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/txt_thankyou2"
android:visibility="gone"
android:textSize="16sp"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="150dp"
android:layout_marginRight="150dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About license -->
<LinearLayout

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

@ -62,6 +62,13 @@
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
<TextView
android:id="@+id/txt_developers"
android:visibility="gone"
android:textSize="18sp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button
android:id="@+id/about_support"
@ -125,6 +132,12 @@
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
<TextView
android:id="@+id/txt_ux"
android:visibility="gone"
android:textSize="16sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About Help desk -->
<TextView
@ -145,6 +158,12 @@
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
<TextView
android:id="@+id/txt_support"
android:visibility="gone"
android:textSize="16sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About banner designer -->
<TextView
@ -165,7 +184,12 @@
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
<TextView
android:id="@+id/txt_banners"
android:visibility="gone"
android:textSize="16sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About logo designer -->
<TextView
android:padding="5dp"
@ -185,7 +209,12 @@
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
<TextView
android:id="@+id/txt_designers"
android:visibility="gone"
android:textSize="16sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About contributors -->
<TextView
@ -206,9 +235,18 @@
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"/>
<TextView
android:id="@+id/txt_thankyou1"
android:visibility="gone"
android:textSize="16sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/txt_thankyou2"
android:visibility="gone"
android:textSize="16sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- About license -->
<LinearLayout