diff --git a/app/build.gradle b/app/build.gradle index c1db2b9..882db2b 100644 --- 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 index 71032fc..855e452 100644 --- 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" > + android:screenOrientation="portrait" /> 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; diff --git a/app/src/main/res/layout/activity_diff.xml b/app/src/main/res/layout/activity_diff.xml index 02351c0..9ec0773 100644 --- a/app/src/main/res/layout/activity_diff.xml +++ b/app/src/main/res/layout/activity_diff.xml @@ -1,38 +1,52 @@ - - - + tools:context=".DiffActivity"> - - + + + + + + + + + + + - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_file.xml b/app/src/main/res/layout/activity_file.xml index 2a26d0f..30be9c3 100644 --- a/app/src/main/res/layout/activity_file.xml +++ b/app/src/main/res/layout/activity_file.xml @@ -5,11 +5,15 @@ android:layout_height="match_parent" tools:context=".FileActivity" > + + + android:layout_below="@id/toolbar" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_issue.xml b/app/src/main/res/layout/activity_issue.xml index cf1cc38..bfe4fcf 100644 --- a/app/src/main/res/layout/activity_issue.xml +++ b/app/src/main/res/layout/activity_issue.xml @@ -5,20 +5,30 @@ android:layout_height="match_parent" tools:context=".IssueActivity" > + + + android:layout_alignParentLeft="true" + android:paddingTop="16dp" + android:clipToPadding="false"> + + diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml new file mode 100644 index 0000000..ae43b75 --- /dev/null +++ b/app/src/main/res/layout/toolbar.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/app/src/main/res/menu/issue.xml b/app/src/main/res/menu/issue.xml index 6f0f95d..af1a118 100644 --- a/app/src/main/res/menu/issue.xml +++ b/app/src/main/res/menu/issue.xml @@ -1,10 +1,11 @@ - + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..19d8c72 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + #607d8b + #455a64 + #263238 + @color/md_blue_grey_500 + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..ee3a6cc --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e33f142..ec26864 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' + classpath 'com.android.tools.build:gradle:0.14.1' } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64..0087cd3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 853c179..47b8ce3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jul 01 17:54:02 CEST 2014 +#Sat Nov 22 19:19:57 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755