mirror of
https://codeberg.org/gitnex/GitNex
synced 2025-02-08 16:18:42 +01:00
Render md in org/repo info (#986)
Co-authored-by: M M Arif <mmarif@noreply.codeberg.org> Co-committed-by: M M Arif <mmarif@noreply.codeberg.org>
This commit is contained in:
parent
ba930021e7
commit
a08cf13382
@ -112,9 +112,14 @@ public class ExplorePublicOrganizationsAdapter extends RecyclerView.Adapter<Recy
|
|||||||
.resize(120, 120)
|
.resize(120, 120)
|
||||||
.centerCrop()
|
.centerCrop()
|
||||||
.into(image);
|
.into(image);
|
||||||
|
|
||||||
if(!organization.getDescription().equals("")) {
|
if(!organization.getDescription().equals("")) {
|
||||||
|
orgDescription.setVisibility(View.VISIBLE);
|
||||||
orgDescription.setText(organization.getDescription());
|
orgDescription.setText(organization.getDescription());
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
orgDescription.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,6 +105,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
|
|||||||
private CheckBox isRepoAdmin;
|
private CheckBox isRepoAdmin;
|
||||||
private final TextView repoStars;
|
private final TextView repoStars;
|
||||||
private final TextView repoLastUpdated;
|
private final TextView repoLastUpdated;
|
||||||
|
private final View spacerView;
|
||||||
|
|
||||||
RepositoriesHolder(View itemView) {
|
RepositoriesHolder(View itemView) {
|
||||||
super(itemView);
|
super(itemView);
|
||||||
@ -115,6 +116,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
|
|||||||
image = itemView.findViewById(R.id.imageAvatar);
|
image = itemView.findViewById(R.id.imageAvatar);
|
||||||
repoStars = itemView.findViewById(R.id.repoStars);
|
repoStars = itemView.findViewById(R.id.repoStars);
|
||||||
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
||||||
|
spacerView = itemView.findViewById(R.id.spacerView);
|
||||||
|
|
||||||
itemView.setOnClickListener(v -> {
|
itemView.setOnClickListener(v -> {
|
||||||
|
|
||||||
@ -252,10 +254,13 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!userRepositories.getDescription().equals("")) {
|
if(!userRepositories.getDescription().equals("")) {
|
||||||
|
repoDescription.setVisibility(View.VISIBLE);
|
||||||
repoDescription.setText(userRepositories.getDescription());
|
repoDescription.setText(userRepositories.getDescription());
|
||||||
|
spacerView.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
repoDescription.setText(context.getString(R.string.noDataDescription));
|
repoDescription.setVisibility(View.GONE);
|
||||||
|
spacerView.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isRepoAdmin == null) {
|
if(isRepoAdmin == null) {
|
||||||
|
@ -60,6 +60,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
|
|||||||
private CheckBox isRepoAdmin;
|
private CheckBox isRepoAdmin;
|
||||||
private final TextView repoStars;
|
private final TextView repoStars;
|
||||||
private final TextView repoLastUpdated;
|
private final TextView repoLastUpdated;
|
||||||
|
private final View spacerView;
|
||||||
|
|
||||||
private MyReposViewHolder(View itemView) {
|
private MyReposViewHolder(View itemView) {
|
||||||
|
|
||||||
@ -71,6 +72,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
|
|||||||
image = itemView.findViewById(R.id.imageAvatar);
|
image = itemView.findViewById(R.id.imageAvatar);
|
||||||
repoStars = itemView.findViewById(R.id.repoStars);
|
repoStars = itemView.findViewById(R.id.repoStars);
|
||||||
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
||||||
|
spacerView = itemView.findViewById(R.id.spacerView);
|
||||||
|
|
||||||
itemView.setOnClickListener(v -> {
|
itemView.setOnClickListener(v -> {
|
||||||
|
|
||||||
@ -244,10 +246,13 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!currentItem.getDescription().equals("")) {
|
if(!currentItem.getDescription().equals("")) {
|
||||||
|
holder.repoDescription.setVisibility(View.VISIBLE);
|
||||||
holder.repoDescription.setText(currentItem.getDescription());
|
holder.repoDescription.setText(currentItem.getDescription());
|
||||||
|
holder.spacerView.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
holder.repoDescription.setText(context.getString(R.string.noDataDescription));
|
holder.repoDescription.setVisibility(View.GONE);
|
||||||
|
holder.spacerView.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(holder.isRepoAdmin == null) {
|
if(holder.isRepoAdmin == null) {
|
||||||
|
@ -89,9 +89,12 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
|
|||||||
PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
|
PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
|
||||||
|
|
||||||
if(!currentItem.getDescription().equals("")) {
|
if(!currentItem.getDescription().equals("")) {
|
||||||
|
holder.orgDescription.setVisibility(View.VISIBLE);
|
||||||
holder.orgDescription.setText(currentItem.getDescription());
|
holder.orgDescription.setText(currentItem.getDescription());
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
holder.orgDescription.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -60,6 +60,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
|
|||||||
private CheckBox isRepoAdmin;
|
private CheckBox isRepoAdmin;
|
||||||
private final TextView repoStars;
|
private final TextView repoStars;
|
||||||
private final TextView repoLastUpdated;
|
private final TextView repoLastUpdated;
|
||||||
|
private final View spacerView;
|
||||||
|
|
||||||
private ReposViewHolder(View itemView) {
|
private ReposViewHolder(View itemView) {
|
||||||
|
|
||||||
@ -71,6 +72,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
|
|||||||
image = itemView.findViewById(R.id.imageAvatar);
|
image = itemView.findViewById(R.id.imageAvatar);
|
||||||
repoStars = itemView.findViewById(R.id.repoStars);
|
repoStars = itemView.findViewById(R.id.repoStars);
|
||||||
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
||||||
|
spacerView = itemView.findViewById(R.id.spacerView);
|
||||||
|
|
||||||
itemView.setOnClickListener(v -> {
|
itemView.setOnClickListener(v -> {
|
||||||
|
|
||||||
@ -243,10 +245,13 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!currentItem.getDescription().equals("")) {
|
if(!currentItem.getDescription().equals("")) {
|
||||||
|
holder.repoDescription.setVisibility(View.VISIBLE);
|
||||||
holder.repoDescription.setText(currentItem.getDescription());
|
holder.repoDescription.setText(currentItem.getDescription());
|
||||||
|
holder.spacerView.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
holder.repoDescription.setText(context.getString(R.string.noDataDescription));
|
holder.repoDescription.setVisibility(View.GONE);
|
||||||
|
holder.spacerView.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(holder.isRepoAdmin == null) {
|
if(holder.isRepoAdmin == null) {
|
||||||
|
@ -60,6 +60,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
|
|||||||
private CheckBox isRepoAdmin;
|
private CheckBox isRepoAdmin;
|
||||||
private final TextView repoStars;
|
private final TextView repoStars;
|
||||||
private final TextView repoLastUpdated;
|
private final TextView repoLastUpdated;
|
||||||
|
private final View spacerView;
|
||||||
|
|
||||||
private OrgReposViewHolder(View itemView) {
|
private OrgReposViewHolder(View itemView) {
|
||||||
|
|
||||||
@ -71,6 +72,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
|
|||||||
image = itemView.findViewById(R.id.imageAvatar);
|
image = itemView.findViewById(R.id.imageAvatar);
|
||||||
repoStars = itemView.findViewById(R.id.repoStars);
|
repoStars = itemView.findViewById(R.id.repoStars);
|
||||||
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
||||||
|
spacerView = itemView.findViewById(R.id.spacerView);
|
||||||
|
|
||||||
itemView.setOnClickListener(v -> {
|
itemView.setOnClickListener(v -> {
|
||||||
|
|
||||||
@ -247,10 +249,13 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!currentItem.getDescription().equals("")) {
|
if(!currentItem.getDescription().equals("")) {
|
||||||
|
holder.repoDescription.setVisibility(View.VISIBLE);
|
||||||
holder.repoDescription.setText(currentItem.getDescription());
|
holder.repoDescription.setText(currentItem.getDescription());
|
||||||
|
holder.spacerView.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
holder.repoDescription.setText(context.getString(R.string.noDataDescription));
|
holder.repoDescription.setVisibility(View.GONE);
|
||||||
|
holder.spacerView.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(holder.isRepoAdmin == null) {
|
if(holder.isRepoAdmin == null) {
|
||||||
|
@ -60,6 +60,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
|
|||||||
private CheckBox isRepoAdmin;
|
private CheckBox isRepoAdmin;
|
||||||
private final TextView repoStars;
|
private final TextView repoStars;
|
||||||
private final TextView repoLastUpdated;
|
private final TextView repoLastUpdated;
|
||||||
|
private final View spacerView;
|
||||||
|
|
||||||
private StarredReposViewHolder(View itemView) {
|
private StarredReposViewHolder(View itemView) {
|
||||||
|
|
||||||
@ -71,6 +72,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
|
|||||||
image = itemView.findViewById(R.id.imageAvatar);
|
image = itemView.findViewById(R.id.imageAvatar);
|
||||||
repoStars = itemView.findViewById(R.id.repoStars);
|
repoStars = itemView.findViewById(R.id.repoStars);
|
||||||
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
|
||||||
|
spacerView = itemView.findViewById(R.id.spacerView);
|
||||||
|
|
||||||
itemView.setOnClickListener(v -> {
|
itemView.setOnClickListener(v -> {
|
||||||
|
|
||||||
@ -248,10 +250,13 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!currentItem.getDescription().equals("")) {
|
if(!currentItem.getDescription().equals("")) {
|
||||||
|
holder.repoDescription.setVisibility(View.VISIBLE);
|
||||||
holder.repoDescription.setText(currentItem.getDescription());
|
holder.repoDescription.setText(currentItem.getDescription());
|
||||||
|
holder.spacerView.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
holder.repoDescription.setText(context.getString(R.string.noDataDescription));
|
holder.repoDescription.setVisibility(View.GONE);
|
||||||
|
holder.spacerView.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(holder.isRepoAdmin == null) {
|
if(holder.isRepoAdmin == null) {
|
||||||
|
@ -19,6 +19,7 @@ import org.mian.gitnex.clients.PicassoService;
|
|||||||
import org.mian.gitnex.clients.RetrofitClient;
|
import org.mian.gitnex.clients.RetrofitClient;
|
||||||
import org.mian.gitnex.databinding.FragmentOrganizationInfoBinding;
|
import org.mian.gitnex.databinding.FragmentOrganizationInfoBinding;
|
||||||
import org.mian.gitnex.helpers.Authorization;
|
import org.mian.gitnex.helpers.Authorization;
|
||||||
|
import org.mian.gitnex.helpers.Markdown;
|
||||||
import org.mian.gitnex.helpers.RoundedTransformation;
|
import org.mian.gitnex.helpers.RoundedTransformation;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Callback;
|
import retrofit2.Callback;
|
||||||
@ -112,7 +113,7 @@ public class OrganizationInfoFragment extends Fragment {
|
|||||||
.centerCrop().into(orgAvatar);
|
.centerCrop().into(orgAvatar);
|
||||||
|
|
||||||
if(!orgInfo.getDescription().isEmpty()) {
|
if(!orgInfo.getDescription().isEmpty()) {
|
||||||
orgDescInfo.setText(orgInfo.getDescription());
|
Markdown.render(ctx, orgInfo.getDescription(), orgDescInfo);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
orgDescInfo.setText(getString(R.string.noDataDescription));
|
orgDescInfo.setText(getString(R.string.noDataDescription));
|
||||||
|
@ -42,7 +42,6 @@ public class RepoInfoFragment extends Fragment {
|
|||||||
private LinearLayout pageContent;
|
private LinearLayout pageContent;
|
||||||
private static final String repoNameF = "param2";
|
private static final String repoNameF = "param2";
|
||||||
private static final String repoOwnerF = "param1";
|
private static final String repoOwnerF = "param1";
|
||||||
private Locale locale;
|
|
||||||
|
|
||||||
private FragmentRepoInfoBinding binding;
|
private FragmentRepoInfoBinding binding;
|
||||||
|
|
||||||
@ -77,7 +76,7 @@ public class RepoInfoFragment extends Fragment {
|
|||||||
binding = FragmentRepoInfoBinding.inflate(inflater, container, false);
|
binding = FragmentRepoInfoBinding.inflate(inflater, container, false);
|
||||||
TinyDB tinyDb = TinyDB.getInstance(getContext());
|
TinyDB tinyDb = TinyDB.getInstance(getContext());
|
||||||
ctx = getContext();
|
ctx = getContext();
|
||||||
locale = getResources().getConfiguration().locale;
|
Locale locale = getResources().getConfiguration().locale;
|
||||||
|
|
||||||
pageContent = binding.repoInfoLayout;
|
pageContent = binding.repoInfoLayout;
|
||||||
pageContent.setVisibility(View.GONE);
|
pageContent.setVisibility(View.GONE);
|
||||||
@ -198,7 +197,7 @@ public class RepoInfoFragment extends Fragment {
|
|||||||
binding.repoMetaName.setText(repoInfo.getName());
|
binding.repoMetaName.setText(repoInfo.getName());
|
||||||
|
|
||||||
if(!repoInfo.getDescription().isEmpty()) {
|
if(!repoInfo.getDescription().isEmpty()) {
|
||||||
binding.repoMetaDescription.setText(repoInfo.getDescription());
|
Markdown.render(ctx, repoInfo.getDescription(), binding.repoMetaDescription);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
binding.repoMetaDescription.setText(getString(R.string.noDataDescription));
|
binding.repoMetaDescription.setText(getString(R.string.noDataDescription));
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
android:id="@+id/orgInfoFrame"
|
android:id="@+id/orgInfoFrame"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="8dp"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
tools:ignore="UseCompoundDrawables">
|
tools:ignore="UseCompoundDrawables">
|
||||||
@ -43,6 +42,8 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/noDataDescription"
|
android:text="@string/noDataDescription"
|
||||||
android:textColor="?attr/primaryTextColor"
|
android:textColor="?attr/primaryTextColor"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
android:textSize="15sp" />
|
android:textSize="15sp" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -61,8 +61,15 @@
|
|||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:textColor="?attr/primaryTextColor"
|
android:textColor="?attr/primaryTextColor"
|
||||||
android:textSize="15sp"
|
android:textSize="15sp"
|
||||||
|
android:visibility="gone"
|
||||||
android:text="@string/noDataDescription" />
|
android:text="@string/noDataDescription" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/spacerView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginBottom="8dp" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/repoInfoFrame"
|
android:id="@+id/repoInfoFrame"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user