Update gradle build

- use commons-csv 1.7 - update resource usage - add donation links
fr3ts0n · Sep 14, 2019 · be7c6ab · be7c6ab
1 parent 3ccdb45
commit be7c6ab
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 17 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -87,15 +87,37 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/home/erwin/src/j/StageFever/app/libs/commons-csv-1.4.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.4.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:25.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:25.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:25.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:25.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:25.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:25.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-csv:1.7@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,19 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 28
     buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.fr3ts0n.stagefever"
         minSdkVersion 15
-        targetSdkVersion 25
-        versionName = 'V1.1.0'
-        versionCode = 10100
+        targetSdkVersion 28
+        versionName = 'V1.2.0'
+        versionCode = 10200
+    }
+
+    applicationVariants.all { variant ->
+        variant.resValue "string", "app_version", variant.versionName
     }
 
     buildTypes {
@@ -21,6 +25,6 @@ android {
 }
 
 dependencies {
-    api 'com.android.support:support-v4:25.4.0'
-    implementation files('libs/commons-csv-1.4.jar')
+    api 'com.android.support:support-v4:28.0.0'
+    implementation 'org.apache.commons:commons-csv:1.7'
 }
diff --git a/app/libs/commons-csv-1.4.jar b/app/libs/commons-csv-1.4.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.Holo" >
         <provider
@@ -47,7 +47,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 			<intent-filter
-				android:icon='@drawable/ic_launcher'
+				android:icon='@mipmap/ic_launcher'
 				android:label='CSV SongList'>
 				<category android:name="android.intent.category.DEFAULT"/>
 			    <category android:name="android.intent.category.BROWSABLE"/>

diff --git a/...n/res/drawable-xxhdpi/drawer_shadow.9.png → ...src/main/res/drawable/drawer_shadow.9.png b/...n/res/drawable-xxhdpi/drawer_shadow.9.png → ...src/main/res/drawable/drawer_shadow.9.png
diff --git a/...in/res/drawable-xxhdpi/ic_action_load.png → app/src/main/res/drawable/ic_action_load.png b/...in/res/drawable-xxhdpi/ic_action_load.png → app/src/main/res/drawable/ic_action_load.png
diff --git a/app/src/main/res/drawable/ic_coin.xml b/app/src/main/res/drawable/ic_coin.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+    <path
+        android:fillColor="#A0FFFFFF"
+        android:pathData="M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4M11,17V16H9V14H13V13H10A1,1 0 0,1 9,12V9A1,1 0 0,1 10,8H11V7H13V8H15V10H11V11H14A1,1 0 0,1 15,12V15A1,1 0 0,1 14,16H13V17H11Z"/>
+</vector>
diff --git a/...rc/main/res/drawable-xxhdpi/ic_drawer.png → app/src/main/res/drawable/ic_drawer.png b/...rc/main/res/drawable-xxhdpi/ic_drawer.png → app/src/main/res/drawable/ic_drawer.png
diff --git a/.../main/res/drawable-xxhdpi/ic_launcher.png → app/src/main/res/mipmap/ic_launcher.png b/.../main/res/drawable-xxhdpi/ic_launcher.png → app/src/main/res/mipmap/ic_launcher.png
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -23,5 +23,9 @@
     <string name="metronome_description">Metronom am unteren Bildschirmrand anzeigen / verstecken</string>
     <string name="csv_import">CSV Import</string>
     <string name="display">Anzeige</string>
+    <string name="release_history">Versionen …</string>
+    <string name="donation">Projekt unterstützen …</string>
+    <string name="csv_field_delimiter_sum">CSV Trenzeichen zwischen Datenfeldern</string>
+    <string name="csv_field_delimiter">CSV Feld-Trennzeichen</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,6 +2,10 @@
 <resources>
 
     <string name="app_name" translatable="false">StageFever</string>
+    <string name="copyright_fr3ts0n" translatable="false">Copyright © by fr3ts0n</string>
+    <string name="url_app_mainpage" translatable="false">https://github.com/fr3ts0n/StageFever</string>
+    <string name="url_app_releases" translatable="false">https://github.com/fr3ts0n/StageFever/releases</string>
+    <string name="donation">Support project …</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="action_settings">Settings</string>
@@ -28,5 +32,6 @@
     <string name="display">Display</string>
     <string name="csv_field_delimiter_sum">Delimiter char between CSV fields</string>
     <string name="csv_field_delimiter">CSV field delimiter</string>
+    <string name="release_history">Release History …</string>
 
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -20,6 +20,53 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <PreferenceScreen
+        android:icon="@mipmap/ic_launcher"
+        android:summary="@string/app_version"
+        android:title="@string/app_name"
+        >
+        <Preference
+            android:icon="@android:drawable/ic_menu_info_details"
+            android:title="@string/app_name"
+            android:summary="@string/copyright_fr3ts0n"
+            >
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="@string/url_app_mainpage"/>
+        </Preference>
+        <Preference
+            android:icon="@android:drawable/ic_menu_info_details"
+            android:summary="@string/app_version"
+            android:title="@string/release_history"
+            >
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="@string/url_app_releases"/>
+        </Preference>
+
+        <PreferenceCategory
+            android:title="@string/donation">
+            <Preference
+                android:icon="@drawable/ic_coin"
+                android:key="paypal"
+                android:title="PayPal.me"
+                >
+                <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://PayPal.me/fr3ts0n"/>
+            </Preference>
+            <Preference
+                android:icon="@drawable/ic_coin"
+                android:key="bitcoin"
+                android:title="Bitcoin"
+                >
+                <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="bitcoin:19UApzsc5eDJ5VNDNYCA1bpszPnkcpWeFP"/>
+            </Preference>
+        </PreferenceCategory>
+    </PreferenceScreen>
+
     <PreferenceCategory
         android:title="@string/display">
 
@@ -48,4 +95,5 @@
             android:title="@string/csv_field_delimiter"/>
     </PreferenceCategory>
 
+
 </PreferenceScreen>