ekx · HozakaN · Nov 23, 2014
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,5 @@
-import com.android.build.gradle.tasks.PackageApplication
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 apply from: 'signing.gradle'
 
 android {
@@ -45,12 +44,14 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 }
 
+import com.android.build.gradle.tasks.PackageApplication
+
 task copyNativeLibs(type: Copy) {
     from(new File(getProjectDir(), 'native-libs')) { include '**/*.so' }
     into new File(buildDir, 'native-libs')
 }
 
-tasks.withType(Compile) { compileTask -> compileTask.dependsOn copyNativeLibs }
+tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyNativeLibs }
 
 clean.dependsOn 'cleanCopyNativeLibs'
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@android:style/Theme.DeviceDefault.Light.DarkActionBar" >
+        android:theme="@style/GitLabTheme" >
 
         <activity
             android:name="com.bd.gitlab.MainActivity"
@@ -24,8 +24,7 @@
         <activity
             android:name="com.bd.gitlab.LoginActivity"
             android:label="@string/login_activity"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.DeviceDefault.NoActionBar" />
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.bd.gitlab.FileActivity"
             android:configChanges="orientation|screenSize"

diff --git a/app/src/main/java/com/bd/gitlab/DiffActivity.java b/app/src/main/java/com/bd/gitlab/DiffActivity.java
@@ -11,6 +11,7 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
@@ -25,7 +26,7 @@
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
 
-public class DiffActivity extends Activity {
+public class DiffActivity extends ActionBarActivity {
 
     @InjectView(R.id.message_container)	LinearLayout messageContainer;
 	@InjectView(R.id.diff_container) LinearLayout diffContainer;
@@ -35,7 +36,9 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_diff);
 		ButterKnife.inject(this);
-
+
+        setSupportActionBar((android.support.v7.widget.Toolbar) findViewById(R.id.toolbar));
+
 		init();
 	}
 
