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

Add ActivityActivity

parent 82359779
No related branches found
No related tags found
No related merge requests found
Showing with 173 additions and 2 deletions
Loading
Loading
@@ -27,10 +27,10 @@
 
<activity android:name=".activity.ProjectsActivity"
android:launchMode="singleTask"/>
<activity android:name=".activity.GroupsActivity"
android:launchMode="singleTask"/>
<activity android:name=".activity.ActivityActivity"
android:launchMode="singleTask"/>
<activity android:name=".activity.ProjectActivity" />
<activity android:name=".activity.LoginActivity" />
<activity android:name=".activity.FileActivity"/>
Loading
Loading
package com.commit451.gitlab.activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.widget.Toolbar;
import android.view.View;
import com.afollestad.appthemeengine.customizers.ATEActivityThemeCustomizer;
import com.commit451.gitlab.R;
import com.commit451.gitlab.api.GitLabClient;
import com.commit451.gitlab.fragment.FeedFragment;
import butterknife.Bind;
import butterknife.ButterKnife;
import timber.log.Timber;
/**
* Displays the current users projects feed
*/
public class ActivityActivity extends BaseActivity implements ATEActivityThemeCustomizer {
private static final String TAG_FEED_FRAGMENT = "feed_fragment";
@Override
public int getActivityTheme() {
return PreferenceManager.getDefaultSharedPreferences(this).getBoolean("dark_theme", true) ?
R.style.Activity_Activity : R.style.ActivityLight_Activity;
}
public static Intent newInstance(Context context) {
Intent intent = new Intent(context, ActivityActivity.class);
return intent;
}
@Bind(R.id.drawer_layout) DrawerLayout mDrawerLayout;
@Bind(R.id.toolbar) Toolbar mToolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_activity);
ButterKnife.bind(this);
mToolbar.setTitle(R.string.nav_activity);
mToolbar.setNavigationIcon(R.drawable.ic_menu_24dp);
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mDrawerLayout.openDrawer(GravityCompat.START);
}
});
FeedFragment feedFragment = (FeedFragment) getSupportFragmentManager().findFragmentByTag(TAG_FEED_FRAGMENT);
if (feedFragment == null) {
Uri feedUri = GitLabClient.getAccount().getServerUrl();
feedUri = feedUri.buildUpon()
.appendPath("dashboard")
.appendPath("projects.atom")
.build();
Timber.d("Showing activity feed for: %s", feedUri.toString());
feedFragment = FeedFragment.newInstance(feedUri);
getSupportFragmentManager().beginTransaction()
.replace(R.id.root_fragment, feedFragment, TAG_FEED_FRAGMENT)
.commit();
}
}
}
Loading
Loading
@@ -25,6 +25,9 @@ import butterknife.Bind;
import butterknife.ButterKnife;
import timber.log.Timber;
 
