From c05e69cfe9064adbd9d546077b2d5ab5c4d367e8 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Tue, 1 Oct 2019 10:23:50 +0500 Subject: [PATCH] t --- .../java/org/mian/gitnex/activities/IssueDetailActivity.java | 3 --- .../main/java/org/mian/gitnex/activities/MainActivity.java | 3 --- .../java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java | 3 --- .../java/org/mian/gitnex/adapters/CollaboratorsAdapter.java | 3 --- .../java/org/mian/gitnex/adapters/IssueCommentsAdapter.java | 3 --- .../java/org/mian/gitnex/adapters/MembersByOrgAdapter.java | 3 --- .../java/org/mian/gitnex/adapters/MyReposListAdapter.java | 3 --- .../org/mian/gitnex/adapters/OrganizationsListAdapter.java | 3 --- .../org/mian/gitnex/adapters/ProfileFollowersAdapter.java | 3 --- .../org/mian/gitnex/adapters/ProfileFollowingAdapter.java | 3 --- .../main/java/org/mian/gitnex/adapters/ReposListAdapter.java | 3 --- .../org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java | 3 --- .../org/mian/gitnex/adapters/StarredReposListAdapter.java | 3 --- .../org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java | 3 --- .../java/org/mian/gitnex/adapters/UserSearchAdapter.java | 3 --- .../org/mian/gitnex/fragments/OrganizationInfoFragment.java | 3 --- .../main/java/org/mian/gitnex/fragments/ProfileFragment.java | 3 --- app/src/main/res/layout/activity_issue_detail.xml | 5 +---- app/src/main/res/layout/admin_users_list.xml | 3 --- app/src/main/res/layout/fragment_profile.xml | 5 +---- app/src/main/res/layout/issue_comments.xml | 3 --- app/src/main/res/layout/my_repos_list.xml | 3 --- app/src/main/res/layout/nav_header.xml | 3 --- app/src/main/res/layout/organizations_list.xml | 3 --- app/src/main/res/layout/profile_followers_list.xml | 3 --- app/src/main/res/layout/profile_following_list.xml | 3 --- app/src/main/res/layout/repos_list.xml | 3 --- app/src/main/res/layout/repositories_by_org_list.xml | 3 --- app/src/main/res/layout/starred_repos_list.xml | 3 --- 29 files changed, 2 insertions(+), 89 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java index 0ce71629..b9269c4c 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.activities; import androidx.annotation.NonNull; @@ -546,4 +544,3 @@ public class IssueDetailActivity extends AppCompatActivity { } } ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java index 5a3d2fe0..6860135e 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.activities; import android.content.ActivityNotFoundException; @@ -414,4 +412,3 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On } } ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java index 779602d2..cd88823c 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.content.Context; @@ -145,4 +143,3 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java index dc93f2ca..7c09e695 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.annotation.SuppressLint; @@ -91,4 +89,3 @@ public class CollaboratorsAdapter extends BaseAdapter { } } ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java index 0f6e61eb..e83a39d3 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.annotation.SuppressLint; @@ -290,4 +288,3 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java index 0b3774e6..b7494b4d 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.annotation.SuppressLint; @@ -133,4 +131,3 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable { }; } ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java index 33df3518..c2f505ef 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.content.Context; @@ -239,4 +237,3 @@ public class MyReposListAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java index 99a69b3d..36da0977 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import androidx.annotation.NonNull; @@ -132,4 +130,3 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java index 24314bfc..d0030dde 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.content.Context; @@ -78,4 +76,3 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java index 3c021578..14b49861 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.content.Context; @@ -77,4 +75,3 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java index a4553c97..c3d89c3f 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.content.Context; @@ -242,4 +240,3 @@ public class ReposListAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java index bdcdbf7d..2eb3e587 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.content.Context; @@ -241,4 +239,3 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java index ffe022b8..6b26ddf8 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.content.Context; @@ -241,4 +239,3 @@ public class StarredReposListAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java index c2e928e2..d773a39e 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.annotation.SuppressLint; @@ -91,4 +89,3 @@ public class TeamMembersByOrgAdapter extends BaseAdapter { } } ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java index 81b43d43..fa106a3b 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.adapters; import android.content.Context; @@ -207,4 +205,3 @@ public class UserSearchAdapter extends RecyclerView.Adapter>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java index 1391bdbc..6a79b5a9 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.fragments; import android.content.Context; @@ -146,4 +144,3 @@ public class OrganizationInfoFragment extends Fragment { void onFragmentInteraction(Uri uri); } } ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java index 8f4e75ef..d0782fc5 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= package org.mian.gitnex.fragments; import android.content.Context; @@ -125,4 +123,3 @@ public class ProfileFragment extends Fragment { } } ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml index 52f741ba..5b9f4d0d 100644 --- a/app/src/main/res/layout/activity_issue_detail.xml +++ b/app/src/main/res/layout/activity_issue_detail.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 + \ No newline at end of file diff --git a/app/src/main/res/layout/admin_users_list.xml b/app/src/main/res/layout/admin_users_list.xml index a162fc90..dd09d217 100644 --- a/app/src/main/res/layout/admin_users_list.xml +++ b/app/src/main/res/layout/admin_users_list.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 42ada7f4..d7803735 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 + \ No newline at end of file diff --git a/app/src/main/res/layout/issue_comments.xml b/app/src/main/res/layout/issue_comments.xml index 0e24b396..215f5284 100644 --- a/app/src/main/res/layout/issue_comments.xml +++ b/app/src/main/res/layout/issue_comments.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/my_repos_list.xml b/app/src/main/res/layout/my_repos_list.xml index a4e92073..c8ff7646 100644 --- a/app/src/main/res/layout/my_repos_list.xml +++ b/app/src/main/res/layout/my_repos_list.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml index d5f48b1c..2896b5c8 100644 --- a/app/src/main/res/layout/nav_header.xml +++ b/app/src/main/res/layout/nav_header.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/organizations_list.xml b/app/src/main/res/layout/organizations_list.xml index edab5f8c..eff210ac 100644 --- a/app/src/main/res/layout/organizations_list.xml +++ b/app/src/main/res/layout/organizations_list.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/profile_followers_list.xml b/app/src/main/res/layout/profile_followers_list.xml index e4bc7ad0..c8f74c41 100644 --- a/app/src/main/res/layout/profile_followers_list.xml +++ b/app/src/main/res/layout/profile_followers_list.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/profile_following_list.xml b/app/src/main/res/layout/profile_following_list.xml index e4bc7ad0..c8f74c41 100644 --- a/app/src/main/res/layout/profile_following_list.xml +++ b/app/src/main/res/layout/profile_following_list.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/repos_list.xml b/app/src/main/res/layout/repos_list.xml index 993cac0f..ac788657 100644 --- a/app/src/main/res/layout/repos_list.xml +++ b/app/src/main/res/layout/repos_list.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/repositories_by_org_list.xml b/app/src/main/res/layout/repositories_by_org_list.xml index e27f4b0e..52bdb5cd 100644 --- a/app/src/main/res/layout/repositories_by_org_list.xml +++ b/app/src/main/res/layout/repositories_by_org_list.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871 diff --git a/app/src/main/res/layout/starred_repos_list.xml b/app/src/main/res/layout/starred_repos_list.xml index 58d58023..2a52cdd2 100644 --- a/app/src/main/res/layout/starred_repos_list.xml +++ b/app/src/main/res/layout/starred_repos_list.xml @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871