From 0533fd9ae58e8458e9634189d430331094719f86 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Thu, 2 Jan 2020 12:51:10 +0500 Subject: [PATCH] Implement across the whole app --- .../activities/IssueDetailActivity.java | 27 ++++++++++++ .../mian/gitnex/activities/MainActivity.java | 3 -- .../gitnex/activities/OrgDetailActivity.java | 44 +++++++++++++++++++ .../activities/OrgTeamMembersActivity.java | 17 ++++--- .../gitnex/activities/RepoDetailActivity.java | 42 +++++++++++++++++- .../adapters/RepoStargazersAdapter.java | 27 ++++++++++++ .../gitnex/adapters/RepoWatchersAdapter.java | 27 ++++++++++++ .../adapters/TeamMembersByOrgAdapter.java | 27 ++++++++++++ .../ExploreRepositoriesFragment.java | 1 - .../fragments/MyRepositoriesFragment.java | 1 - .../fragments/OrganizationsFragment.java | 1 - .../gitnex/fragments/ProfileFragment.java | 1 + .../gitnex/fragments/SettingsFragment.java | 1 - .../StarredRepositoriesFragment.java | 1 - .../main/res/layout/activity_issue_detail.xml | 12 ++++- .../main/res/layout/activity_org_detail.xml | 8 ++++ .../main/res/layout/activity_repo_detail.xml | 8 ++++ 17 files changed, 232 insertions(+), 16 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 7618faed..8873a6ad 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -132,6 +132,8 @@ public class IssueDetailActivity extends AppCompatActivity { assigneesLayout = findViewById(R.id.frameAssignees); Toolbar toolbar = findViewById(R.id.toolbar); + TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title); + setSupportActionBar(toolbar); Objects.requireNonNull(getSupportActionBar()).setTitle(repoName); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -158,6 +160,31 @@ public class IssueDetailActivity extends AppCompatActivity { } }); + Typeface myTypeface; + if(tinyDb.getInt("customFontId") == 0) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 1) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 2) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); + + } + else { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + + } + + toolbarTitle.setTypeface(myTypeface); + toolbarTitle.setText(repoName); + getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid); fetchDataAsync(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid); 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 e637b194..51f3a4e3 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -67,7 +67,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig super.onCreate(savedInstanceState); final TinyDB tinyDb = new TinyDB(getApplicationContext()); - tinyDb.putBoolean("noConnection", false); //userAvatar = findViewById(R.id.userAvatar); @@ -186,8 +185,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig tinyDb.putBoolean("noConnection", false); } - //tinyDb.putBoolean("noConnection", true); - String userEmailNav = tinyDb.getString("userEmail"); String userFullNameNav = tinyDb.getString("userFullname"); String userAvatarNav = tinyDb.getString("userAvatar"); 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 749431b8..45ea48f6 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java @@ -9,10 +9,14 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; import android.content.Intent; +import android.graphics.Typeface; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import android.view.View; +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; @@ -37,6 +41,8 @@ public class OrgDetailActivity extends AppCompatActivity implements OrgBottomShe String orgName = tinyDb.getString("orgName"); Toolbar toolbar = findViewById(R.id.toolbar); + TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title); + setSupportActionBar(toolbar); Objects.requireNonNull(getSupportActionBar()).setTitle(orgName); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -48,6 +54,44 @@ public class OrgDetailActivity extends AppCompatActivity implements OrgBottomShe TabLayout tabLayout = findViewById(R.id.tabs); + Typeface myTypeface; + if(tinyDb.getInt("customFontId") == 0) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 1) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 2) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); + + } + else { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + + } + + toolbarTitle.setTypeface(myTypeface); + toolbarTitle.setText(orgName); + + ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0); + int tabsCount = vg.getChildCount(); + for (int j = 0; j < tabsCount; j++) { + ViewGroup vgTab = (ViewGroup) vg.getChildAt(j); + int tabChildCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTypeface(myTypeface); + } + } + } + mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager)); diff --git a/app/src/main/java/org/mian/gitnex/activities/OrgTeamMembersActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrgTeamMembersActivity.java index ce9015e2..586b40c5 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrgTeamMembersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrgTeamMembersActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import android.os.Bundle; @@ -16,12 +15,13 @@ import org.mian.gitnex.models.UserInfo; import org.mian.gitnex.util.TinyDB; import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel; import java.util.List; +import java.util.Objects; /** * Author M M Arif */ -public class OrgTeamMembersActivity extends AppCompatActivity { +public class OrgTeamMembersActivity extends BaseActivity { private TextView noDataMembers; private View.OnClickListener onClickListener; @@ -29,9 +29,13 @@ public class OrgTeamMembersActivity extends AppCompatActivity { private GridView mGridView; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_org_team_members; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_org_team_members); TinyDB tinyDb = new TinyDB(getApplicationContext()); final String instanceUrl = tinyDb.getString("instanceUrl"); @@ -46,7 +50,7 @@ public class OrgTeamMembersActivity extends AppCompatActivity { initCloseListener(); closeActivity.setOnClickListener(onClickListener); - if(getIntent().getStringExtra("teamTitle") != null && !getIntent().getStringExtra("teamTitle").equals("")) { + if(getIntent().getStringExtra("teamTitle") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamTitle")).equals("")) { toolbarTitle.setText(getIntent().getStringExtra("teamTitle")); } else { @@ -54,7 +58,7 @@ public class OrgTeamMembersActivity extends AppCompatActivity { } String teamId; - if(getIntent().getStringExtra("teamId") != null && !getIntent().getStringExtra("teamId").equals("")){ + if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){ teamId = getIntent().getStringExtra("teamId"); } else { @@ -64,6 +68,7 @@ public class OrgTeamMembersActivity extends AppCompatActivity { getIntent().getStringExtra("teamId"); //Log.i("teamId", getIntent().getStringExtra("teamId")); + assert teamId != null; fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId)); } 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 8849426d..e0b1dcb6 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -3,7 +3,6 @@ package org.mian.gitnex.activities; import com.google.android.material.tabs.TabLayout; import com.google.gson.JsonElement; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; @@ -22,6 +21,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; import android.widget.TextView; import org.mian.gitnex.R; import org.mian.gitnex.clients.RetrofitClient; @@ -75,6 +75,8 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF AppUtil.setAppLocale(getResources(), appLocale); Toolbar toolbar = findViewById(R.id.toolbar); + TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title); + setSupportActionBar(toolbar); Objects.requireNonNull(getSupportActionBar()).setTitle(repoName1); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -86,6 +88,44 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF TabLayout tabLayout = findViewById(R.id.tabs); + Typeface myTypeface; + if(tinyDb.getInt("customFontId") == 0) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 1) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 2) { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); + + } + else { + + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + + } + + toolbarTitle.setTypeface(myTypeface); + toolbarTitle.setText(repoName1); + + ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0); + int tabsCount = vg.getChildCount(); + for (int j = 0; j < tabsCount; j++) { + ViewGroup vgTab = (ViewGroup) vg.getChildAt(j); + int tabChildCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTypeface(myTypeface); + } + } + } + mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager)); diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java index 6eea64dc..9dacfe95 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java @@ -2,6 +2,7 @@ package org.mian.gitnex.adapters; import android.annotation.SuppressLint; import android.content.Context; +import android.graphics.Typeface; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,6 +13,7 @@ import com.squareup.picasso.Picasso; import org.mian.gitnex.R; import org.mian.gitnex.helpers.RoundedTransformation; import org.mian.gitnex.models.UserInfo; +import org.mian.gitnex.util.TinyDB; import java.util.List; /** @@ -79,11 +81,36 @@ public class RepoStargazersAdapter extends BaseAdapter { UserInfo currentItem = stargazersList.get(position); Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar); + final TinyDB tinyDb = new TinyDB(mCtx); + Typeface myTypeface; + if(tinyDb.getInt("customFontId") == 0) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 1) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 2) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + + } + else { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + + } + if(!currentItem.getFullname().equals("")) { viewHolder.memberName.setText(currentItem.getFullname()); + viewHolder.memberName.setTypeface(myTypeface); } else { viewHolder.memberName.setText(currentItem.getLogin()); + viewHolder.memberName.setTypeface(myTypeface); } } diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java index fb6909dc..478ef19e 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java @@ -2,6 +2,7 @@ package org.mian.gitnex.adapters; import android.annotation.SuppressLint; import android.content.Context; +import android.graphics.Typeface; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,6 +13,7 @@ import com.squareup.picasso.Picasso; import org.mian.gitnex.R; import org.mian.gitnex.helpers.RoundedTransformation; import org.mian.gitnex.models.UserInfo; +import org.mian.gitnex.util.TinyDB; import java.util.List; /** @@ -79,11 +81,36 @@ public class RepoWatchersAdapter extends BaseAdapter { UserInfo currentItem = watchersList.get(position); Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar); + final TinyDB tinyDb = new TinyDB(mCtx); + Typeface myTypeface; + if(tinyDb.getInt("customFontId") == 0) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 1) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 2) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + + } + else { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + + } + if(!currentItem.getFullname().equals("")) { viewHolder.memberName.setText(currentItem.getFullname()); + viewHolder.memberName.setTypeface(myTypeface); } else { viewHolder.memberName.setText(currentItem.getLogin()); + viewHolder.memberName.setTypeface(myTypeface); } } 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 d773a39e..db9c68af 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java @@ -2,6 +2,7 @@ package org.mian.gitnex.adapters; import android.annotation.SuppressLint; import android.content.Context; +import android.graphics.Typeface; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,6 +13,7 @@ import com.squareup.picasso.Picasso; import org.mian.gitnex.R; import org.mian.gitnex.helpers.RoundedTransformation; import org.mian.gitnex.models.UserInfo; +import org.mian.gitnex.util.TinyDB; import java.util.List; /** @@ -80,11 +82,36 @@ public class TeamMembersByOrgAdapter extends BaseAdapter { UserInfo currentItem = teamMembersList.get(position); Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar); + final TinyDB tinyDb = new TinyDB(mCtx); + Typeface myTypeface; + if(tinyDb.getInt("customFontId") == 0) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 1) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + + } + else if (tinyDb.getInt("customFontId") == 2) { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + + } + else { + + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + + } + if(!currentItem.getFullname().equals("")) { viewHolder.memberName.setText(currentItem.getFullname()); + viewHolder.memberName.setTypeface(myTypeface); } else { viewHolder.memberName.setText(currentItem.getLogin()); + viewHolder.memberName.setTypeface(myTypeface); } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java index 67c322c9..d2c8bf64 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java @@ -17,7 +17,6 @@ import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import org.mian.gitnex.R; -import org.mian.gitnex.activities.MainActivity; import org.mian.gitnex.adapters.ExploreRepositoriesAdapter; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.helpers.Authorization; diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java index baa1d66e..b23e666a 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java @@ -24,7 +24,6 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; import org.mian.gitnex.R; -import org.mian.gitnex.activities.MainActivity; import org.mian.gitnex.activities.NewRepoActivity; import org.mian.gitnex.adapters.MyReposListAdapter; import org.mian.gitnex.helpers.Authorization; diff --git a/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java index f25d909e..ad359046 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java @@ -23,7 +23,6 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; import org.mian.gitnex.R; -import org.mian.gitnex.activities.MainActivity; import org.mian.gitnex.activities.NewOrganizationActivity; import org.mian.gitnex.adapters.OrganizationsListAdapter; import org.mian.gitnex.helpers.Authorization; 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 db9cb506..8f680ec2 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java @@ -78,6 +78,7 @@ public class ProfileFragment extends Fragment { myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf"); } + TabLayout tabLayout = v.findViewById(R.id.tabs); ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0); diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java index 8a1e0c00..3ea7e686 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java @@ -13,7 +13,6 @@ import android.widget.LinearLayout; import android.widget.Switch; import android.widget.TextView; import org.mian.gitnex.R; -import org.mian.gitnex.activities.MainActivity; import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.util.TinyDB; import java.util.Objects; diff --git a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java index 56290ddf..20c793f5 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java @@ -24,7 +24,6 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; import org.mian.gitnex.R; -import org.mian.gitnex.activities.MainActivity; import org.mian.gitnex.activities.NewRepoActivity; import org.mian.gitnex.adapters.StarredReposListAdapter; import org.mian.gitnex.helpers.Authorization; diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml index 84515c6b..3623d9d6 100644 --- a/app/src/main/res/layout/activity_issue_detail.xml +++ b/app/src/main/res/layout/activity_issue_detail.xml @@ -19,7 +19,17 @@ android:layout_weight="1" android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" - app:title="@string/app_name" /> + app:title="@string/app_name" > + + + + diff --git a/app/src/main/res/layout/activity_org_detail.xml b/app/src/main/res/layout/activity_org_detail.xml index 072c833d..ffd5933b 100644 --- a/app/src/main/res/layout/activity_org_detail.xml +++ b/app/src/main/res/layout/activity_org_detail.xml @@ -26,6 +26,14 @@ app:popupTheme="@style/AppTheme.PopupOverlay" app:title="@string/app_name"> + + + +