@@ -47,9 +50,9 @@ public void onDestroy() {
 	}
 
 	private void init() {
-		getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setTitle(Repository.selectedCommit.getShortId());
-        getActionBar().setIcon(getResources().getDrawable(R.drawable.ic_actionbar));
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setTitle(Repository.selectedCommit.getShortId());
+        getSupportActionBar().setIcon(getResources().getDrawable(R.drawable.ic_actionbar));
 
 		Repository.getService().getCommit(Repository.selectedProject.getId(), Repository.selectedCommit.getId(), commitCallback);
 		Repository.getService().getCommitDiff(Repository.selectedProject.getId(), Repository.selectedCommit.getId(), diffCallback);

diff --git a/app/src/main/java/com/bd/gitlab/FileActivity.java b/app/src/main/java/com/bd/gitlab/FileActivity.java
@@ -22,6 +22,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.webkit.MimeTypeMap;
@@ -33,8 +35,10 @@
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
 
-public class FileActivity extends Activity {
-
+public class FileActivity extends ActionBarActivity {
+
+    @InjectView(R.id.toolbar) Toolbar toolbar;
+
 	@InjectView(R.id.file_blob) WebView fileBlobView;
 
 	private MenuItem openFile;
@@ -47,7 +51,9 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_file);
 		ButterKnife.inject(this);
-
+
+        setSupportActionBar(toolbar);
+
 		if(Repository.selectedFile != null) {
 			setupUI();
 
@@ -64,9 +70,9 @@ public void onDestroy() {
 
 	@SuppressLint("SetJavaScriptEnabled")
 	private void setupUI() {
-		getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setTitle(Repository.selectedFile.getName());
-        getActionBar().setIcon(getResources().getDrawable(R.drawable.ic_actionbar));
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setTitle(Repository.selectedFile.getName());
+        getSupportActionBar().setIcon(getResources().getDrawable(R.drawable.ic_actionbar));
 
 		fileBlobView.getSettings().setJavaScriptEnabled(true);
 	}

diff --git a/app/src/main/java/com/bd/gitlab/IssueActivity.java b/app/src/main/java/com/bd/gitlab/IssueActivity.java
@@ -13,10 +13,11 @@
 import retrofit.RetrofitError;
 import retrofit.client.Response;
 
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -43,8 +44,10 @@
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
 
-public class IssueActivity extends Activity {
-
+public class IssueActivity extends ActionBarActivity {
+
+    @InjectView(R.id.toolbar) Toolbar toolbar;
+
 	@InjectView(R.id.scroll1) ScrollView scroll;
 
 	@InjectView(R.id.title) TextView title;
@@ -64,7 +67,9 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_issue);
 		ButterKnife.inject(this);
-
+
+        setSupportActionBar(toolbar);
+
 		if(Repository.selectedIssue != null) {
 			setupUI();
 			loadNotes();
@@ -88,9 +93,9 @@ private void setupUI() {
 		if(tempId < 1)
 			tempId = Repository.selectedIssue.getId();
 
-		getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setTitle("Issue #" + tempId);
-        getActionBar().setIcon(getResources().getDrawable(R.drawable.ic_actionbar));
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setTitle("Issue #" + tempId);
+        getSupportActionBar().setIcon(getResources().getDrawable(R.drawable.ic_actionbar));
 
 		title.setText(Repository.selectedIssue.getTitle());
 

diff --git a/app/src/main/java/com/bd/gitlab/LoginActivity.java b/app/src/main/java/com/bd/gitlab/LoginActivity.java
@@ -17,6 +17,8 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.RelativeLayout;
@@ -32,8 +34,8 @@
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
 
-public class LoginActivity extends Activity {
-	
+public class LoginActivity extends ActionBarActivity {
+
 	@InjectView(R.id.url_input) TextView urlInput;
 	@InjectView(R.id.user_input) TextView userInput;
 	@InjectView(R.id.password_input) TextView passwordInput;

diff --git a/app/src/main/java/com/bd/gitlab/MainActivity.java b/app/src/main/java/com/bd/gitlab/MainActivity.java
@@ -1,6 +1,5 @@
 package com.bd.gitlab;
 
-import android.app.ActionBar;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -10,22 +9,26 @@
 import android.graphics.Point;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.*;
+import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.ListView;
 
 import com.bd.gitlab.adapter.DrawerAdapter;
 import com.bd.gitlab.fragments.CommitsFragment;
@@ -50,21 +53,20 @@
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
-
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
-
 import retrofit.Callback;
 import retrofit.RetrofitError;
 import retrofit.client.Response;
 
-public class MainActivity extends FragmentActivity implements ActionBar.OnNavigationListener, OnItemClickListener {
+public class MainActivity extends ActionBarActivity implements ActionBar.OnNavigationListener, OnItemClickListener {
 
 	@InjectView(R.id.drawer_layout) DrawerLayout drawerLayout;
 	@InjectView(R.id.left_drawer) LinearLayout drawerLeft;
 	@InjectView(R.id.left_drawer_list) ListView drawerList;
 	@InjectView(R.id.pager) ViewPager viewPager;
 	@InjectView(R.id.filter_project) FilterEditText filterProjectEdit;
+    @InjectView(R.id.toolbar) Toolbar toolbar;
 
 	private ActionBar actionBar;
 	private ActionBarDrawerToggle drawerToggle;
@@ -76,9 +78,10 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
 		ButterKnife.inject(this);
-
-		actionBar = getActionBar();
-		actionBar.setIcon(getResources().getDrawable(R.drawable.ic_actionbar));
+
+        setSupportActionBar(toolbar);
+		actionBar = getSupportActionBar();
+//		actionBar.setIcon(getResources().getDrawable(R.drawable.ic_actionbar));
 		actionBar.setDisplayHomeAsUpEnabled(true);
 		actionBar.setHomeButtonEnabled(true);
 
@@ -184,7 +187,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 rotationLocked = item.isChecked();
 
                 if(rotationLocked)
-                    setRequestedOrientation(Repository.getScreenOrientation(this));
+                    setRequestedOrientation(Repository.getScreenOrientation(this.getWindowManager()));
                 else
                     setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
                 return true;

diff --git a/app/src/main/java/com/bd/gitlab/tools/Repository.java b/app/src/main/java/com/bd/gitlab/tools/Repository.java
@@ -1,17 +1,5 @@
 package com.bd.gitlab.tools;
 
-import java.lang.reflect.Type;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Locale;
-
-import retrofit.RestAdapter;
-import retrofit.converter.GsonConverter;
-
-import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,6 +10,7 @@
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
@@ -35,7 +24,6 @@
 import com.bd.gitlab.model.Project;
 import com.bd.gitlab.model.TreeItem;
 import com.bd.gitlab.model.User;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
@@ -45,6 +33,13 @@
 
 import org.joda.time.format.ISODateTimeFormat;
 
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Date;
+
+import retrofit.RestAdapter;
+import retrofit.converter.GsonConverter;
+
 public class Repository extends Application {
 
 	public static ArrayList<Project> projects;
@@ -199,10 +194,10 @@ public static void setListViewSize(ListView listView) {
 		listView.requestLayout();
 	}
 
-    public static int getScreenOrientation(Activity activity) {
-        int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+    public static int getScreenOrientation(WindowManager windowManager) {
+        int rotation = windowManager.getDefaultDisplay().getRotation();
         DisplayMetrics dm = new DisplayMetrics();
-        activity.getWindowManager().getDefaultDisplay().getMetrics(dm);
+        windowManager.getDefaultDisplay().getMetrics(dm);
         int width = dm.widthPixels;
         int height = dm.heightPixels;
         int orientation;