Have all activities (except main activity) control their own toolbars.

app/src/main/AndroidManifest.xml

@@ -14,21 +14,19 @@
         android:theme="@style/AppTheme" >
         <activity
-            android:name="com.commit451.gitlab.MainActivity"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/app_name" >
+            android:name="com.commit451.gitlab.MainActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name="com.commit451.gitlab.LoginActivity"
-            android:label="@string/login_activity" />
+            android:theme="@style/AppThemeNoAB" />
         <activity
             android:name="com.commit451.gitlab.FileActivity"
             android:configChanges="orientation|screenSize"
+            android:theme="@style/AppThemeNoAB"
             android:parentActivityName="com.commit451.gitlab.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -37,6 +35,7 @@
         <activity
             android:name="com.commit451.gitlab.IssueActivity"
             android:configChanges="orientation|screenSize"
+            android:theme="@style/AppThemeNoAB"
             android:parentActivityName="com.commit451.gitlab.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -45,6 +44,7 @@
         <activity
             android:name="com.commit451.gitlab.DiffActivity"
             android:configChanges="orientation|screenSize"
+            android:theme="@style/AppThemeNoAB"
             android:parentActivityName="com.commit451.gitlab.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

app/src/main/java/com/commit451/gitlab/DiffActivity.java

 package com.commit451.gitlab;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.LinearLayout;
 import com.commit451.gitlab.model.Diff;
@@ -24,6 +26,7 @@ import retrofit.client.Response;
 public class DiffActivity extends BaseActivity {
+	@Bind(R.id.toolbar) Toolbar toolbar;
     @Bind(R.id.message_container)	LinearLayout messageContainer;
 	@Bind(R.id.diff_container) LinearLayout diffContainer;
 	
@@ -44,8 +47,14 @@ public class DiffActivity extends BaseActivity {
 	}
 	
 	private void init() {
-		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-		getSupportActionBar().setTitle(Repository.selectedCommit.getShortId());
+		toolbar.setNavigationIcon(R.drawable.ic_back);
+		toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				onBackPressed();
+			}
+		});
+		toolbar.setTitle(Repository.selectedCommit.getShortId());
 		Repository.getService().getCommit(Repository.selectedProject.getId(), Repository.selectedCommit.getId(), commitCallback);
 		Repository.getService().getCommitDiff(Repository.selectedProject.getId(), Repository.selectedCommit.getId(), diffCallback);

app/src/main/java/com/commit451/gitlab/FileActivity.java

@@ -5,8 +5,10 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.webkit.MimeTypeMap;
 import android.webkit.WebView;
@@ -31,7 +33,7 @@ import retrofit.RetrofitError;
 import retrofit.client.Response;
 public class FileActivity extends BaseActivity {
-	
+	@Bind(R.id.toolbar) Toolbar toolbar;
 	@Bind(R.id.file_blob) WebView fileBlobView;
 	
 	private MenuItem openFile;
@@ -61,8 +63,14 @@ public class FileActivity extends BaseActivity {
 	
 	@SuppressLint("SetJavaScriptEnabled")
 	private void setupUI() {
-		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-		getSupportActionBar().setTitle(Repository.selectedFile.getName());
+		toolbar.setNavigationIcon(R.drawable.ic_back);
+		toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				onBackPressed();
+			}
+		});
+		toolbar.setTitle(Repository.selectedFile.getName());
 		
 		fileBlobView.getSettings().setJavaScriptEnabled(true);
 	}

app/src/main/java/com/commit451/gitlab/IssueActivity.java

@@ -2,6 +2,7 @@ package com.commit451.gitlab;
 import android.app.ProgressDialog;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -39,7 +40,8 @@ import retrofit.RetrofitError;
 import retrofit.client.Response;
 public class IssueActivity extends BaseActivity {
-	
+
+	@Bind(R.id.toolbar) Toolbar toolbar;
 	@Bind(R.id.scroll1) ScrollView scroll;
 	
 	@Bind(R.id.title) TextView title;
@@ -64,8 +66,9 @@ public class IssueActivity extends BaseActivity {
 			setupUI();
 			loadNotes();
 		}
-		else
+		else {
 			finish();
+		}
 	}
 	
 	@Override
@@ -80,15 +83,22 @@ public class IssueActivity extends BaseActivity {
 	 */
 	private void setupUI() {
 		long tempId = Repository.selectedIssue.getIid();
-		if(tempId < 1)
+		if(tempId < 1) {
 			tempId = Repository.selectedIssue.getId();
-		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-		getSupportActionBar().setTitle("Issue #" + tempId);
+		}
+		toolbar.setNavigationIcon(R.drawable.ic_back);
+		toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				onBackPressed();
+			}
+		});
+		toolbar.setTitle("Issue #" + tempId);
 		
 		title.setText(Repository.selectedIssue.getTitle());
 		
