From 201031d79e1a0736a81130b7714bb64a3023f4f9 Mon Sep 17 00:00:00 2001 From: ShardulKoli <32015478+ShardulKoli@users.noreply.github.com> Date: Mon, 12 Feb 2018 23:24:38 +0530 Subject: [PATCH 1/2] added repos to sidebar --- .../com/fastaccess/ui/base/BaseActivity.java | 2 ++ .../com/fastaccess/ui/base/MainNavDrawer.kt | 19 +++++++++++++++++++ app/src/main/res/menu/drawer_menu.xml | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java index f28f63765..6558cc410 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java @@ -59,6 +59,8 @@ import net.grandcentrix.thirtyinch.TiActivity; +import org.apache.tools.ant.taskdefs.Length; + import java.util.ArrayList; import butterknife.BindView; diff --git a/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt b/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt index 321b4bd9b..041ba1d0c 100644 --- a/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt +++ b/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt @@ -9,13 +9,16 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import com.fastaccess.R +import com.fastaccess.R.id.view import com.fastaccess.data.dao.model.Login import com.fastaccess.data.dao.model.PinnedRepos +import com.fastaccess.data.dao.model.Repo import com.fastaccess.helper.PrefGetter import com.fastaccess.helper.RxHelper import com.fastaccess.provider.scheme.SchemeParser import com.fastaccess.ui.adapter.LoginAdapter import com.fastaccess.ui.adapter.PinnedReposAdapter +import com.fastaccess.ui.adapter.viewholder.RepoFilePathsViewHolder import com.fastaccess.ui.modules.about.FastHubAboutActivity import com.fastaccess.ui.modules.gists.GistsListActivity import com.fastaccess.ui.modules.login.chooser.LoginChooserActivity @@ -25,6 +28,17 @@ import com.fastaccess.ui.modules.main.playstore.PlayStoreWarningActivity import com.fastaccess.ui.modules.main.premium.PremiumActivity import com.fastaccess.ui.modules.notification.NotificationActivity import com.fastaccess.ui.modules.pinned.PinnedReposActivity +import com.fastaccess.ui.modules.profile.org.repos.OrgReposFragment +import com.fastaccess.ui.modules.profile.repos.ProfileReposFragment +import com.fastaccess.ui.modules.repos.DummyFragment +import com.fastaccess.ui.modules.repos.RepoPagerActivity +import com.fastaccess.ui.modules.repos.RepoPagerActivity_ViewBinding +import com.fastaccess.ui.modules.repos.RepoPagerMvp +import com.fastaccess.ui.modules.repos.code.files.RepoFilesFragment +import com.fastaccess.ui.modules.repos.code.files.activity.RepoFilesActivity +import com.fastaccess.ui.modules.repos.code.files.activity.`RepoFilesActivity$$StateSaver` +import com.fastaccess.ui.modules.repos.code.files.paths.RepoFilePathFragment_ViewBinding +import com.fastaccess.ui.modules.repos.code.files.paths.`RepoFilePathFragment$$StateSaver` import com.fastaccess.ui.modules.repos.issues.create.CreateIssueActivity import com.fastaccess.ui.modules.trending.TrendingActivity import com.fastaccess.ui.modules.user.UserPagerActivity @@ -178,6 +192,11 @@ class MainNavDrawer(val view: BaseActivity<*, *>, private val extraNav: Navigati item.itemId == R.id.profile -> userModel?.let { UserPagerActivity.startActivity(view, it.login, false, PrefGetter.isEnterprise(), 0) } + item.itemId == R.id.repos -> { + if (userModel != null) { + UserPagerActivity.startActivity(view, userModel.login, false, PrefGetter.isEnterprise(), 2) + } + } item.itemId == R.id.settings -> view.onOpenSettings() item.itemId == R.id.about -> view.startActivity(Intent(view, FastHubAboutActivity::class.java)) item.itemId == R.id.orgs -> view.onOpenOrgsDialog() diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml index 3981b2bb9..8996d5692 100644 --- a/app/src/main/res/menu/drawer_menu.xml +++ b/app/src/main/res/menu/drawer_menu.xml @@ -27,6 +27,10 @@ android:id="@+id/notifications" android:icon="@drawable/ic_ring" android:title="@string/notifications"/> + From 4e6aa845393052afc3d577022860dc0ce6463f87 Mon Sep 17 00:00:00 2001 From: ShardulKoli <32015478+ShardulKoli@users.noreply.github.com> Date: Mon, 12 Feb 2018 23:32:10 +0530 Subject: [PATCH 2/2] repos to sidebar --- .../java/com/fastaccess/ui/base/MainNavDrawer.kt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt b/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt index 041ba1d0c..942649cf5 100644 --- a/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt +++ b/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt @@ -9,16 +9,13 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import com.fastaccess.R -import com.fastaccess.R.id.view import com.fastaccess.data.dao.model.Login import com.fastaccess.data.dao.model.PinnedRepos -import com.fastaccess.data.dao.model.Repo import com.fastaccess.helper.PrefGetter import com.fastaccess.helper.RxHelper import com.fastaccess.provider.scheme.SchemeParser import com.fastaccess.ui.adapter.LoginAdapter import com.fastaccess.ui.adapter.PinnedReposAdapter -import com.fastaccess.ui.adapter.viewholder.RepoFilePathsViewHolder import com.fastaccess.ui.modules.about.FastHubAboutActivity import com.fastaccess.ui.modules.gists.GistsListActivity import com.fastaccess.ui.modules.login.chooser.LoginChooserActivity @@ -28,17 +25,6 @@ import com.fastaccess.ui.modules.main.playstore.PlayStoreWarningActivity import com.fastaccess.ui.modules.main.premium.PremiumActivity import com.fastaccess.ui.modules.notification.NotificationActivity import com.fastaccess.ui.modules.pinned.PinnedReposActivity -import com.fastaccess.ui.modules.profile.org.repos.OrgReposFragment -import com.fastaccess.ui.modules.profile.repos.ProfileReposFragment -import com.fastaccess.ui.modules.repos.DummyFragment -import com.fastaccess.ui.modules.repos.RepoPagerActivity -import com.fastaccess.ui.modules.repos.RepoPagerActivity_ViewBinding -import com.fastaccess.ui.modules.repos.RepoPagerMvp -import com.fastaccess.ui.modules.repos.code.files.RepoFilesFragment -import com.fastaccess.ui.modules.repos.code.files.activity.RepoFilesActivity -import com.fastaccess.ui.modules.repos.code.files.activity.`RepoFilesActivity$$StateSaver` -import com.fastaccess.ui.modules.repos.code.files.paths.RepoFilePathFragment_ViewBinding -import com.fastaccess.ui.modules.repos.code.files.paths.`RepoFilePathFragment$$StateSaver` import com.fastaccess.ui.modules.repos.issues.create.CreateIssueActivity import com.fastaccess.ui.modules.trending.TrendingActivity import com.fastaccess.ui.modules.user.UserPagerActivity