From 8dc3fe130fe89ae9ccef21e8911e13b8b9748b9b Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Tue, 27 Jan 2015 16:22:35 +0100 Subject: [PATCH] Input type changed to number in some Tag Editor fields --- .../provider/AlbumJSONStore.java | 20 +++++++++---------- .../provider/ArtistJSONStore.java | 20 +++++++++---------- .../ViewPagerTabArtistBioFragment.java | 4 ++-- .../res/layout/activity_album_tag_editor.xml | 1 + .../res/layout/activity_song_tag_editor.xml | 2 ++ 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/materialmusic/provider/AlbumJSONStore.java b/app/src/main/java/com/kabouzeid/materialmusic/provider/AlbumJSONStore.java index fc0179ae..52750c36 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/provider/AlbumJSONStore.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/provider/AlbumJSONStore.java @@ -25,12 +25,6 @@ public class AlbumJSONStore extends SQLiteOpenHelper { public static void deleteDatabase(final Context context) { context.deleteDatabase(DATABASE_NAME); - } @Override - public void onCreate(final SQLiteDatabase db) { - db.execSQL("CREATE TABLE IF NOT EXISTS " + AlbumJSONColumns.NAME + - " (" + AlbumJSONColumns.ALBUMANDARTIST_NAME + " TEXT NOT NULL," + - AlbumJSONColumns.JSON + " TEXT NOT NULL);" - ); } public void addAlbumJSON(final String albumAndArtistName, final String JSON) { @@ -49,6 +43,12 @@ public class AlbumJSONStore extends SQLiteOpenHelper { database.insert(AlbumJSONColumns.NAME, null, values); database.setTransactionSuccessful(); database.endTransaction(); + } @Override + public void onCreate(final SQLiteDatabase db) { + db.execSQL("CREATE TABLE IF NOT EXISTS " + AlbumJSONColumns.NAME + + " (" + AlbumJSONColumns.ALBUMANDARTIST_NAME + " TEXT NOT NULL," + + AlbumJSONColumns.JSON + " TEXT NOT NULL);" + ); } public String getAlbumJSON(final String albumAndArtistName) { @@ -76,10 +76,6 @@ public class AlbumJSONStore extends SQLiteOpenHelper { cursor.close(); } return null; - } @Override - public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) { - db.execSQL("DROP TABLE IF EXISTS " + AlbumJSONColumns.NAME); - onCreate(db); } public void removeItem(final String albumAndArtistName) { @@ -94,6 +90,10 @@ public class AlbumJSONStore extends SQLiteOpenHelper { public static final String NAME = "AlbumJSON"; public static final String ALBUMANDARTIST_NAME = "AlbumAndArtistName"; public static final String JSON = "JSON"; + } @Override + public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) { + db.execSQL("DROP TABLE IF EXISTS " + AlbumJSONColumns.NAME); + onCreate(db); } diff --git a/app/src/main/java/com/kabouzeid/materialmusic/provider/ArtistJSONStore.java b/app/src/main/java/com/kabouzeid/materialmusic/provider/ArtistJSONStore.java index f5247846..d5f74185 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/provider/ArtistJSONStore.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/provider/ArtistJSONStore.java @@ -25,12 +25,6 @@ public class ArtistJSONStore extends SQLiteOpenHelper { public static void deleteDatabase(final Context context) { context.deleteDatabase(DATABASE_NAME); - } @Override - public void onCreate(final SQLiteDatabase db) { - db.execSQL("CREATE TABLE IF NOT EXISTS " + ArtistJSONColumns.NAME + - " (" + ArtistJSONColumns.ARTIST_NAME + " TEXT NOT NULL," + - ArtistJSONColumns.JSON + " TEXT NOT NULL);" - ); } public void addArtistJSON(final String artistName, final String JSON) { @@ -49,6 +43,12 @@ public class ArtistJSONStore extends SQLiteOpenHelper { database.insert(ArtistJSONColumns.NAME, null, values); database.setTransactionSuccessful(); database.endTransaction(); + } @Override + public void onCreate(final SQLiteDatabase db) { + db.execSQL("CREATE TABLE IF NOT EXISTS " + ArtistJSONColumns.NAME + + " (" + ArtistJSONColumns.ARTIST_NAME + " TEXT NOT NULL," + + ArtistJSONColumns.JSON + " TEXT NOT NULL);" + ); } public String getArtistJSON(final String artistName) { @@ -76,10 +76,6 @@ public class ArtistJSONStore extends SQLiteOpenHelper { cursor.close(); } return null; - } @Override - public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) { - db.execSQL("DROP TABLE IF EXISTS " + ArtistJSONColumns.NAME); - onCreate(db); } public void removeItem(final String artistName) { @@ -94,6 +90,10 @@ public class ArtistJSONStore extends SQLiteOpenHelper { public static final String NAME = "ArtistJSON"; public static final String ARTIST_NAME = "ArtistName"; public static final String JSON = "JSON"; + } @Override + public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) { + db.execSQL("DROP TABLE IF EXISTS " + ArtistJSONColumns.NAME); + onCreate(db); } diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java index 95f9cb25..bc09ef85 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java @@ -35,8 +35,8 @@ public class ViewPagerTabArtistBioFragment extends AbsViewPagerTabArtistListFrag try { biography = getResources().getString(R.string.biography_unavailable); } catch (IllegalStateException e) { - Log.e(TAG, "error while trying to get ressources", e); - biography = "Errorm"; + Log.e(TAG, "error while trying to access resources", e); + biography = "Error"; } } strings.clear(); diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml index 18d0a5af..8d6859a5 100644 --- a/app/src/main/res/layout/activity_album_tag_editor.xml +++ b/app/src/main/res/layout/activity_album_tag_editor.xml @@ -130,6 +130,7 @@ android:fontFamily="sans-serif" android:gravity="center_vertical" android:hint="@string/year" + android:inputType="numberDecimal" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textColor="?attr/title_text_color"/> diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml index 9e4de559..2f076b1a 100644 --- a/app/src/main/res/layout/activity_song_tag_editor.xml +++ b/app/src/main/res/layout/activity_song_tag_editor.xml @@ -143,6 +143,7 @@ android:fontFamily="sans-serif" android:gravity="center_vertical" android:hint="@string/year" + android:inputType="numberDecimal" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textColor="?attr/title_text_color"/> @@ -169,6 +170,7 @@ android:fontFamily="sans-serif" android:gravity="center_vertical" android:hint="@string/track" + android:inputType="numberDecimal" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textColor="?attr/title_text_color"/>