-		ArrayList<String> temp3 = new ArrayList<String>();
+		ArrayList<String> temp3 = new ArrayList<>();
 		if(Repository.selectedIssue.getState().equals("opened")) {
 			temp3.add("opened");
 			temp3.add("closed");

app/src/main/java/com/commit451/gitlab/LoginActivity.java

@@ -7,6 +7,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.TextView;
@@ -38,12 +39,22 @@ public class LoginActivity extends BaseActivity {
 	@Bind(R.id.token_login) View tokenLogin;
 	
 	private boolean isNormalLogin = true;
-	
+
+	private final TextView.OnEditorActionListener onEditorActionListener = new TextView.OnEditorActionListener() {
+		@Override
+		public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+			onLoginClick();
+			return true;
+		}
+	};
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_login);
 		ButterKnife.bind(this);
+		passwordInput.setOnEditorActionListener(onEditorActionListener);
+		tokenInput.setOnEditorActionListener(onEditorActionListener);
 	}
 	
 	@Override

app/src/main/res/layout/activity_diff.xml

 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <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:background="?attr/colorPrimary" />
+
+    </android.support.design.widget.AppBarLayout>
+
+<ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
+    android:layout_marginTop="?attr/actionBarSize"
     android:scrollbarStyle="outsideOverlay"
     tools:context=".DiffActivity" >
@@ -35,4 +53,5 @@
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
+</FrameLayout>
\ No newline at end of file

app/src/main/res/layout/activity_file.xml

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".FileActivity" >
+    <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:background="?attr/colorPrimary" />
+
+    </android.support.design.widget.AppBarLayout>
+
     <WebView
         android:id="@+id/file_blob"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true" />
-</RelativeLayout>
+        android:layout_marginTop="?attr/actionBarSize"/>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file

app/src/main/res/layout/activity_issue.xml

@@ -5,6 +5,19 @@
     android:layout_height="match_parent"
     tools:context=".IssueActivity" >
+    <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:background="?attr/colorPrimary" />
+
+    </android.support.design.widget.AppBarLayout>
+
     <ScrollView
         android:id="@+id/scroll1"
         android:layout_width="match_parent"
@@ -12,7 +25,8 @@
         android:layout_above="@+id/lsep2"
         android:layout_alignParentTop="true"
         android:paddingLeft="16dp"
-        android:paddingTop="16dp" >
+        android:paddingTop="@dimen/padding_normal"
+        android:layout_marginTop="?attr/actionBarSize" >
         <LinearLayout
             android:id="@+id/lin1"
@@ -86,7 +100,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffffff"
+        android:background="#000000"
         android:orientation="horizontal"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"

app/src/main/res/layout/activity_login.xml

@@ -15,7 +15,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_gravity="center">
+        android:layout_gravity="center"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin">
         <android.support.design.widget.TextInputLayout
             android:id="@+id/url_hint"
@@ -28,10 +30,6 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/title"
                 android:layout_centerHorizontal="true"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="40dp"
-                android:ems="10"
                 android:hint="@string/url_hint"
                 android:text="@string/url_gitlab"
                 android:inputType="textUri">
@@ -55,8 +53,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
                 android:ems="10"
                 android:hint="@string/user_hint"
                 android:inputType="textEmailAddress" />
@@ -74,10 +70,6 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/user_input"
                 android:layout_centerHorizontal="true"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="20dp"
-                android:ems="10"
                 android:hint="@string/password_hint"
                 android:inputType="textPassword" />
@@ -102,10 +94,6 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_centerHorizontal="true"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="20dp"
-                android:ems="10"
                 android:hint="@string/token_hint"
                 android:inputType="textVisiblePassword" />
         </android.support.design.widget.TextInputLayout>
@@ -126,12 +114,16 @@
     </LinearLayout>
-    <Button
+    <TextView
         android:id="@+id/login_button"
-        style="?android:attr/buttonBarButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|bottom"
-        android:text="@string/login_button" />
+        android:padding="@dimen/padding_normal"
+        android:layout_gravity="bottom"
+        android:gravity="center_horizontal"
+        android:textColor="?attr/colorAccent"
+        android:text="@string/login_button"
+        android:textAllCaps="true"
+        android:background="?attr/selectableItemBackground"/>
 </FrameLayout>
\ No newline at end of file

app/src/main/res/values-w820dp/dimens.xml

+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>

app/src/main/res/values/dimens.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="padding_normal">16dp</dimen>
 </resources>
\ No newline at end of file

app/src/main/res/values/styles.xml

@@ -8,4 +8,12 @@
         <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="colorAccent">@color/orange</item>
     </style>
+
+    <style name="AppThemeNoAB" parent="Theme.AppCompat.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/grey</item>
+        <item name="colorPrimaryDark">@color/grey_dark</item>
+        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
+        <item name="colorAccent">@color/orange</item>
+    </style>
 </resources>
\ No newline at end of file