Skip to content

Commit

Permalink
Merge pull request #15 from xtonousou/dev
Browse files Browse the repository at this point in the history 
Fixed #14, added version info in AboutActivity.
  • Loading branch information
@xtonousou
xtonousou authored Dec 28, 2017
2 parents 1aa044a + 8b17112 commit b48909a
Show file tree
Hide file tree
Showing 65 changed files with 1,293 additions and 994 deletions.
Binary file modified .gradle/4.1/fileHashes/fileHashes.bin
View file
Binary file not shown.
Binary file modified .gradle/4.1/fileHashes/fileHashes.lock
View file
Binary file not shown.
Binary file modified .gradle/4.1/javaCompile/classAnalysis.bin
View file
Binary file not shown.
Binary file modified .gradle/4.1/javaCompile/javaCompile.lock
View file
Binary file not shown.
Binary file modified .gradle/4.1/javaCompile/taskHistory.bin
View file
Binary file not shown.
Binary file modified .gradle/4.1/taskHistory/fileSnapshots.bin
View file
Binary file not shown.
Binary file modified .gradle/4.1/taskHistory/taskHistory.bin
View file
Binary file not shown.
Binary file modified .gradle/4.1/taskHistory/taskHistory.lock
View file
Binary file not shown.
448 changes: 302 additions & 146 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {
defaultConfig {
minSdkVersion 21
targetSdkVersion 27
versionCode 7
versionCode 8
versionName "Cartwheel Galaxy"
applicationId "io.github.xtonousou.soundboardx"
}
Expand Down Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation 'com.android.support:support-annotations:27.0.2'
implementation 'com.android.support:design:27.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
// Bus events
// Bus Events
implementation 'org.greenrobot:eventbus:3.1.1'
// About
implementation 'com.github.medyo:android-about-page:1.2.2'
Expand Down
2 changes: 1 addition & 1 deletion ...build/generated/source/buildConfig/debug/io/github/xtonousou/soundboardx/BuildConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "io.github.xtonousou.soundboardx";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 7;
public static final int VERSION_CODE = 8;
public static final String VERSION_NAME = "Cartwheel Galaxy";
}
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/compat/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/coreui/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/coreutils/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
20 changes: 10 additions & 10 deletions app/build/generated/source/r/debug/android/support/design/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,16 +995,16 @@ public static final class string {
public static final int abc_shareactionprovider_share_with = 0x7f0f001a;
public static final int abc_shareactionprovider_share_with_application = 0x7f0f001b;
public static final int abc_toolbar_collapse_description = 0x7f0f001c;
public static final int appbar_scrolling_view_behavior = 0x7f0f002d;
public static final int bottom_sheet_behavior = 0x7f0f0031;
public static final int character_counter_pattern = 0x7f0f0033;
public static final int password_toggle_content_description = 0x7f0f0087;
public static final int path_password_eye = 0x7f0f0088;
public static final int path_password_eye_mask_strike_through = 0x7f0f0089;
public static final int path_password_eye_mask_visible = 0x7f0f008a;
public static final int path_password_strike_through = 0x7f0f008b;
public static final int search_menu_title = 0x7f0f0093;
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int appbar_scrolling_view_behavior = 0x7f0f002f;
public static final int bottom_sheet_behavior = 0x7f0f0033;
public static final int character_counter_pattern = 0x7f0f0035;
public static final int password_toggle_content_description = 0x7f0f0089;
public static final int path_password_eye = 0x7f0f008a;
public static final int path_password_eye_mask_strike_through = 0x7f0f008b;
public static final int path_password_eye_mask_visible = 0x7f0f008c;
public static final int path_password_strike_through = 0x7f0f008d;
public static final int search_menu_title = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f100001;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/fragment/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/graphics/drawable/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/graphics/drawable/animated/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/mediacompat/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/transition/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/v4/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
4 changes: 2 additions & 2 deletions app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -755,8 +755,8 @@ public static final class string {
public static final int abc_shareactionprovider_share_with = 0x7f0f001a;
public static final int abc_shareactionprovider_share_with_application = 0x7f0f001b;
public static final int abc_toolbar_collapse_description = 0x7f0f001c;
public static final int search_menu_title = 0x7f0f0093;
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int search_menu_title = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f100001;
Expand Down
2 changes: 1 addition & 1 deletion app/build/generated/source/r/debug/android/support/v7/recyclerview/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static final class layout {
public static final int notification_template_part_time = 0x7f0b0050;
}
public static final class string {
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int TextAppearance_Compat_Notification = 0x7f10012b;
Expand Down
28 changes: 14 additions & 14 deletions app/build/generated/source/r/debug/com/mikepenz/fastadapter/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -773,20 +773,20 @@ public static final class string {
public static final int abc_shareactionprovider_share_with = 0x7f0f001a;
public static final int abc_shareactionprovider_share_with_application = 0x7f0f001b;
public static final int abc_toolbar_collapse_description = 0x7f0f001c;
public static final int define_fastadapter = 0x7f0f003c;
public static final int library_fastadapter_author = 0x7f0f0058;
public static final int library_fastadapter_authorWebsite = 0x7f0f0059;
public static final int library_fastadapter_isOpenSource = 0x7f0f005a;
public static final int library_fastadapter_libraryDescription = 0x7f0f005b;
public static final int library_fastadapter_libraryName = 0x7f0f005c;
public static final int library_fastadapter_libraryVersion = 0x7f0f005d;
public static final int library_fastadapter_libraryWebsite = 0x7f0f005e;
public static final int library_fastadapter_licenseId = 0x7f0f005f;
public static final int library_fastadapter_owner = 0x7f0f0060;
public static final int library_fastadapter_repositoryLink = 0x7f0f0061;
public static final int library_fastadapter_year = 0x7f0f0062;
public static final int search_menu_title = 0x7f0f0093;
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int define_fastadapter = 0x7f0f003e;
public static final int library_fastadapter_author = 0x7f0f005a;
public static final int library_fastadapter_authorWebsite = 0x7f0f005b;
public static final int library_fastadapter_isOpenSource = 0x7f0f005c;
public static final int library_fastadapter_libraryDescription = 0x7f0f005d;
public static final int library_fastadapter_libraryName = 0x7f0f005e;
public static final int library_fastadapter_libraryVersion = 0x7f0f005f;
public static final int library_fastadapter_libraryWebsite = 0x7f0f0060;
public static final int library_fastadapter_licenseId = 0x7f0f0061;
public static final int library_fastadapter_owner = 0x7f0f0062;
public static final int library_fastadapter_repositoryLink = 0x7f0f0063;
public static final int library_fastadapter_year = 0x7f0f0064;
public static final int search_menu_title = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f100001;
Expand Down
28 changes: 14 additions & 14 deletions app/build/generated/source/r/debug/com/mikepenz/fastadapter/expandable/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -772,20 +772,20 @@ public static final class string {
public static final int abc_shareactionprovider_share_with = 0x7f0f001a;
public static final int abc_shareactionprovider_share_with_application = 0x7f0f001b;
public static final int abc_toolbar_collapse_description = 0x7f0f001c;
public static final int define_fastadapter = 0x7f0f003c;
public static final int library_fastadapter_author = 0x7f0f0058;
public static final int library_fastadapter_authorWebsite = 0x7f0f0059;
public static final int library_fastadapter_isOpenSource = 0x7f0f005a;
public static final int library_fastadapter_libraryDescription = 0x7f0f005b;
public static final int library_fastadapter_libraryName = 0x7f0f005c;
public static final int library_fastadapter_libraryVersion = 0x7f0f005d;
public static final int library_fastadapter_libraryWebsite = 0x7f0f005e;
public static final int library_fastadapter_licenseId = 0x7f0f005f;
public static final int library_fastadapter_owner = 0x7f0f0060;
public static final int library_fastadapter_repositoryLink = 0x7f0f0061;
public static final int library_fastadapter_year = 0x7f0f0062;
public static final int search_menu_title = 0x7f0f0093;
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int define_fastadapter = 0x7f0f003e;
public static final int library_fastadapter_author = 0x7f0f005a;
public static final int library_fastadapter_authorWebsite = 0x7f0f005b;
public static final int library_fastadapter_isOpenSource = 0x7f0f005c;
public static final int library_fastadapter_libraryDescription = 0x7f0f005d;
public static final int library_fastadapter_libraryName = 0x7f0f005e;
public static final int library_fastadapter_libraryVersion = 0x7f0f005f;
public static final int library_fastadapter_libraryWebsite = 0x7f0f0060;
public static final int library_fastadapter_licenseId = 0x7f0f0061;
public static final int library_fastadapter_owner = 0x7f0f0062;
public static final int library_fastadapter_repositoryLink = 0x7f0f0063;
public static final int library_fastadapter_year = 0x7f0f0064;
public static final int search_menu_title = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f100001;
Expand Down
52 changes: 26 additions & 26 deletions app/build/generated/source/r/debug/com/mikepenz/fontawesome_typeface_library/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,32 +768,32 @@ public static final class string {
public static final int abc_shareactionprovider_share_with = 0x7f0f001a;
public static final int abc_shareactionprovider_share_with_application = 0x7f0f001b;
public static final int abc_toolbar_collapse_description = 0x7f0f001c;
public static final int define_AndroidIconics = 0x7f0f003a;
public static final int define_FontAwesome = 0x7f0f003b;
public static final int define_font_fontawesome = 0x7f0f003d;
public static final int library_AndroidIconics_author = 0x7f0f0043;
public static final int library_AndroidIconics_authorWebsite = 0x7f0f0044;
public static final int library_AndroidIconics_isOpenSource = 0x7f0f0045;
public static final int library_AndroidIconics_libraryDescription = 0x7f0f0046;
public static final int library_AndroidIconics_libraryName = 0x7f0f0047;
public static final int library_AndroidIconics_libraryVersion = 0x7f0f0048;
public static final int library_AndroidIconics_libraryWebsite = 0x7f0f0049;
public static final int library_AndroidIconics_licenseId = 0x7f0f004a;
public static final int library_AndroidIconics_owner = 0x7f0f004b;
public static final int library_AndroidIconics_repositoryLink = 0x7f0f004c;
public static final int library_AndroidIconics_year = 0x7f0f004d;
public static final int library_FontAwesome_author = 0x7f0f004e;
public static final int library_FontAwesome_authorWebsite = 0x7f0f004f;
public static final int library_FontAwesome_isOpenSource = 0x7f0f0050;
public static final int library_FontAwesome_libraryDescription = 0x7f0f0051;
public static final int library_FontAwesome_libraryName = 0x7f0f0052;
public static final int library_FontAwesome_libraryVersion = 0x7f0f0053;
public static final int library_FontAwesome_libraryWebsite = 0x7f0f0054;
public static final int library_FontAwesome_licenseId = 0x7f0f0055;
public static final int library_FontAwesome_repositoryLink = 0x7f0f0056;
public static final int library_FontAwesome_year = 0x7f0f0057;
public static final int search_menu_title = 0x7f0f0093;
public static final int status_bar_notification_info_overflow = 0x7f0f0095;
public static final int define_AndroidIconics = 0x7f0f003c;
public static final int define_FontAwesome = 0x7f0f003d;
public static final int define_font_fontawesome = 0x7f0f003f;
public static final int library_AndroidIconics_author = 0x7f0f0045;
public static final int library_AndroidIconics_authorWebsite = 0x7f0f0046;
public static final int library_AndroidIconics_isOpenSource = 0x7f0f0047;
public static final int library_AndroidIconics_libraryDescription = 0x7f0f0048;
public static final int library_AndroidIconics_libraryName = 0x7f0f0049;
public static final int library_AndroidIconics_libraryVersion = 0x7f0f004a;
public static final int library_AndroidIconics_libraryWebsite = 0x7f0f004b;
public static final int library_AndroidIconics_licenseId = 0x7f0f004c;
public static final int library_AndroidIconics_owner = 0x7f0f004d;
public static final int library_AndroidIconics_repositoryLink = 0x7f0f004e;
public static final int library_AndroidIconics_year = 0x7f0f004f;
public static final int library_FontAwesome_author = 0x7f0f0050;
public static final int library_FontAwesome_authorWebsite = 0x7f0f0051;
public static final int library_FontAwesome_isOpenSource = 0x7f0f0052;
public static final int library_FontAwesome_libraryDescription = 0x7f0f0053;
public static final int library_FontAwesome_libraryName = 0x7f0f0054;
public static final int library_FontAwesome_libraryVersion = 0x7f0f0055;
public static final int library_FontAwesome_libraryWebsite = 0x7f0f0056;
public static final int library_FontAwesome_licenseId = 0x7f0f0057;
public static final int library_FontAwesome_repositoryLink = 0x7f0f0058;
public static final int library_FontAwesome_year = 0x7f0f0059;
public static final int search_menu_title = 0x7f0f0095;
public static final int status_bar_notification_info_overflow = 0x7f0f0097;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f100001;
Expand Down
Loading

0 comments on commit b48909a

Please sign in to comment.