Merge pull request #297 from ZeusWPI/updates2019

Various updates
ZeusWPI · Sep 18, 2019 · aea5707 · aea5707
2 parents 21336cb + a7993da
commit aea5707
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 37 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -92,19 +92,19 @@ dependencies {
 
     implementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation 'androidx.core:core:1.0.2'
-    implementation 'androidx.media:media:1.0.1'
-    implementation 'androidx.fragment:fragment:1.0.0'
+    implementation 'androidx.core:core:1.1.0'
+    implementation 'androidx.media:media:1.1.0'
+    implementation 'androidx.fragment:fragment:1.1.0'
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'androidx.slice:slice-builders:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
-    testImplementation 'androidx.arch.core:core-testing:2.0.1'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.1.0'
+    testImplementation 'androidx.arch.core:core-testing:2.1.0'
 
     implementation 'androidx.room:room-runtime:2.1.0'
     annotationProcessor 'androidx.room:room-compiler:2.1.0'
@@ -122,14 +122,14 @@ dependencies {
     implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
 
     // Use our own fork, since it seems the original library is abandoned.
-    implementation 'com.github.niknetniko:material-intro:1624'
+    implementation 'com.heinrichreimersoftware:material-intro:2.0.0'
     implementation 'com.jonathanfinerty.once:once:1.2.2'
     implementation 'com.github.captain-miao:optroundcardview:1.1.0'
     implementation 'blue.aodev:material-values:1.1.1'
 
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
-    implementation 'com.google.firebase:firebase-core:17.0.0'
+    implementation 'com.google.firebase:firebase-core:17.2.0'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
 
     if (props.getProperty("hydra.debug.leaks").toBoolean()) {

diff --git a/app/src/main/java/be/ugent/zeus/hydra/association/event/list/EventFragment.java b/app/src/main/java/be/ugent/zeus/hydra/association/event/list/EventFragment.java
@@ -80,13 +80,13 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     private void onError(Throwable throwable) {
         Log.e(TAG, "Error while getting data.", throwable);
-        Snackbar.make(requireView(this), getString(R.string.error_network), Snackbar.LENGTH_LONG)
+        Snackbar.make(requireView(), getString(R.string.error_network), Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.action_again), v -> viewModel.onRefresh())
                 .show();
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.menu_main_events, menu);
         requireBaseActivity(this).tintToolbarIcons(menu, R.id.action_refresh);
@@ -106,4 +106,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/association/news/list/NewsFragment.java b/app/src/main/java/be/ugent/zeus/hydra/association/news/list/NewsFragment.java
@@ -88,7 +88,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     private void onError(Throwable throwable) {
         Log.e(TAG, "Error while getting data.", throwable);
-        Snackbar.make(requireView(this), getString(R.string.error_network), Snackbar.LENGTH_LONG)
+        Snackbar.make(requireView(), getString(R.string.error_network), Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.action_again), v -> viewModel.onRefresh())
                 .show();
     }
@@ -104,4 +104,4 @@ public void onStop() {
         super.onStop();
         helper.unbindCustomTabsService(getActivity());
     }
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/feed/HomeFeedFragment.java b/app/src/main/java/be/ugent/zeus/hydra/feed/HomeFeedFragment.java
@@ -165,7 +165,7 @@ private void onError(Throwable throwable) {
         if (snackbar != null) {
             snackbar.dismiss();
         }
-        snackbar = Snackbar.make(requireView(this), getString(R.string.feed_general_error), Snackbar.LENGTH_LONG)
+        snackbar = Snackbar.make(requireView(), getString(R.string.feed_general_error), Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.action_again), v -> onRefresh());
         snackbar.show();
     }
@@ -197,4 +197,4 @@ private void onCommandExecuted(CommandResult result) {
             snackbar.show();
         }
     }
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/info/InfoFragment.java b/app/src/main/java/be/ugent/zeus/hydra/info/InfoFragment.java
@@ -84,6 +84,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     private void onError(Throwable throwable) {
         Log.e(TAG, "Error while getting data.", throwable);
-        Snackbar.make(requireView(this), getString(R.string.error_network), Snackbar.LENGTH_LONG).show();
+        Snackbar.make(requireView(), getString(R.string.error_network), Snackbar.LENGTH_LONG).show();
     }
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/info/InfoType.java b/app/src/main/java/be/ugent/zeus/hydra/info/InfoType.java
@@ -105,7 +105,7 @@ public void doOnClick(Context context, ActivityHelper helper, InfoItem infoItem)
     public Drawable getDrawable(Context context, @ColorRes int color) {
 
         //If there is no drawable, return null.
-        if(drawable == NO_DRAWABLE) {
+        if (drawable == NO_DRAWABLE) {
             return null;
         }
 
@@ -119,4 +119,4 @@ public Drawable getDrawable(Context context, @ColorRes int color) {
      * @param infoItem The item.
      */
     public abstract void doOnClick(Context context, ActivityHelper helper, InfoItem infoItem);
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/library/list/LibraryListFragment.java b/app/src/main/java/be/ugent/zeus/hydra/library/list/LibraryListFragment.java
@@ -97,7 +97,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     private void onError(Throwable throwable) {
         Log.e(TAG, "Error while getting data.", throwable);
-        Snackbar.make(requireView(this), getString(R.string.error_network), Snackbar.LENGTH_LONG)
+        Snackbar.make(requireView(), getString(R.string.error_network), Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.action_again), v -> viewModel.onRefresh())
                 .show();
     }
@@ -109,4 +109,4 @@ public void onStop() {
             adapter.clearObservers();
         }
     }
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/resto/SingleDayFragment.java b/app/src/main/java/be/ugent/zeus/hydra/resto/SingleDayFragment.java
@@ -41,7 +41,7 @@ public static SingleDayFragment newInstance(RestoMenu menu) {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        data = requireArguments(this).getParcelable(ARG_DATA_MENU);
+        data = requireArguments().getParcelable(ARG_DATA_MENU);
     }
 
     @Override
@@ -96,4 +96,4 @@ public String getEventName() {
             return Reporting.getEvents().viewItem();
         }
     }
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/resto/extrafood/FoodFragment.java b/app/src/main/java/be/ugent/zeus/hydra/resto/extrafood/FoodFragment.java
@@ -55,7 +55,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         recyclerView.addItemDecoration(new DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL));
         recyclerView.setAdapter(adapter);
 
