Merge branch 'master' of https://github.com/cbeyls/fosdem-companion-a…

…ndroid # Conflicts: # README.md # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/at/linuxtage/companion/activities/EventDetailsActivity.java # app/src/main/java/at/linuxtage/companion/activities/MainActivity.java # app/src/main/java/at/linuxtage/companion/activities/RoomImageDialogActivity.java # app/src/main/java/at/linuxtage/companion/activities/SettingsActivity.java # app/src/main/java/at/linuxtage/companion/adapters/BookmarksAdapter.java # app/src/main/java/at/linuxtage/companion/adapters/EventsAdapter.java # app/src/main/java/at/linuxtage/companion/api/GLTApi.java # app/src/main/java/at/linuxtage/companion/db/DatabaseManager.java # app/src/main/java/at/linuxtage/companion/fragments/EventDetailsFragment.java # app/src/main/java/at/linuxtage/companion/fragments/MapFragment.java # app/src/main/java/at/linuxtage/companion/fragments/TracksFragment.java # app/src/main/java/at/linuxtage/companion/loaders/BookmarkStatusLoader.java # app/src/main/java/at/linuxtage/companion/loaders/GlobalCacheLoader.java # app/src/main/java/at/linuxtage/companion/loaders/LocalCacheLoader.java # app/src/main/java/at/linuxtage/companion/model/Day.java # app/src/main/java/at/linuxtage/companion/receivers/AlarmReceiver.java # app/src/main/java/at/linuxtage/companion/utils/NfcReceiverUtils.java # app/src/main/java/at/linuxtage/companion/utils/NfcSenderUtils.java # app/src/main/java/at/linuxtage/companion/utils/TwoStatePreferenceCompat.java # app/src/main/java/be/digitalia/fosdem/api/FosdemUrls.java # app/src/main/res/drawable-hdpi-v11/ic_stat_fosdem.png # app/src/main/res/drawable-hdpi/ic_stat_fosdem.png # app/src/main/res/drawable-mdpi-v11/ic_stat_fosdem.png # app/src/main/res/drawable-mdpi/ic_stat_fosdem.png # app/src/main/res/drawable-xhdpi-v11/ic_stat_fosdem.png # app/src/main/res/drawable-xhdpi/ic_stat_fosdem.png # app/src/main/res/drawable-xxhdpi-v11/ic_stat_fosdem.png # app/src/main/res/drawable-xxhdpi/ic_stat_fosdem.png # app/src/main/res/layout/fragment_event_details.xml # app/src/main/res/layout/include_navigation_drawer.xml # app/src/main/res/values/strings.xml
linuxtage · Feb 14, 2018 · 462e128 · 462e128
2 parents 2051868 + 2f2f3e7
commit 462e128
Show file tree

Hide file tree

Showing 96 changed files with 1,880 additions and 1,521 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 
 # generated files
 build/
-manifest-merger-release-report.txt
+output.json
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -18,4 +18,3 @@ local.properties
 
 # Gradle cache
 .gradle
-
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 This is the schedule browser for the "[Grazer Linuxtage](https://linuxtage.at)" conference in Graz, Austria. 
 
 It's a fork of [FOSDEM companion](https://github.com/cbeyls/fosdem-companion-android) by [Christophe Beyls](https://github.com/cbeyls).
