hotfixes

vhaudiquet · Jul 28, 2018 · a60030f · a60030f
1 parent cbfc24c
commit a60030f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,12 +14,12 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher"
             android:supportsRtl="true"
-            android:theme="@style/AppTheme">
+            android:theme="@style/Blade.AppTheme">
         <activity
                 android:name=".ui.MainActivity"
                 android:label="@string/app_name"
                 android:launchMode="singleTop"
-                android:theme="@style/AppTheme.NoActionBar">
+                android:theme="@style/Blade.AppTheme.NoActionBar">
             <meta-data
                     android:name="android.app.searchable"
                     android:resource="@xml/searchable"/>
@@ -36,18 +36,18 @@
         <activity
                 android:name=".ui.PlayActivity"
                 android:label="@string/title_activity_play"
-                android:theme="@style/AppTheme.NoActionBar">
+                android:theme="@style/Blade.AppTheme.NoActionBar">
         </activity>
         <activity
                 android:name=".ui.settings.SettingsActivity"
                 android:label="@string/action_settings"
-                android:theme="@style/AppTheme">
+                android:theme="@style/Blade.AppTheme">
         </activity>
         <activity
                 android:name=".ui.settings.AboutActivity"
                 android:label="@string/about"
                 android:parentActivityName=".ui.settings.SettingsActivity"
-                android:theme="@style/AppTheme.NoActionBar">
+                android:theme="@style/Blade.AppTheme.NoActionBar">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="v.blade.ui.settings.SettingsActivity"/>
@@ -56,7 +56,7 @@
                 android:name=".ui.settings.SourcesActivity"
                 android:label="@string/sources"
                 android:parentActivityName=".ui.settings.SettingsActivity"
-                android:theme="@style/AppTheme.NoActionBar">
+                android:theme="@style/Blade.AppTheme.NoActionBar">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="v.blade.ui.settings.SettingsActivity"/>
@@ -84,15 +84,15 @@
                 android:name=".ui.TagEditorActivity"
                 android:label="@string/title_activity_tag_editor"
                 android:parentActivityName=".ui.MainActivity"
-                android:theme="@style/AppTheme.NoActionBar">
+                android:theme="@style/Blade.AppTheme.NoActionBar">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="v.blade.ui.MainActivity"/>
         </activity>
         <activity android:name=".ui.settings.ThemesActivity"
                   android:label="@string/themes"
                   android:parentActivityName=".ui.settings.SettingsActivity"
-                  android:theme="@style/AppTheme.NoActionBar">
+                  android:theme="@style/Blade.AppTheme.NoActionBar">
             <meta-data android:name="android.support.PARENT_ACTIVITY"
                        android:value=".ui.settings.SettingsActivity"/>
         </activity>

diff --git a/app/src/main/java/v/blade/ui/TagEditorActivity.java b/app/src/main/java/v/blade/ui/TagEditorActivity.java
@@ -124,7 +124,7 @@ else if(currentObject instanceof Artist)
                 File basicFile = new File(currentSong.getPath());
                 AudioFile currentFile = AudioFileIO.read(basicFile);
 
-                Tag currentTag = currentFile.getTag();
+                Tag currentTag = currentFile.getTagOrCreateAndSetDefault();
                 if(nameEdit.isEnabled()) currentTag.setField(FieldKey.TITLE, nameEdit.getText().toString());
                 if(albumEdit.isEnabled()) currentTag.setField(FieldKey.ALBUM, albumEdit.getText().toString());
                 if(artistEdit.isEnabled()) currentTag.setField(FieldKey.ARTIST, artistEdit.getText().toString());

diff --git a/app/src/main/java/v/blade/ui/settings/AboutActivity.java b/app/src/main/java/v/blade/ui/settings/AboutActivity.java
@@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState)
         try
         {
             PackageInfo packageInfo = this.getPackageManager().getPackageInfo(getPackageName(), 0);
-            version.setText("Version " + packageInfo.versionName + " Nightly " + packageInfo.versionCode);
+            version.setText("Version " + packageInfo.versionName);
         }
         catch(Exception e){}