Display available instances
This commit is contained in:
parent
bdbbd25700
commit
4c4df0fee7
|
@ -53,23 +53,6 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private Map<String,String> categories;
|
|
||||||
|
|
||||||
private void createMap() {
|
|
||||||
categories = new HashMap<>();
|
|
||||||
categories.put("general", getString(R.string.category_general));
|
|
||||||
categories.put("regional", getString(R.string.category_regional));
|
|
||||||
categories.put("art", getString(R.string.category_art));
|
|
||||||
categories.put("journalism", getString(R.string.category_journalism));
|
|
||||||
categories.put("activism", getString(R.string.category_activism));
|
|
||||||
categories.put("lgbt", "LGBTQ+");
|
|
||||||
categories.put("games", getString(R.string.category_games));
|
|
||||||
categories.put("tech", getString(R.string.category_tech));
|
|
||||||
categories.put("adult", getString(R.string.category_adult));
|
|
||||||
categories.put("furry", getString(R.string.category_furry));
|
|
||||||
categories.put("food", getString(R.string.category_food));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
@ -90,7 +73,7 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
|
||||||
default:
|
default:
|
||||||
setTheme(R.style.AppThemeDark);
|
setTheme(R.style.AppThemeDark);
|
||||||
}
|
}
|
||||||
createMap();
|
|
||||||
setContentView(R.layout.activity_register);
|
setContentView(R.layout.activity_register);
|
||||||
ActionBar actionBar = getSupportActionBar();
|
ActionBar actionBar = getSupportActionBar();
|
||||||
if( actionBar != null ) {
|
if( actionBar != null ) {
|
||||||
|
@ -116,27 +99,44 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
|
||||||
|
|
||||||
MaterialSpinner reg_category = findViewById(R.id.reg_category);
|
MaterialSpinner reg_category = findViewById(R.id.reg_category);
|
||||||
Helper.changeMaterialSpinnerColor(MastodonRegisterActivity.this, reg_category);
|
Helper.changeMaterialSpinnerColor(MastodonRegisterActivity.this, reg_category);
|
||||||
|
String[] categoriesA = {
|
||||||
|
getString(R.string.category_general),
|
||||||
|
getString(R.string.category_regional),
|
||||||
|
getString(R.string.category_art),
|
||||||
|
getString(R.string.category_journalism),
|
||||||
|
getString(R.string.category_activism),
|
||||||
|
"LGBTQ+",
|
||||||
|
getString(R.string.category_games),
|
||||||
|
getString(R.string.category_tech),
|
||||||
|
getString(R.string.category_adult),
|
||||||
|
getString(R.string.category_furry),
|
||||||
|
getString(R.string.category_food)
|
||||||
|
|
||||||
String[] categoriesA = new String[categories.size()];
|
};
|
||||||
String[] itemA = new String[categories.size()];
|
String[] itemA = {
|
||||||
Iterator it = categories.entrySet().iterator();
|
"general",
|
||||||
int i = 0;
|
"regional",
|
||||||
while (it.hasNext()) {
|
"art",
|
||||||
Map.Entry pair = (Map.Entry)it.next();
|
"journalism",
|
||||||
itemA[i] = (String)pair.getKey();
|
"activism",
|
||||||
categoriesA[i] = (String)pair.getValue();
|
"lgbt",
|
||||||
i++;
|
"games",
|
||||||
it.remove();
|
"tech",
|
||||||
}
|
"adult",
|
||||||
|
"furry",
|
||||||
|
"food",
|
||||||
|
};
|
||||||
ArrayAdapter<String> adcategories = new ArrayAdapter<>(MastodonRegisterActivity.this,
|
ArrayAdapter<String> adcategories = new ArrayAdapter<>(MastodonRegisterActivity.this,
|
||||||
android.R.layout.simple_spinner_dropdown_item, categoriesA);
|
android.R.layout.simple_spinner_dropdown_item, categoriesA);
|
||||||
|
|
||||||
reg_category.setAdapter(adcategories);
|
reg_category.setAdapter(adcategories);
|
||||||
|
|
||||||
|
reg_category.setSelectedIndex(0);
|
||||||
//Manage privacies
|
//Manage privacies
|
||||||
reg_category.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
|
reg_category.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
|
||||||
@Override
|
@Override
|
||||||
public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
|
public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
|
||||||
|
new RetrieveInstanceRegAsyncTask(MastodonRegisterActivity.this, itemA[position], MastodonRegisterActivity.this).executeOnExecutor(THREAD_POOL_EXECUTOR);
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -352,6 +352,7 @@ public class API {
|
||||||
* @return APIResponse
|
* @return APIResponse
|
||||||
*/
|
*/
|
||||||
public APIResponse getInstanceReg(String category) {
|
public APIResponse getInstanceReg(String category) {
|
||||||
|
apiResponse = new APIResponse();
|
||||||
try {
|
try {
|
||||||
String response = new HttpsConnection(context, null).get(String.format("https://api.joinmastodon.org/servers?category=%s", category));
|
String response = new HttpsConnection(context, null).get(String.format("https://api.joinmastodon.org/servers?category=%s", category));
|
||||||
List<InstanceReg> instanceRegs = parseInstanceReg(new JSONArray(response));
|
List<InstanceReg> instanceRegs = parseInstanceReg(new JSONArray(response));
|
||||||
|
|
|
@ -24,6 +24,7 @@ public class InstanceReg {
|
||||||
private String proxied_thumbnail;
|
private String proxied_thumbnail;
|
||||||
private int total_users;
|
private int total_users;
|
||||||
private int last_week_users;
|
private int last_week_users;
|
||||||
|
private boolean selected = false;
|
||||||
|
|
||||||
public String getDomain() {
|
public String getDomain() {
|
||||||
return domain;
|
return domain;
|
||||||
|
@ -88,4 +89,12 @@ public class InstanceReg {
|
||||||
public void setLast_week_users(int last_week_users) {
|
public void setLast_week_users(int last_week_users) {
|
||||||
this.last_week_users = last_week_users;
|
this.last_week_users = last_week_users;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isSelected() {
|
||||||
|
return selected;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSelected(boolean selected) {
|
||||||
|
this.selected = selected;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,15 +15,27 @@ package app.fedilab.android.drawers;
|
||||||
* see <http://www.gnu.org/licenses>. */
|
* see <http://www.gnu.org/licenses>. */
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.ImageButton;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import com.bumptech.glide.Glide;
|
||||||
|
import com.bumptech.glide.load.resource.bitmap.FitCenter;
|
||||||
|
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
|
||||||
|
import com.bumptech.glide.request.RequestOptions;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import app.fedilab.android.R;
|
import app.fedilab.android.R;
|
||||||
import app.fedilab.android.client.Entities.InstanceReg;
|
import app.fedilab.android.client.Entities.InstanceReg;
|
||||||
|
import app.fedilab.android.helper.Helper;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -62,6 +74,19 @@ public class InstanceRegAdapter extends RecyclerView.Adapter {
|
||||||
|
|
||||||
final InstanceRegAdapter.ViewHolder holder = (InstanceRegAdapter.ViewHolder) viewHolder;
|
final InstanceRegAdapter.ViewHolder holder = (InstanceRegAdapter.ViewHolder) viewHolder;
|
||||||
|
|
||||||
|
holder.instance_choose.setOnClickListener(v -> {
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
holder.instance_count_user.setText(context.getString(R.string.users,Helper.withSuffix(instanceReg.getTotal_users())));
|
||||||
|
holder.instance_description.setText(instanceReg.getDescription());
|
||||||
|
holder.instance_host.setText(instanceReg.getDomain());
|
||||||
|
holder.instance_version.setText(String.format("%s - %s", instanceReg.getCategory(),instanceReg.getVersion()));
|
||||||
|
Log.v(Helper.TAG,"p: " + instanceReg.getProxied_thumbnail());
|
||||||
|
Glide.with(context)
|
||||||
|
.load(instanceReg.getProxied_thumbnail())
|
||||||
|
.apply(new RequestOptions().transforms(new FitCenter(), new RoundedCorners(10)))
|
||||||
|
.into(holder.instance_pp);
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getItemId(int position) {
|
public long getItemId(int position) {
|
||||||
|
@ -75,11 +100,18 @@ public class InstanceRegAdapter extends RecyclerView.Adapter {
|
||||||
|
|
||||||
|
|
||||||
class ViewHolder extends RecyclerView.ViewHolder{
|
class ViewHolder extends RecyclerView.ViewHolder{
|
||||||
ImageView imageView;
|
ImageView instance_pp;
|
||||||
|
TextView instance_host, instance_version, instance_description, instance_count_user;
|
||||||
|
ImageButton instance_choose;
|
||||||
|
|
||||||
public ViewHolder(View itemView) {
|
public ViewHolder(View itemView) {
|
||||||
super(itemView);
|
super(itemView);
|
||||||
imageView = itemView.findViewById(R.id.media);
|
instance_pp = itemView.findViewById(R.id.instance_pp);
|
||||||
|
instance_host = itemView.findViewById(R.id.instance_host);
|
||||||
|
instance_version = itemView.findViewById(R.id.instance_version);
|
||||||
|
instance_description = itemView.findViewById(R.id.instance_description);
|
||||||
|
instance_count_user = itemView.findViewById(R.id.instance_count_user);
|
||||||
|
instance_choose = itemView.findViewById(R.id.instance_choose);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -18,8 +18,8 @@
|
||||||
<ScrollView android:layout_width="match_parent"
|
<ScrollView android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
android:layout_margin="@dimen/fab_margin"
|
||||||
|
>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/drawer_layout"
|
android:id="@+id/drawer_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/category"/>
|
android:text="@string/pickup_instance_category"/>
|
||||||
<com.jaredrummler.materialspinner.MaterialSpinner
|
<com.jaredrummler.materialspinner.MaterialSpinner
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:id="@+id/reg_category"
|
android:id="@+id/reg_category"
|
||||||
|
@ -41,6 +41,6 @@
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/reg_category_view"
|
android:id="@+id/reg_category_view"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"/>
|
android:layout_height="300dp"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
|
@ -19,12 +19,15 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/main_container"
|
android:id="@+id/main_container"
|
||||||
android:divider="?android:dividerHorizontal"
|
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
|
android:background="@drawable/border_bottom"
|
||||||
|
android:divider="@null"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:paddingBottom="10dp"
|
||||||
android:baselineAligned="false">
|
android:baselineAligned="false">
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_weight="4"
|
android:layout_weight="1"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -35,13 +38,16 @@
|
||||||
android:id="@+id/instance_pp"
|
android:id="@+id/instance_pp"
|
||||||
android:layout_width="80dp"
|
android:layout_width="80dp"
|
||||||
android:layout_height="80dp"
|
android:layout_height="80dp"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
android:contentDescription="@string/instance_logo" />
|
android:contentDescription="@string/instance_logo" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/instance_host"
|
android:id="@+id/instance_host"
|
||||||
|
android:textSize="16sp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -56,15 +62,26 @@
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_weight="1"
|
android:layout_width="60dp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_marginStart="20dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
<Button
|
<ImageButton
|
||||||
android:layout_width="wrap_content"
|
android:layout_gravity="center"
|
||||||
android:layout_height="wrap_content"
|
android:gravity="center"
|
||||||
android:id="@+id/instance_choose"/>
|
android:id="@+id/instance_choose"
|
||||||
|
style="@style/Widget.AppCompat.Button.Colored"
|
||||||
|
android:layout_width="35dp"
|
||||||
|
android:layout_height="35dp"
|
||||||
|
android:layout_margin="5dp"
|
||||||
|
android:background="@color/mastodonC4"
|
||||||
|
android:contentDescription="@string/validate"
|
||||||
|
android:src="@drawable/ic_check"
|
||||||
|
android:tooltipText="@string/validate" />
|
||||||
<TextView
|
<TextView
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:gravity="center"
|
||||||
android:id="@+id/instance_count_user"
|
android:id="@+id/instance_count_user"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
|
@ -1004,6 +1004,8 @@
|
||||||
<string name="instance_logo">Logo of the instance</string>
|
<string name="instance_logo">Logo of the instance</string>
|
||||||
<string name="toast_error_instance_reg">Something went wrong when checking available instances!</string>
|
<string name="toast_error_instance_reg">Something went wrong when checking available instances!</string>
|
||||||
<string name="join_mastodon">Join Mastodon</string>
|
<string name="join_mastodon">Join Mastodon</string>
|
||||||
|
<string name="pickup_instance_category">Choose an instance by picking up a category</string>
|
||||||
|
<string name="users">%1$s users</string>
|
||||||
<plurals name="number_of_vote">
|
<plurals name="number_of_vote">
|
||||||
<item quantity="one">%d vote</item>
|
<item quantity="one">%d vote</item>
|
||||||
<item quantity="other">%d votes</item>
|
<item quantity="other">%d votes</item>
|
||||||
|
|
Loading…
Reference in New Issue