-
+ The code has been rewritten from scratch and the features have been extended. It is built on top of the latest Android support libraries in order to take advantage of the latest operating system features while preserving compatibility with older versions.
 You can install the app from the [Google Play Store](https://play.google.com/store/apps/details?id=at.linuxtage.companion) or directly from the [GLT website](https://linuxtage.at/downloads/app).
 
 Donations to Grazer Linuxtage are possible via Bitcoin: [1GLTBBirbj8GZ8uY1gwovZ1QEMjfWu3rWT](bitcoin:1GLTBBirbj8GZ8uY1gwovZ1QEMjfWu3rWT)

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "at.linuxtage.companion"
-        minSdkVersion 9
-        targetSdkVersion 25
-        versionCode 700144
-        versionName "1.4.4"
+        minSdkVersion 15
+        targetSdkVersion 27
+        versionCode 1500150
+        versionName "1.5.0"
         // Supported languages
         resConfigs "en"
         vectorDrawables.useSupportLibrary = true
@@ -22,19 +22,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    aaptOptions {
-        cruncherEnabled false
-    }
 }
 
 ext {
-    supportLibraryVersion = '23.4.0'
+    supportLibraryVersion = '27.0.2'
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:$supportLibraryVersion"
-    compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
-    compile "com.android.support:cardview-v7:$supportLibraryVersion"
-    compile 'com.github.chrisbanes.photoview:library:1.2.4'
+    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
+    implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
+    implementation "com.android.support:cardview-v7:$supportLibraryVersion"
+    implementation "com.android.support:customtabs:$supportLibraryVersion"
+    implementation 'android.arch.lifecycle:extensions:1.1.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,9 +8,13 @@
     <uses-permission android:name="android.permission.NFC"/>
 
     <!-- Permissions required for alarms -->
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission
+        android:name="android.permission.WAKE_LOCK"
+        android:maxSdkVersion="25"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission
+        android:name="android.permission.VIBRATE"
+        android:maxSdkVersion="18"/>
 
     <!-- Make touch screen optional since all screens can be used with a pad -->
     <uses-feature
@@ -20,19 +24,20 @@
     <application
         android:name=".GLTApplication"
         android:allowBackup="true"
-        android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name="at.linuxtage.companion.activities.MainActivity"
+            android:name=".activities.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar.WindowDrawsSystemBarBackgrounds">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value=".activities.SearchResultActivity"/>
@@ -41,17 +46,20 @@
                 android:resource="@xml/shortcuts"/>
         </activity>
         <activity
-            android:name="at.linuxtage.companion.activities.TrackScheduleActivity"
-            android:parentActivityName="at.linuxtage.companion.activities.MainActivity"
+            android:name=".activities.TrackScheduleActivity"
+            android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="at.linuxtage.companion.activities.MainActivity"/>
+                android:value=".activities.MainActivity"/>
         </activity>
-        <activity android:name="at.linuxtage.companion.activities.TrackScheduleEventActivity"/>
         <activity
-            android:name="at.linuxtage.companion.activities.EventDetailsActivity"
-            android:parentActivityName="at.linuxtage.companion.activities.TrackScheduleActivity">
+            android:name=".activities.TrackScheduleEventActivity"
+            android:label="@string/event_details"/>
+        <activity
+            android:name=".activities.EventDetailsActivity"
+            android:label="@string/event_details"
+            android:parentActivityName=".activities.TrackScheduleActivity">
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
 
@@ -61,13 +69,14 @@
             </intent-filter>
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="at.linuxtage.companion.activities.TrackScheduleActivity"/>
+                android:value=".activities.TrackScheduleActivity"/>
         </activity>
         <activity
-            android:name="at.linuxtage.companion.activities.PersonInfoActivity"
+            android:name=".activities.PersonInfoActivity"
             android:theme="@style/AppTheme.NoActionBar"/>
         <activity
-            android:name="at.linuxtage.companion.activities.SearchResultActivity"
+            android:name=".activities.SearchResultActivity"
+            android:label="@string/search_events"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH"/>
@@ -83,35 +92,41 @@
         </activity>
         <!-- Clearing the Task Affinity allows this dialog activity to be displayed without bringing to front the main application with it. -->
         <activity
-            android:name="at.linuxtage.companion.activities.RoomImageDialogActivity"
+            android:name=".activities.RoomImageDialogActivity"
             android:excludeFromRecents="true"
             android:taskAffinity=""
             android:theme="@style/AlertDialogTheme.NoActionBar"/>
         <activity
-            android:name="at.linuxtage.companion.activities.SettingsActivity"
-            android:label="@string/settings"/>
+            android:name=".activities.SettingsActivity"
+            android:label="@string/settings">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES"/>
+            </intent-filter>
+        </activity>
 
         <receiver
-            android:name="at.linuxtage.companion.receivers.AlarmReceiver"
+            android:name=".receivers.AlarmReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
 
         <service
-            android:name="at.linuxtage.companion.services.AlarmIntentService"
-            android:exported="false"/>
+            android:name=".services.AlarmIntentService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE"/>
 
         <provider
-            android:name="at.linuxtage.companion.providers.SearchSuggestionProvider"
+            android:name=".providers.SearchSuggestionProvider"
             android:authorities="${applicationId}.search"
             android:exported="true"/>
         <provider
-            android:name="at.linuxtage.companion.providers.BookmarksExportProvider"
+            android:name=".providers.BookmarksExportProvider"
             android:authorities="${applicationId}.bookmarks"
             android:exported="false"
             android:grantUriPermissions="true"/>
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/android/support/v4/app/SafeLoadersUtils.java b/app/src/main/java/android/support/v4/app/SafeLoadersUtils.java
@@ -0,0 +1,18 @@
+package android.support.v4.app;
+
+/**
+ * Contains utility method to prevent Loaders from being forcefully retained during a configuration change.
+ * Forceful retain currently causes all stopped Loaders to briefly start, causing unexpected issues for detached fragments.
+ * This restores the Loaders behavior of support libraries < 24.0.0 for fragments.
+ *
+ * @author Christophe Beyls
+ * @see <a href="https://issuetracker.google.com/issues/37916599">Bug report</a>
+ */
+public class SafeLoadersUtils {
+
+	public static void onRetainCustomNonConfigurationInstance(FragmentActivity activity) {
+		// All loaders are already stopped or retained at that point, but calling this method again
+		// sets a flag to prevent them from being forcefully retained during the next phase
+		activity.mFragments.doLoaderStop(false);
+	}
+}
diff --git a/app/src/main/java/android/support/v7/widget/DividerItemDecoration.java b/app/src/main/java/android/support/v7/widget/DividerItemDecoration.java