diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 149d08b7..0fb64517 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -59,7 +59,7 @@ android:name=".activities.RepoDetailActivity" android:label="@string/title_activity_repo_detail" android:theme="@style/AppTheme.NoActionBar" /> - + @@ -68,7 +68,7 @@ + android:launchMode="singleTask" android:theme="@android:style/Theme.NoTitleBar"/> diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java index e5d60274..14ed6509 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java @@ -21,7 +21,7 @@ import android.widget.ImageView; import android.widget.TextView; import org.mian.gitnex.R; import org.mian.gitnex.adapters.AdminGetUsersAdapter; -import org.mian.gitnex.fragments.AdminUsersBottomSheetFragment; +import org.mian.gitnex.fragments.BottomSheetAdminUsersFragment; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.models.UserInfo; import org.mian.gitnex.util.AppUtil; @@ -34,7 +34,7 @@ import java.util.Objects; * Author M M Arif */ -public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBottomSheetFragment.BottomSheetListener { +public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAdminUsersFragment.BottomSheetListener { private View.OnClickListener onClickListener; final Context ctx = this; @@ -171,7 +171,7 @@ public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBot finish(); return true; case R.id.genericMenu: - AdminUsersBottomSheetFragment bottomSheet = new AdminUsersBottomSheetFragment(); + BottomSheetAdminUsersFragment bottomSheet = new BottomSheetAdminUsersFragment(); bottomSheet.show(getSupportFragmentManager(), "usersBottomSheet"); return true; default: 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 1e38d596..675e20b7 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -55,7 +55,7 @@ import com.vdurmont.emoji.EmojiParser; import org.mian.gitnex.R; import org.mian.gitnex.adapters.IssueCommentsAdapter; import org.mian.gitnex.clients.RetrofitClient; -import org.mian.gitnex.fragments.SingleIssueBottomSheetFragment; +import org.mian.gitnex.fragments.BottomSheetSingleIssueFragment; import org.mian.gitnex.helpers.AlertDialogs; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.helpers.TimeHelper; @@ -211,7 +211,7 @@ public class IssueDetailActivity extends BaseActivity { finish(); return true; case R.id.genericMenu: - SingleIssueBottomSheetFragment bottomSheet = new SingleIssueBottomSheetFragment(); + BottomSheetSingleIssueFragment bottomSheet = new BottomSheetSingleIssueFragment(); bottomSheet.show(getSupportFragmentManager(), "singleIssueBottomSheet"); return true; default: @@ -293,7 +293,7 @@ public class IssueDetailActivity extends BaseActivity { private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo, int index, String loginUid) { - IssueCommentsViewModel issueCommentsModel = ViewModelProviders.of(this).get(IssueCommentsViewModel.class); + IssueCommentsViewModel issueCommentsModel = new ViewModelProvider(this).get(IssueCommentsViewModel.class); issueCommentsModel.getIssueCommentList(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), owner, repo, index, getApplicationContext()).observe(this, new Observer>() { @Override 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 9c56a19e..cc32f911 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -26,7 +26,7 @@ import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.fragments.AboutFragment; import org.mian.gitnex.fragments.ExploreRepositoriesFragment; import org.mian.gitnex.fragments.MyRepositoriesFragment; -import org.mian.gitnex.fragments.NavSubMenuBottomSheetFragment; +import org.mian.gitnex.fragments.BottomSheetNavSubMenuFragment; import org.mian.gitnex.fragments.OrganizationsFragment; import org.mian.gitnex.fragments.SettingsFragment; import org.mian.gitnex.fragments.StarredRepositoriesFragment; @@ -161,7 +161,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig ImageView navSubMenu = hView.findViewById(R.id.navSubMenu); navSubMenu.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - NavSubMenuBottomSheetFragment bottomSheet = new NavSubMenuBottomSheetFragment(); + BottomSheetNavSubMenuFragment bottomSheet = new BottomSheetNavSubMenuFragment(); bottomSheet.show(getSupportFragmentManager(), "adminMenuBottomSheet"); } }); diff --git a/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java index 43ba6d7d..7e82bed5 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java @@ -18,7 +18,7 @@ import android.view.ViewGroup; import android.widget.TextView; import org.mian.gitnex.R; import org.mian.gitnex.fragments.MembersByOrgFragment; -import org.mian.gitnex.fragments.OrgBottomSheetFragment; +import org.mian.gitnex.fragments.BottomSheetOrganizationFragment; import org.mian.gitnex.fragments.OrganizationInfoFragment; import org.mian.gitnex.fragments.RepositoriesByOrgFragment; import org.mian.gitnex.fragments.TeamsByOrgFragment; @@ -29,7 +29,7 @@ import java.util.Objects; * Author M M Arif */ -public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFragment.BottomSheetListener { +public class OrgDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener { @Override protected int getLayoutResourceId(){ @@ -118,7 +118,7 @@ public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFra finish(); return true; case R.id.repoMenu: - OrgBottomSheetFragment bottomSheet = new OrgBottomSheetFragment(); + BottomSheetOrganizationFragment bottomSheet = new BottomSheetOrganizationFragment(); bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet"); return true; default: diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java index e0b1dcb6..eacaff13 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -25,6 +25,7 @@ import android.view.ViewGroup; import android.widget.TextView; import org.mian.gitnex.R; import org.mian.gitnex.clients.RetrofitClient; +import org.mian.gitnex.fragments.BottomSheetRepoFragment; import org.mian.gitnex.fragments.BranchesFragment; import org.mian.gitnex.fragments.ClosedIssuesFragment; import org.mian.gitnex.fragments.CollaboratorsFragment; @@ -34,7 +35,6 @@ import org.mian.gitnex.fragments.LabelsFragment; import org.mian.gitnex.fragments.MilestonesFragment; import org.mian.gitnex.fragments.PullRequestsFragment; import org.mian.gitnex.fragments.ReleasesFragment; -import org.mian.gitnex.fragments.RepoBottomSheetFragment; import org.mian.gitnex.fragments.RepoInfoFragment; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.models.UserRepositories; @@ -48,7 +48,7 @@ import android.net.Uri; * Author M M Arif */ -public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetFragment.BottomSheetListener { +public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoFragment.BottomSheetListener { private TextView textViewBadge; @@ -185,7 +185,7 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF finish(); return true; case R.id.repoMenu: - RepoBottomSheetFragment bottomSheet = new RepoBottomSheetFragment(); + BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment(); bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet"); return true; default: @@ -197,6 +197,14 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF @Override public void onButtonClicked(String text) { + TinyDB tinyDb = new TinyDB(getApplicationContext()); + String repoFullName = tinyDb.getString("repoFullName"); + String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw"); + if(!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) { + instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol"); + } + Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullName); + switch (text) { case "label": startActivity(new Intent(RepoDetailActivity.this, CreateLabelActivity.class)); @@ -214,16 +222,16 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class)); break; case "openWebRepo": - TinyDB tinyDb = new TinyDB(getApplicationContext()); - String repoFullName = tinyDb.getString("repoFullName"); - String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw"); - if(!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) { - instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol"); - } - Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullName); Intent i = new Intent(Intent.ACTION_VIEW, url); startActivity(i); break; + case "shareRepo": + Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND); + sharingIntent.setType("text/plain"); + sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, url); + sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, url); + startActivity(Intent.createChooser(sharingIntent, url.toString())); + break; case "newFile": startActivity(new Intent(RepoDetailActivity.this, NewFileActivity.class)); break; diff --git a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java index b131145b..1360a78a 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java @@ -58,7 +58,7 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter LayoutInflater inflater = LayoutInflater.from(context); if(viewType == TYPE_LOAD){ - return new IssuesHolder(inflater.inflate(R.layout.repo_detail_issues_list, parent,false)); + return new IssuesHolder(inflater.inflate(R.layout.repo_issues_list, parent,false)); } else { return new LoadHolder(inflater.inflate(R.layout.row_load,parent,false)); diff --git a/app/src/main/java/org/mian/gitnex/fragments/AdminUsersBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetAdminUsersFragment.java similarity index 82% rename from app/src/main/java/org/mian/gitnex/fragments/AdminUsersBottomSheetFragment.java rename to app/src/main/java/org/mian/gitnex/fragments/BottomSheetAdminUsersFragment.java index 9f5954f8..1438a72d 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/AdminUsersBottomSheetFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetAdminUsersFragment.java @@ -15,14 +15,14 @@ import org.mian.gitnex.R; * Author M M Arif */ -public class AdminUsersBottomSheetFragment extends BottomSheetDialogFragment { +public class BottomSheetAdminUsersFragment extends BottomSheetDialogFragment { - private AdminUsersBottomSheetFragment.BottomSheetListener bmListener; + private BottomSheetAdminUsersFragment.BottomSheetListener bmListener; @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.admin_users_bottom_sheet_layout, container, false); + View v = inflater.inflate(R.layout.bottom_sheet_admin_users_layout, container, false); TextView createNewUser = v.findViewById(R.id.createNewUser); @@ -46,7 +46,7 @@ public class AdminUsersBottomSheetFragment extends BottomSheetDialogFragment { super.onAttach(context); try { - bmListener = (AdminUsersBottomSheetFragment.BottomSheetListener) context; + bmListener = (BottomSheetAdminUsersFragment.BottomSheetListener) context; } catch (ClassCastException e) { throw new ClassCastException(context.toString() + " must implement BottomSheetListener"); diff --git a/app/src/main/java/org/mian/gitnex/fragments/NavSubMenuBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNavSubMenuFragment.java similarity index 86% rename from app/src/main/java/org/mian/gitnex/fragments/NavSubMenuBottomSheetFragment.java rename to app/src/main/java/org/mian/gitnex/fragments/BottomSheetNavSubMenuFragment.java index ac9bfe20..684579ad 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/NavSubMenuBottomSheetFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetNavSubMenuFragment.java @@ -16,12 +16,12 @@ import androidx.annotation.Nullable; * Author M M Arif */ -public class NavSubMenuBottomSheetFragment extends BottomSheetDialogFragment { +public class BottomSheetNavSubMenuFragment extends BottomSheetDialogFragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.nav_sub_menu_bottom_sheet_layout, container, false); + View v = inflater.inflate(R.layout.bottom_sheet_nav_sub_menu_layout, container, false); TextView adminUsers = v.findViewById(R.id.adminUsers); diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrgBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java similarity index 79% rename from app/src/main/java/org/mian/gitnex/fragments/OrgBottomSheetFragment.java rename to app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java index 68b7b7eb..a4c85138 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/OrgBottomSheetFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java @@ -15,14 +15,14 @@ import androidx.annotation.Nullable; * Author M M Arif */ -public class OrgBottomSheetFragment extends BottomSheetDialogFragment { +public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment { - private OrgBottomSheetFragment.BottomSheetListener bmListener; + private BottomSheetOrganizationFragment.BottomSheetListener bmListener; @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.org_bottom_sheet_layout, container, false); + View v = inflater.inflate(R.layout.bottom_sheet_organization_layout, container, false); TextView createTeam = v.findViewById(R.id.createTeam); @@ -46,7 +46,7 @@ public class OrgBottomSheetFragment extends BottomSheetDialogFragment { super.onAttach(context); try { - bmListener = (OrgBottomSheetFragment.BottomSheetListener) context; + bmListener = (BottomSheetOrganizationFragment.BottomSheetListener) context; } catch (ClassCastException e) { throw new ClassCastException(context.toString() + " must implement BottomSheetListener"); diff --git a/app/src/main/java/org/mian/gitnex/fragments/ProfileBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetProfileFragment.java similarity index 89% rename from app/src/main/java/org/mian/gitnex/fragments/ProfileBottomSheetFragment.java rename to app/src/main/java/org/mian/gitnex/fragments/BottomSheetProfileFragment.java index 146aa80d..8c8c9368 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ProfileBottomSheetFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetProfileFragment.java @@ -16,12 +16,12 @@ import androidx.annotation.Nullable; * Author M M Arif */ -public class ProfileBottomSheetFragment extends BottomSheetDialogFragment { +public class BottomSheetProfileFragment extends BottomSheetDialogFragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.profile_bottom_sheet_layout, container, false); + View v = inflater.inflate(R.layout.bottom_sheet_profile_layout, container, false); TextView addNewEmailAddress = v.findViewById(R.id.addNewEmailAddress); diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java similarity index 92% rename from app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java rename to app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java index 23ad2fde..d40c6cd0 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java @@ -17,14 +17,14 @@ import androidx.annotation.Nullable; * Author M M Arif */ -public class RepoBottomSheetFragment extends BottomSheetDialogFragment { +public class BottomSheetRepoFragment extends BottomSheetDialogFragment { private BottomSheetListener bmListener; @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.repo_bottom_sheet_layout, container, false); + View v = inflater.inflate(R.layout.bottom_sheet_repo_layout, container, false); final TinyDB tinyDb = new TinyDB(getContext()); @@ -39,6 +39,7 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment { TextView unStarRepository = v.findViewById(R.id.unStarRepository); TextView watchRepository = v.findViewById(R.id.watchRepository); TextView unWatchRepository = v.findViewById(R.id.unWatchRepository); + TextView shareRepository = v.findViewById(R.id.shareRepository); createLabel.setOnClickListener(new View.OnClickListener() { @Override @@ -86,6 +87,14 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment { } }); + shareRepository.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + bmListener.onButtonClicked("shareRepo"); + dismiss(); + } + }); + openWebRepo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java similarity index 80% rename from app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java rename to app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java index 02398549..eb499377 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/SingleIssueBottomSheetFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java @@ -27,13 +27,13 @@ import java.util.Objects; * Author M M Arif */ -public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment { +public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.single_issue_bottom_sheet_layout, container, false); + View v = inflater.inflate(R.layout.bottom_sheet_single_issue_layout, container, false); final TinyDB tinyDB = new TinyDB(getContext()); @@ -46,6 +46,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment { TextView copyIssueUrl = v.findViewById(R.id.copyIssueUrl); TextView openFilesDiff = v.findViewById(R.id.openFilesDiff); TextView mergePullRequest = v.findViewById(R.id.mergePullRequest); + TextView shareIssue = v.findViewById(R.id.shareIssue); replyToIssue.setOnClickListener(new View.OnClickListener() { @Override @@ -133,6 +134,29 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment { } }); + shareIssue.setOnClickListener(v1 -> { + + // get url of repo + String repoFullName = tinyDB.getString("repoFullName"); + String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw"); + if (!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) { + instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol"); + } + + // get issue Url + String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber"); + + // share issue + Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND); + sharingIntent.setType("text/plain"); + sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")); + sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, issueUrl); + startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle"))); + + dismiss(); + + }); + copyIssueUrl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -170,7 +194,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment { @Override public void onClick(View v) { - IssueActions.closeReopenIssue(getContext(), Integer.valueOf(tinyDB.getString("issueNumber")), "closed"); + IssueActions.closeReopenIssue(getContext(), Integer.parseInt(tinyDB.getString("issueNumber")), "closed"); dismiss(); } @@ -184,7 +208,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment { @Override public void onClick(View v) { - IssueActions.closeReopenIssue(getContext(), Integer.valueOf(tinyDB.getString("issueNumber")), "open"); + IssueActions.closeReopenIssue(getContext(), Integer.parseInt(tinyDB.getString("issueNumber")), "open"); dismiss(); } 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 8f680ec2..be89d1cf 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java @@ -52,7 +52,7 @@ public class ProfileFragment extends Fragment { userLogin.setText(getString(R.string.usernameWithAt, tinyDb.getString("userLogin"))); userEmail.setText(tinyDb.getString("userEmail")); - ProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new ProfileFragment.SectionsPagerAdapter(getFragmentManager()); + ProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager()); ViewPager mViewPager = v.findViewById(R.id.container); mViewPager.setAdapter(mSectionsPagerAdapter); @@ -101,7 +101,7 @@ public class ProfileFragment extends Fragment { } - public class SectionsPagerAdapter extends FragmentStatePagerAdapter { + public static class SectionsPagerAdapter extends FragmentStatePagerAdapter { SectionsPagerAdapter(FragmentManager fm) { super(fm); @@ -147,9 +147,8 @@ public class ProfileFragment extends Fragment { ((MainActivity)ctx).finish(); return true; case R.id.profileMenu: - ProfileBottomSheetFragment bottomSheet = new ProfileBottomSheetFragment(); - assert getFragmentManager() != null; - bottomSheet.show(getFragmentManager(), "profileBottomSheet"); + BottomSheetProfileFragment bottomSheet = new BottomSheetProfileFragment(); + bottomSheet.show(getChildFragmentManager(), "profileBottomSheet"); return true; default: return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml new file mode 100644 index 00000000..850c201b --- /dev/null +++ b/app/src/main/res/drawable/ic_share_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml b/app/src/main/res/layout/bottom_sheet_admin_users_layout.xml similarity index 100% rename from app/src/main/res/layout/admin_users_bottom_sheet_layout.xml rename to app/src/main/res/layout/bottom_sheet_admin_users_layout.xml diff --git a/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml b/app/src/main/res/layout/bottom_sheet_nav_sub_menu_layout.xml similarity index 100% rename from app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml rename to app/src/main/res/layout/bottom_sheet_nav_sub_menu_layout.xml diff --git a/app/src/main/res/layout/org_bottom_sheet_layout.xml b/app/src/main/res/layout/bottom_sheet_organization_layout.xml similarity index 100% rename from app/src/main/res/layout/org_bottom_sheet_layout.xml rename to app/src/main/res/layout/bottom_sheet_organization_layout.xml diff --git a/app/src/main/res/layout/profile_bottom_sheet_layout.xml b/app/src/main/res/layout/bottom_sheet_profile_layout.xml similarity index 100% rename from app/src/main/res/layout/profile_bottom_sheet_layout.xml rename to app/src/main/res/layout/bottom_sheet_profile_layout.xml diff --git a/app/src/main/res/layout/repo_bottom_sheet_layout.xml b/app/src/main/res/layout/bottom_sheet_repo_layout.xml similarity index 90% rename from app/src/main/res/layout/repo_bottom_sheet_layout.xml rename to app/src/main/res/layout/bottom_sheet_repo_layout.xml index 44e9f2ef..ec8166e3 100644 --- a/app/src/main/res/layout/repo_bottom_sheet_layout.xml +++ b/app/src/main/res/layout/bottom_sheet_repo_layout.xml @@ -10,7 +10,7 @@ + android:layout_height="wrap_content"> + android:background="?attr/dividerColor" /> + android:background="?attr/dividerColor" /> + + + android:layout_height="wrap_content"> + android:background="?attr/dividerColor" /> + + + android:background="?attr/dividerColor" /> + android:background="@color/dividerColor" /> diff --git a/app/src/main/res/layout/repo_detail_issues_list.xml b/app/src/main/res/layout/repo_issues_list.xml similarity index 97% rename from app/src/main/res/layout/repo_detail_issues_list.xml rename to app/src/main/res/layout/repo_issues_list.xml index f6c7820d..73cba7fa 100644 --- a/app/src/main/res/layout/repo_detail_issues_list.xml +++ b/app/src/main/res/layout/repo_issues_list.xml @@ -96,6 +96,6 @@ android:layout_height="1dp" android:id="@+id/divider" android:layout_marginTop="15dp" - android:background="?attr/inputBackgroundColor" /> + android:background="?attr/dividerColor" /> \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 4e85bd09..f3894629 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -7,4 +7,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d4967598..ffe85294 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -34,4 +34,6 @@ #b6bbbf #212121 + #dbdbdb + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1660770a..4f215ed3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -555,4 +555,7 @@ Please wait for the file to load to memory File is saved to Download directory This file type is not supported in file viewer. Download it instead from the three dotted menu? + + Share Issue + Share Repository diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 98ca895a..d6d575e3 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -19,6 +19,7 @@ @style/AppThemeDarkSearchAutoCompleteTextView @color/hintColor @color/darkGreen + @color/dividerColor @@ -40,6 +41,7 @@ @style/AppThemeLightSearchAutoCompleteTextView @color/hintColor @color/darkGreen + @color/dividerColor