-        int position = requireArguments(this).getInt(ARG_POSITION);
+        int position = requireArguments().getInt(ARG_POSITION);
 
         viewModel = ViewModelProviders.of(requireActivity()).get(ExtraFoodViewModel.class);
         viewModel.getData().observe(this, PartialErrorObserver.with(this::onError));
@@ -75,8 +75,8 @@ protected void onEmpty() {
 
     private void onError(Throwable throwable) {
         Log.e(TAG, "Error while getting data.", throwable);
-        Snackbar.make(requireView(this), getString(R.string.error_network), Snackbar.LENGTH_LONG)
+        Snackbar.make(requireView(), getString(R.string.error_network), Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.action_again), v -> viewModel.onRefresh())
                 .show();
     }
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/resto/menu/RestoFragment.java b/app/src/main/java/be/ugent/zeus/hydra/resto/menu/RestoFragment.java
@@ -280,7 +280,7 @@ public void onNothingSelected(AdapterView<?> parent) {
     private void onError(Throwable throwable) {
         pageAdapter.setData(Collections.emptyList());
         Log.e(TAG, "Error while getting data.", throwable);
-        Snackbar.make(requireView(this), getString(R.string.error_network), Snackbar.LENGTH_LONG)
+        Snackbar.make(requireView(), getString(R.string.error_network), Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.action_again), v -> menuViewModel.onRefresh())
                 .show();
     }

diff --git a/app/src/main/java/be/ugent/zeus/hydra/schamper/list/SchamperFragment.java b/app/src/main/java/be/ugent/zeus/hydra/schamper/list/SchamperFragment.java
@@ -92,7 +92,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     private void onError(Throwable throwable) {
         Log.e(TAG, "Error while getting data.", throwable);
-        Snackbar.make(requireView(this), getString(R.string.error_network), Snackbar.LENGTH_LONG)
+        Snackbar.make(requireView(), getString(R.string.error_network), Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.action_again), v -> viewModel.onRefresh())
                 .show();
     }
@@ -108,4 +108,4 @@ public void onStop() {
         super.onStop();
         helper.unbindCustomTabsService(getActivity());
     }
-}
+}
diff --git a/app/src/main/java/be/ugent/zeus/hydra/sko/lineup/LineupFragment.java b/app/src/main/java/be/ugent/zeus/hydra/sko/lineup/LineupFragment.java
@@ -105,8 +105,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     private void onError(Throwable throwable) {
         Log.e(TAG, "Error while getting data.", throwable);
-        Snackbar.make(requireView(this), getString(R.string.error_network), Snackbar.LENGTH_LONG)
+        Snackbar.make(requireView(), getString(R.string.error_network), Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.action_again), v -> viewModel.onRefresh())
                 .show();
     }
-}
+}
diff --git a/app/src/main/res/drawable/info_ufora.xml b/app/src/main/res/drawable/info_ufora.xml
@@ -0,0 +1,18 @@
+<vector android:height="32dp"
+    android:viewportHeight="240"
+    android:viewportWidth="240"
+    android:width="32dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#000000"
+        android:pathData="m74.32,190.062c26.247,0 38.947,-12.277 38.947,-43.392L113.266,49.938L97.18,49.938v96.52c0,22.437 -7.197,29.422 -22.86,29.422 -15.663,0 -22.86,-6.985 -22.86,-29.422v-96.52L35.373,49.938L35.373,146.67c0,31.538 12.488,43.392 38.947,43.392z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="0.26458332" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#000000"
+        android:pathData="m145.572,187.522h16.087v-63.923h34.502L196.16,109.84h-34.502v-46.143h42.968v-13.758h-59.055z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="0.26458332" />
+</vector>
diff --git a/build.gradle b/build.gradle
@@ -7,11 +7,12 @@ buildscript {
         // For Fabric (Firebase Crashlytics)
         maven { url 'https://maven.fabric.io/public' }
         // For the license plugin
+        mavenCentral()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.google.gms:google-services:4.3.2'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.9.5'
         classpath 'io.fabric.tools:gradle:1.27.1'
     }
@@ -21,15 +22,15 @@ allprojects {
     repositories {
         // Google libraries
         google()
-        // Some custom libraries
-        maven { url 'https://jitpack.io' }
         // Other libraries
         mavenCentral()
         // Fallback for libraries not in Maven
         jcenter()
+        // Some custom libraries
+        maven { url 'https://jitpack.io' }
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}