Add some elements for registering an account
This commit is contained in:
parent
02efb85d06
commit
bdbbd25700
|
@ -35,8 +35,10 @@ import androidx.appcompat.app.AlertDialog;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
import android.text.SpannableString;
|
import android.text.SpannableString;
|
||||||
|
import android.text.Spanned;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
import android.text.method.LinkMovementMethod;
|
import android.text.method.LinkMovementMethod;
|
||||||
|
import android.text.style.ForegroundColorSpan;
|
||||||
import android.text.style.UnderlineSpan;
|
import android.text.style.UnderlineSpan;
|
||||||
import android.text.util.Linkify;
|
import android.text.util.Linkify;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
@ -62,6 +64,7 @@ import com.jaredrummler.materialspinner.MaterialSpinner;
|
||||||
import org.json.JSONArray;
|
import org.json.JSONArray;
|
||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
import org.w3c.dom.Text;
|
||||||
|
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
|
@ -213,6 +216,25 @@ public class LoginActivity extends BaseActivity {
|
||||||
changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC3);
|
changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TextView create_an_account_message = findViewById(R.id.create_an_account);
|
||||||
|
SpannableString content_create = new SpannableString(getString(R.string.join_mastodon));
|
||||||
|
content_create.setSpan(new UnderlineSpan(), 0, content_create.length(), 0);
|
||||||
|
if( theme == Helper.THEME_DARK)
|
||||||
|
content_create.setSpan(new ForegroundColorSpan(ContextCompat.getColor(LoginActivity.this, R.color.dark_link_toot)), 0, content_create.length(),
|
||||||
|
Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
|
||||||
|
else if( theme == Helper.THEME_BLACK)
|
||||||
|
content_create.setSpan(new ForegroundColorSpan(ContextCompat.getColor(LoginActivity.this, R.color.black_link_toot)), 0, content_create.length(),
|
||||||
|
Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
|
||||||
|
else if( theme == Helper.THEME_LIGHT)
|
||||||
|
content_create.setSpan(new ForegroundColorSpan(ContextCompat.getColor(LoginActivity.this, R.color.mastodonC4)), 0, content_create.length(),
|
||||||
|
Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
|
||||||
|
create_an_account_message.setText(content_create);
|
||||||
|
create_an_account_message.setOnClickListener(v -> {
|
||||||
|
Intent mainActivity = new Intent(LoginActivity.this, MastodonRegisterActivity.class);
|
||||||
|
startActivity(mainActivity);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
login_instance = findViewById(R.id.login_instance);
|
login_instance = findViewById(R.id.login_instance);
|
||||||
login_uid = findViewById(R.id.login_uid);
|
login_uid = findViewById(R.id.login_uid);
|
||||||
login_passwd = findViewById(R.id.login_passwd);
|
login_passwd = findViewById(R.id.login_passwd);
|
||||||
|
|
|
@ -20,27 +20,43 @@ import android.os.Bundle;
|
||||||
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.ArrayAdapter;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
import androidx.appcompat.app.ActionBar;
|
import androidx.appcompat.app.ActionBar;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
import com.jaredrummler.materialspinner.MaterialSpinner;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import app.fedilab.android.R;
|
import app.fedilab.android.R;
|
||||||
|
import app.fedilab.android.asynctasks.RetrieveInstanceRegAsyncTask;
|
||||||
|
import app.fedilab.android.client.APIResponse;
|
||||||
|
import app.fedilab.android.client.Entities.InstanceReg;
|
||||||
|
import app.fedilab.android.drawers.InstanceRegAdapter;
|
||||||
import app.fedilab.android.helper.Helper;
|
import app.fedilab.android.helper.Helper;
|
||||||
|
import app.fedilab.android.interfaces.OnRetrieveInstanceInterface;
|
||||||
|
import es.dmoral.toasty.Toasty;
|
||||||
|
|
||||||
|
import static android.os.AsyncTask.THREAD_POOL_EXECUTOR;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Thomas on 13/06/2019.
|
* Created by Thomas on 13/06/2019.
|
||||||
* Register activity class
|
* Register activity class
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class MastodonRegisterActivity extends BaseActivity {
|
public class MastodonRegisterActivity extends BaseActivity implements OnRetrieveInstanceInterface {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private Map<String,String> categories;
|
||||||
|
|
||||||
private Map<String, String> createMap() {
|
private void createMap() {
|
||||||
Map<String,String> categories = new HashMap<>();
|
categories = new HashMap<>();
|
||||||
categories.put("general", getString(R.string.category_general));
|
categories.put("general", getString(R.string.category_general));
|
||||||
categories.put("regional", getString(R.string.category_regional));
|
categories.put("regional", getString(R.string.category_regional));
|
||||||
categories.put("art", getString(R.string.category_art));
|
categories.put("art", getString(R.string.category_art));
|
||||||
|
@ -52,7 +68,6 @@ public class MastodonRegisterActivity extends BaseActivity {
|
||||||
categories.put("adult", getString(R.string.category_adult));
|
categories.put("adult", getString(R.string.category_adult));
|
||||||
categories.put("furry", getString(R.string.category_furry));
|
categories.put("furry", getString(R.string.category_furry));
|
||||||
categories.put("food", getString(R.string.category_food));
|
categories.put("food", getString(R.string.category_food));
|
||||||
return categories;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -75,8 +90,8 @@ public class MastodonRegisterActivity extends BaseActivity {
|
||||||
default:
|
default:
|
||||||
setTheme(R.style.AppThemeDark);
|
setTheme(R.style.AppThemeDark);
|
||||||
}
|
}
|
||||||
|
createMap();
|
||||||
setContentView(R.layout.activity_login);
|
setContentView(R.layout.activity_register);
|
||||||
ActionBar actionBar = getSupportActionBar();
|
ActionBar actionBar = getSupportActionBar();
|
||||||
if( actionBar != null ) {
|
if( actionBar != null ) {
|
||||||
LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
|
LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
|
||||||
|
@ -98,6 +113,35 @@ public class MastodonRegisterActivity extends BaseActivity {
|
||||||
Helper.colorizeToolbar(toolbar, R.color.black, MastodonRegisterActivity.this);
|
Helper.colorizeToolbar(toolbar, R.color.black, MastodonRegisterActivity.this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MaterialSpinner reg_category = findViewById(R.id.reg_category);
|
||||||
|
Helper.changeMaterialSpinnerColor(MastodonRegisterActivity.this, reg_category);
|
||||||
|
|
||||||
|
String[] categoriesA = new String[categories.size()];
|
||||||
|
String[] itemA = new String[categories.size()];
|
||||||
|
Iterator it = categories.entrySet().iterator();
|
||||||
|
int i = 0;
|
||||||
|
while (it.hasNext()) {
|
||||||
|
Map.Entry pair = (Map.Entry)it.next();
|
||||||
|
itemA[i] = (String)pair.getKey();
|
||||||
|
categoriesA[i] = (String)pair.getValue();
|
||||||
|
i++;
|
||||||
|
it.remove();
|
||||||
|
}
|
||||||
|
ArrayAdapter<String> adcategories = new ArrayAdapter<>(MastodonRegisterActivity.this,
|
||||||
|
android.R.layout.simple_spinner_dropdown_item, categoriesA);
|
||||||
|
|
||||||
|
reg_category.setAdapter(adcategories);
|
||||||
|
|
||||||
|
//Manage privacies
|
||||||
|
reg_category.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
|
||||||
|
@Override
|
||||||
|
public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
new RetrieveInstanceRegAsyncTask(MastodonRegisterActivity.this, "general", MastodonRegisterActivity.this).executeOnExecutor(THREAD_POOL_EXECUTOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -105,4 +149,20 @@ public class MastodonRegisterActivity extends BaseActivity {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRetrieveInstance(APIResponse apiResponse) {
|
||||||
|
if( apiResponse.getError() != null ){
|
||||||
|
Toasty.error(MastodonRegisterActivity.this, getString(R.string.toast_error_instance_reg), Toast.LENGTH_LONG).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
List<InstanceReg> instanceRegs = apiResponse.getInstanceRegs();
|
||||||
|
RecyclerView lv_instances = findViewById(R.id.reg_category_view);
|
||||||
|
InstanceRegAdapter instanceRegAdapter = new InstanceRegAdapter(MastodonRegisterActivity.this, instanceRegs);
|
||||||
|
LinearLayoutManager mLayoutManager = new LinearLayoutManager(MastodonRegisterActivity.this);
|
||||||
|
lv_instances.setLayoutManager(mLayoutManager);
|
||||||
|
lv_instances.setNestedScrollingEnabled(false);
|
||||||
|
lv_instances.setAdapter(instanceRegAdapter);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,56 @@
|
||||||
|
/* Copyright 2019 Thomas Schneider
|
||||||
|
*
|
||||||
|
* This file is a part of Fedilab
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||||
|
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||||
|
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||||
|
* Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||||
|
* see <http://www.gnu.org/licenses>. */
|
||||||
|
package app.fedilab.android.asynctasks;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
|
import java.lang.ref.WeakReference;
|
||||||
|
|
||||||
|
import app.fedilab.android.client.API;
|
||||||
|
import app.fedilab.android.client.APIResponse;
|
||||||
|
import app.fedilab.android.interfaces.OnRetrieveInstanceInterface;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by Thomas on 14/06/2019.
|
||||||
|
* Retrieves instances for registration
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class RetrieveInstanceRegAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
|
|
||||||
|
private OnRetrieveInstanceInterface listener;
|
||||||
|
private APIResponse apiResponse;
|
||||||
|
private WeakReference<Context> contextReference;
|
||||||
|
private String category;
|
||||||
|
|
||||||
|
public RetrieveInstanceRegAsyncTask(Context context, String category, OnRetrieveInstanceInterface onRetrieveInstanceInterface){
|
||||||
|
this.contextReference = new WeakReference<>(context);
|
||||||
|
this.listener = onRetrieveInstanceInterface;
|
||||||
|
this.category = category;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Void doInBackground(Void... params) {
|
||||||
|
apiResponse = new API(this.contextReference.get()).getInstanceReg(category);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPostExecute(Void result) {
|
||||||
|
listener.onRetrieveInstance(apiResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -58,6 +58,7 @@ import app.fedilab.android.client.Entities.Filters;
|
||||||
import app.fedilab.android.client.Entities.HowToVideo;
|
import app.fedilab.android.client.Entities.HowToVideo;
|
||||||
import app.fedilab.android.client.Entities.Instance;
|
import app.fedilab.android.client.Entities.Instance;
|
||||||
import app.fedilab.android.client.Entities.InstanceNodeInfo;
|
import app.fedilab.android.client.Entities.InstanceNodeInfo;
|
||||||
|
import app.fedilab.android.client.Entities.InstanceReg;
|
||||||
import app.fedilab.android.client.Entities.InstanceSocial;
|
import app.fedilab.android.client.Entities.InstanceSocial;
|
||||||
import app.fedilab.android.client.Entities.Mention;
|
import app.fedilab.android.client.Entities.Mention;
|
||||||
import app.fedilab.android.client.Entities.NodeInfo;
|
import app.fedilab.android.client.Entities.NodeInfo;
|
||||||
|
@ -346,6 +347,30 @@ public class API {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/***
|
||||||
|
* Get instance for registering an account *synchronously*
|
||||||
|
* @return APIResponse
|
||||||
|
*/
|
||||||
|
public APIResponse getInstanceReg(String category) {
|
||||||
|
try {
|
||||||
|
String response = new HttpsConnection(context, null).get(String.format("https://api.joinmastodon.org/servers?category=%s", category));
|
||||||
|
List<InstanceReg> instanceRegs = parseInstanceReg(new JSONArray(response));
|
||||||
|
apiResponse.setInstanceRegs(instanceRegs);
|
||||||
|
} catch (HttpsConnection.HttpsConnectionException e) {
|
||||||
|
setError(e.getStatusCode(), e);
|
||||||
|
} catch (NoSuchAlgorithmException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
} catch (KeyManagementException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
} catch (JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return apiResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* Update credential of the authenticated user *synchronously*
|
* Update credential of the authenticated user *synchronously*
|
||||||
|
@ -4403,6 +4428,54 @@ public class API {
|
||||||
return instance;
|
return instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse json response for several instance reg
|
||||||
|
* @param jsonArray JSONArray
|
||||||
|
* @return List<Status>
|
||||||
|
*/
|
||||||
|
public List<InstanceReg> parseInstanceReg(JSONArray jsonArray){
|
||||||
|
|
||||||
|
List<InstanceReg> instanceRegs = new ArrayList<>();
|
||||||
|
try {
|
||||||
|
int i = 0;
|
||||||
|
while (i < jsonArray.length() ){
|
||||||
|
JSONObject resobj = jsonArray.getJSONObject(i);
|
||||||
|
InstanceReg instanceReg = parseInstanceReg(resobj);
|
||||||
|
i++;
|
||||||
|
instanceRegs.add(instanceReg);
|
||||||
|
}
|
||||||
|
} catch (JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return instanceRegs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse json response an unique instance for registering
|
||||||
|
* @param resobj JSONObject
|
||||||
|
* @return InstanceReg
|
||||||
|
*/
|
||||||
|
private InstanceReg parseInstanceReg(JSONObject resobj){
|
||||||
|
InstanceReg instanceReg = new InstanceReg();
|
||||||
|
try {
|
||||||
|
instanceReg.setDomain(resobj.getString("domain"));
|
||||||
|
instanceReg.setVersion(resobj.getString("version"));
|
||||||
|
instanceReg.setDescription(resobj.getString("description"));
|
||||||
|
instanceReg.setLanguage(resobj.getString("language"));
|
||||||
|
instanceReg.setCategory(resobj.getString("category"));
|
||||||
|
instanceReg.setProxied_thumbnail(resobj.getString("proxied_thumbnail"));
|
||||||
|
instanceReg.setTotal_users(resobj.getInt("total_users"));
|
||||||
|
instanceReg.setLast_week_users(resobj.getInt("last_week_users"));
|
||||||
|
} catch (JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return instanceReg;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parse Pleroma emojis
|
* Parse Pleroma emojis
|
||||||
* @param jsonObject JSONObject
|
* @param jsonObject JSONObject
|
||||||
|
|
|
@ -25,6 +25,7 @@ import app.fedilab.android.client.Entities.Error;
|
||||||
import app.fedilab.android.client.Entities.Filters;
|
import app.fedilab.android.client.Entities.Filters;
|
||||||
import app.fedilab.android.client.Entities.HowToVideo;
|
import app.fedilab.android.client.Entities.HowToVideo;
|
||||||
import app.fedilab.android.client.Entities.Instance;
|
import app.fedilab.android.client.Entities.Instance;
|
||||||
|
import app.fedilab.android.client.Entities.InstanceReg;
|
||||||
import app.fedilab.android.client.Entities.Notification;
|
import app.fedilab.android.client.Entities.Notification;
|
||||||
import app.fedilab.android.client.Entities.Peertube;
|
import app.fedilab.android.client.Entities.Peertube;
|
||||||
import app.fedilab.android.client.Entities.PeertubeNotification;
|
import app.fedilab.android.client.Entities.PeertubeNotification;
|
||||||
|
@ -62,6 +63,8 @@ public class APIResponse {
|
||||||
private List<StoredStatus> storedStatuses;
|
private List<StoredStatus> storedStatuses;
|
||||||
private boolean fetchmore = false;
|
private boolean fetchmore = false;
|
||||||
private List<String> playlistForVideos;
|
private List<String> playlistForVideos;
|
||||||
|
private List<InstanceReg> instanceRegs = null;
|
||||||
|
|
||||||
|
|
||||||
public List<Account> getAccounts() {
|
public List<Account> getAccounts() {
|
||||||
return accounts;
|
return accounts;
|
||||||
|
@ -238,4 +241,12 @@ public class APIResponse {
|
||||||
public void setPlaylistForVideos(List<String> playlistForVideos) {
|
public void setPlaylistForVideos(List<String> playlistForVideos) {
|
||||||
this.playlistForVideos = playlistForVideos;
|
this.playlistForVideos = playlistForVideos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<InstanceReg> getInstanceRegs() {
|
||||||
|
return instanceRegs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setInstanceRegs(List<InstanceReg> instanceRegs) {
|
||||||
|
this.instanceRegs = instanceRegs;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,85 @@
|
||||||
|
package app.fedilab.android.drawers;
|
||||||
|
/* Copyright 2019 Thomas Schneider
|
||||||
|
*
|
||||||
|
* This file is a part of Fedilab
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||||
|
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||||
|
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||||
|
* Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||||
|
* see <http://www.gnu.org/licenses>. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
import java.util.List;
|
||||||
|
import app.fedilab.android.R;
|
||||||
|
import app.fedilab.android.client.Entities.InstanceReg;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by Thomas on 14/06/2019.
|
||||||
|
* Adapter to display instances
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class InstanceRegAdapter extends RecyclerView.Adapter {
|
||||||
|
private Context context;
|
||||||
|
private List<InstanceReg> instanceRegs;
|
||||||
|
private LayoutInflater layoutInflater;
|
||||||
|
|
||||||
|
public InstanceRegAdapter(Context context, List<InstanceReg> instanceRegs) {
|
||||||
|
this.context = context;
|
||||||
|
this.instanceRegs = instanceRegs;
|
||||||
|
this.layoutInflater = LayoutInflater.from(this.context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCount() {
|
||||||
|
return instanceRegs.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public InstanceReg getItem(int position) {
|
||||||
|
return instanceRegs.get(position);
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
return new ViewHolder(layoutInflater.inflate(R.layout.drawer_instance_reg, parent, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
|
||||||
|
InstanceReg instanceReg = instanceRegs.get(position);
|
||||||
|
|
||||||
|
final InstanceRegAdapter.ViewHolder holder = (InstanceRegAdapter.ViewHolder) viewHolder;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getItemId(int position) {
|
||||||
|
return position;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return instanceRegs.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class ViewHolder extends RecyclerView.ViewHolder{
|
||||||
|
ImageView imageView;
|
||||||
|
|
||||||
|
public ViewHolder(View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
imageView = itemView.findViewById(R.id.media);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -104,6 +104,18 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="20sp"
|
android:textSize="20sp"
|
||||||
android:text="@string/connect_instance" />
|
android:text="@string/connect_instance" />
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/create_an_account"
|
||||||
|
android:gravity="center"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:text="@string/join_mastodon"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
|
|
@ -37,10 +37,10 @@
|
||||||
android:id="@+id/reg_category"
|
android:id="@+id/reg_category"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<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="wrap_content"/>
|
||||||
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
|
@ -0,0 +1,72 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
Copyright 2019 Thomas Schneider
|
||||||
|
|
||||||
|
This file is a part of Fedilab
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||||
|
GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||||
|
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||||
|
Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||||
|
see <http://www.gnu.org/licenses>.
|
||||||
|
-->
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/main_container"
|
||||||
|
android:divider="?android:dividerHorizontal"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:baselineAligned="false">
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_weight="4"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/instance_pp"
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="80dp"
|
||||||
|
android:contentDescription="@string/instance_logo" />
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/instance_host"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/instance_version"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/instance_description"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
<Button
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/instance_choose"/>
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/instance_count_user"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
|
@ -1001,6 +1001,9 @@
|
||||||
<string name="category_adult">Adult content</string>
|
<string name="category_adult">Adult content</string>
|
||||||
<string name="category_furry">Furry</string>
|
<string name="category_furry">Furry</string>
|
||||||
<string name="category_food">Food</string>
|
<string name="category_food">Food</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="join_mastodon">Join Mastodon</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