Skip to content
Snippets Groups Projects
Commit 971c668a authored by John Carlson's avatar John Carlson
Browse files

Show repo name in toolbar, slide to tab that makes sense on picker

parent e000ce5d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -70,7 +70,8 @@
<activity android:name=".activity.SettingsActivity" />
<activity android:name=".activity.AddLabelActivity" />
<activity android:name=".activity.AddNewLabelActivity" />
<activity android:name=".activity.PickBranchOrTagActivity" />
<activity android:name=".activity.PickBranchOrTagActivity"
android:theme="@style/Activity.Translucent"/>
<activity android:name=".activity.WebviewLoginActivity" />
<activity
android:name=".activity.RoutingActivity"
Loading
Loading
Loading
Loading
@@ -54,6 +54,11 @@ public class PickBranchOrTagActivity extends AppCompatActivity {
Ref currentRef = Parcels.unwrap(getIntent().getParcelableExtra(EXTRA_CURRENT_REF));
mViewPager.setAdapter(new PickBranchOrTagPagerAdapter(this, getSupportFragmentManager(), projectId, currentRef));
mTabLayout.setupWithViewPager(mViewPager);
if (currentRef != null) {
int position = currentRef.getType() == Ref.TYPE_BRANCH ? 0 : 1;
mTabLayout.getTabAt(position).select();
mViewPager.setCurrentItem(position);
}
}
 
@Override
Loading
Loading
Loading
Loading
@@ -75,8 +75,7 @@ public class ProjectActivity extends BaseActivity {
@Override
public void success(@NonNull Project response) {
mProject = response;
setupTabs();
loadBranches();
bindProject();
}
 
@Override
Loading
Loading
@@ -177,8 +176,7 @@ public class ProjectActivity extends BaseActivity {
String projectId = getIntent().getStringExtra(EXTRA_PROJECT_ID);
loadProject(projectId);
} else {
setupTabs();
loadBranches();
bindProject();
}
}
 
Loading
Loading
@@ -236,6 +234,13 @@ public class ProjectActivity extends BaseActivity {
return mProject;
}
 
private void bindProject() {
mToolbar.setTitle(mProject.getName());
mToolbar.setSubtitle(mProject.getNamespace().getName());
setupTabs();
loadBranches();
}
private void setupTabs() {
ProjectSectionsPagerAdapter projectSectionsPagerAdapter = new ProjectSectionsPagerAdapter(this, getSupportFragmentManager());
 
Loading
Loading
Loading
Loading
@@ -10,9 +10,8 @@
 
<item
android:id="@+id/action_share"
app:showAsAction="ifRoom"
android:title="@string/action_share"
android:icon="@drawable/ic_share_24dp"/>
app:showAsAction="never"
android:title="@string/action_share"/>
 
<item
android:id="@+id/action_copy_git_https"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment