shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '182-fix-date-layout' of gitnex/GitNex into master

Browse Source
This commit is contained in:
M M Arif 2019-10-31 14:29:48 +00:00
commit 26b93a4280
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
View File

@ -46,9 +46,8 @@ public class ExploreRepositoriesFragment extends Fragment {
private TextView searchKeyword; private TextView searchKeyword;
private Boolean repoTypeInclude = true; private Boolean repoTypeInclude = true;
private String sort = "updated"; private String sort = "updated";
private String order = "asc"; private String order = "desc";
private int limit = 50;
private ExploreRepositoriesAdapter adapter;
private OnFragmentInteractionListener mListener; private OnFragmentInteractionListener mListener;
@ -102,7 +101,7 @@ public class ExploreRepositoriesFragment extends Fragment {
if(!searchKeyword.getText().toString().equals("")) { if(!searchKeyword.getText().toString().equals("")) {
mProgressBar.setVisibility(View.VISIBLE); mProgressBar.setVisibility(View.VISIBLE);
mRecyclerView.setVisibility(View.GONE); mRecyclerView.setVisibility(View.GONE);
loadSearchReposList(instanceUrl, instanceToken, loginUid, searchKeyword.getText().toString(), repoTypeInclude, sort, order, getContext()); loadSearchReposList(instanceUrl, instanceToken, loginUid, searchKeyword.getText().toString(), repoTypeInclude, sort, order, getContext(), limit);
} }
} }
return false; return false;
@ -118,12 +117,12 @@ public class ExploreRepositoriesFragment extends Fragment {
} }
private void loadSearchReposList(String instanceUrl, String instanceToken, String loginUid, String searchKeyword, Boolean repoTypeInclude, String sort, String order, final Context context) { private void loadSearchReposList(String instanceUrl, String instanceToken, String loginUid, String searchKeyword, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
Call<ExploreRepositories> call = RetrofitClient Call<ExploreRepositories> call = RetrofitClient
.getInstance(instanceUrl) .getInstance(instanceUrl)
.getApiInterface() .getApiInterface()
.queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), searchKeyword, repoTypeInclude, sort, order); .queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), searchKeyword, repoTypeInclude, sort, order, limit);
call.enqueue(new Callback<ExploreRepositories>() { call.enqueue(new Callback<ExploreRepositories>() {
@ -141,7 +140,7 @@ public class ExploreRepositoriesFragment extends Fragment {
@Override @Override
public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) { public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
Log.i("onFailure", t.getMessage()); Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
} }
}); });
@ -150,7 +149,7 @@ public class ExploreRepositoriesFragment extends Fragment {
private void getReposList(List<UserRepositories> dataList, Context context) { private void getReposList(List<UserRepositories> dataList, Context context) {
adapter = new ExploreRepositoriesAdapter(dataList, context); ExploreRepositoriesAdapter adapter = new ExploreRepositoriesAdapter(dataList, context);
mRecyclerView.setVisibility(View.VISIBLE); mRecyclerView.setVisibility(View.VISIBLE);

2
app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java
View File

@ -216,7 +216,7 @@ public interface ApiInterface {
Call<List<UserInfo>> getRepoWatchers(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName); Call<List<UserInfo>> getRepoWatchers(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
@GET("repos/search") // get all the repos which match the query string @GET("repos/search") // get all the repos which match the query string
Call<ExploreRepositories> queryRepos(@Header("Authorization") String token, @Query("q") String searchKeyword, @Query("private") Boolean repoTypeInclude, @Query("sort") String sort, @Query("order") String order); Call<ExploreRepositories> queryRepos(@Header("Authorization") String token, @Query("q") String searchKeyword, @Query("private") Boolean repoTypeInclude, @Query("sort") String sort, @Query("order") String order, @Query("limit") int limit);
@POST("repos/{owner}/{repo}/contents/{file}") // create new file @POST("repos/{owner}/{repo}/contents/{file}") // create new file
Call<JsonElement> createNewFile(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("file") String fileName, @Body NewFile jsonStr); Call<JsonElement> createNewFile(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("file") String fileName, @Body NewFile jsonStr);

2
app/src/main/res/layout/repo_detail_issues_list.xml
View File

@ -93,7 +93,7 @@
<TextView <TextView
android:id="@+id/issueCreatedTime" android:id="@+id/issueCreatedTime"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight=".15" android:layout_weight=".25"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" android:gravity="end"
android:textColor="@color/colorWhite" android:textColor="@color/colorWhite"