From b20bcd5255f3cfcf6812d70cde6d8503fed68119 Mon Sep 17 00:00:00 2001
From: veyndan <veyndan89@gmail.com>
Date: Sun, 26 Feb 2017 00:54:13 +0000
Subject: [PATCH 1/2] Make the theme extend from the material theme instead of
 holo

---
 app/src/main/res/values-v14/styles.xml | 6 ------
 app/src/main/res/values-v9/styles.xml  | 5 -----
 app/src/main/res/values/styles.xml     | 2 ++
 3 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 app/src/main/res/values-v14/styles.xml
 delete mode 100644 app/src/main/res/values-v9/styles.xml

diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
deleted file mode 100644
index 28e27720c..000000000
--- a/app/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-
-    <style name="ProgressBar" parent="android:Widget.Holo.ProgressBar.Horizontal" />
-    <style name="AppTheme" parent="android:Theme.Holo" />
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v9/styles.xml b/app/src/main/res/values-v9/styles.xml
deleted file mode 100644
index 615082e9b..000000000
--- a/app/src/main/res/values-v9/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <style name="ProgressBar" parent="android:Widget.ProgressBar.Horizontal" />
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6b4aa3ad5..e8b6a3658 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,4 +19,6 @@
 
     <style name="NotificationProgress" parent="AppTheme" />
 
+    <style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
+
 </resources>
\ No newline at end of file

From 31a95822296101d82dfb687e9c55e0daef63b666 Mon Sep 17 00:00:00 2001
From: veyndan <veyndan89@gmail.com>
Date: Thu, 2 Mar 2017 15:08:41 +0000
Subject: [PATCH 2/2] Replace C style with Java style array declaration

---
 .../nrw/commons/contributions/ContributionsListFragment.java    | 2 +-
 .../java/fr/free/nrw/commons/upload/MultipleShareActivity.java  | 2 +-
 app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index a943218ba..cc0df0e2d 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -172,7 +172,7 @@ public class ContributionsListFragment extends Fragment {
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         switch (requestCode) {
             // 1 = Storage allowed when gallery selected
             case 1: {
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
index 3c9faff48..ef5d45541 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
@@ -108,7 +108,7 @@ public  class       MultipleShareActivity
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         if (requestCode == 1) {
             if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 multipleUploadBegins();
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index 897f2287e..483fa1228 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -324,7 +324,7 @@ public  class       ShareActivity
 
     @Override
     public void onRequestPermissionsResult(int requestCode,
-                                           String permissions[], int[] grantResults) {
+                                           String[] permissions, int[] grantResults) {
         switch (requestCode) {
             // 1 = Storage (from snackbar)
             case 1: {