/**
* Takes an RSS feed url and shows the feed
*/
public class FeedFragment extends BaseFragment {
 
private static final String EXTRA_FEED_URL = "extra_feed_url";
Loading
Loading
Loading
Loading
@@ -11,6 +11,7 @@ import android.widget.ImageView;
 
import com.commit451.gitlab.R;
import com.commit451.gitlab.activity.AboutActivity;
import com.commit451.gitlab.activity.ActivityActivity;
import com.commit451.gitlab.activity.AddIssueActivity;
import com.commit451.gitlab.activity.AddMilestoneActivity;
import com.commit451.gitlab.activity.AddUserActivity;
Loading
Loading
@@ -68,6 +69,10 @@ public class NavigationManager {
activity.startActivity(GroupsActivity.newInstance(activity));
}
 
public static void navigateToActivity(Activity activity) {
activity.startActivity(ActivityActivity.newInstance(activity));
}
public static void navigateToLogin(Activity activity) {
activity.startActivity(LoginActivity.newInstance(activity));
}
Loading
Loading
Loading
Loading
@@ -17,6 +17,7 @@ import android.widget.TextView;
import com.commit451.easel.Easel;
import com.commit451.gitlab.LabCoatApp;
import com.commit451.gitlab.R;
import com.commit451.gitlab.activity.ActivityActivity;
import com.commit451.gitlab.activity.GroupsActivity;
import com.commit451.gitlab.activity.ProjectsActivity;
import com.commit451.gitlab.adapter.AccountsAdapter;
Loading
Loading
@@ -81,6 +82,16 @@ public class GitLabNavigationView extends NavigationView {
}
LabCoatApp.bus().post(new CloseDrawerEvent());
return true;
case R.id.nav_activity:
if (getContext() instanceof ActivityActivity) {
} else {
NavigationManager.navigateToActivity((Activity) getContext());
((Activity) getContext()).finish();
((Activity)getContext()).overridePendingTransition(R.anim.fade_in, R.anim.do_nothing);
}
LabCoatApp.bus().post(new CloseDrawerEvent());
return true;
case R.id.nav_settings:
LabCoatApp.bus().post(new CloseDrawerEvent());
NavigationManager.navigateToSettings((Activity) getContext());
Loading
Loading
@@ -208,6 +219,10 @@ public class GitLabNavigationView extends NavigationView {
menuItem.setChecked(true);
return;
}
if (getContext() instanceof ActivityActivity && menuItem.getItemId() == R.id.nav_activity) {
menuItem.setChecked(true);
return;
}
}
throw new IllegalStateException("You need to set a selected nav item for this activity");
}
Loading
Loading
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M13.5,0.67s0.74,2.65 0.74,4.8c0,2.06 -1.35,3.73 -3.41,3.73 -2.07,0 -3.63,-1.67 -3.63,-3.73l0.03,-0.36C5.21,7.51 4,10.62 4,14c0,4.42 3.58,8 8,8s8,-3.58 8,-8C20,8.61 17.41,3.8 13.5,0.67zM11.71,19c-1.78,0 -3.22,-1.4 -3.22,-3.14 0,-1.62 1.05,-2.76 2.81,-3.12 1.77,-0.36 3.6,-1.21 4.62,-2.58 0.39,1.29 0.59,2.65 0.59,4.04 0,2.65 -2.15,4.8 -4.8,4.8z"/>
</vector>
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<LinearLayout
android:id="@+id/main_content_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
</android.support.design.widget.AppBarLayout>
<FrameLayout
android:id="@+id/root_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
<com.commit451.gitlab.view.GitLabNavigationView
android:id="@+id/navigation_view"
android:layout_width="304dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:clickable="true"
android:fitsSystemWindows="true" />
</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
Loading
Loading
@@ -12,6 +12,10 @@
android:id="@+id/nav_groups"
android:icon="@drawable/ic_group_24dp"
android:title="@string/nav_groups" />
<item
android:id="@+id/nav_activity"
android:icon="@drawable/ic_activity_24dp"
android:title="@string/nav_activity" />
</group>
 
<group
Loading
Loading
Loading
Loading
@@ -11,6 +11,11 @@
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
 
<style name="Activity.Activity">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<!-- Light theme -->
<style name="ActivityLight.Projects">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
Loading
Loading
@@ -21,4 +26,9 @@
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="ActivityLight.Activity">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
</resources>
\ No newline at end of file
Loading
Loading
@@ -6,6 +6,7 @@
<!-- Drawer -->
<string name="nav_projects">Projects</string>
<string name="nav_groups">Groups</string>
<string name="nav_activity">Activity</string>
<!-- Menu -->
<string name="action_logout">Logout</string>
<string name="action_save">Save</string>
Loading
Loading
Loading
Loading
@@ -19,6 +19,10 @@
<!--Check v21 for the good bits-->
</style>
 
<style name="Activity.Activity">
<!--Check v21 for the good bits-->
</style>
<style name="Activity.User">
<item name="colorPrimaryDark">@android:color/transparent</item>
<item name="android:statusBarColor" tools:ignore="NewApi">@android:color/transparent</item>
Loading
Loading
@@ -56,6 +60,10 @@
<!--Check v21 for the good bits-->
</style>
 
<style name="ActivityLight.Activity">
<!--Check v21 for the good bits-->
</style>
<style name="ActivityLight.User">
<item name="colorPrimaryDark">@android:color/transparent</item>
<item name="android:statusBarColor" tools:ignore="NewApi">@android:color/transparent</item>
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