Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into kotlin

Browse source
This commit is contained in:
Hemanth S 2018-11-28 13:26:22 +05:30 • committed by GitHub
commit 08f9539d3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 2537 additions and 8870 deletions
Download patch file Download diff file Expand all files Collapse all files

134
app/app.iml
View file

@ -8,16 +8,16 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="normalDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleNormalDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileNormalDebugSources" />
<option name="SELECTED_BUILD_VARIANT" value="sansDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleSansDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileSansDebugSources" />
<afterSyncTasks>
<task>generateNormalDebugSources</task>
<task>generateSansDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/sans/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
@ -45,67 +45,67 @@
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/build/intermediates/javac/normalDebug/compileNormalDebugJavaWithJavac/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/normalDebugUnitTest/compileNormalDebugUnitTestJavaWithJavac/classes" />
<output url="file://$MODULE_DIR$/build/intermediates/javac/sansDebug/compileSansDebugJavaWithJavac/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/sansDebugUnitTest/compileSansDebugUnitTestJavaWithJavac/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/normal/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/normalDebug/processNormalDebugResources/r" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/normal/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/normal/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/normal/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/normal/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/normal/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/normalDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/normalDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/normalDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/normalDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/normalDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/normalDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/normalDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/normal/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/normalDebugAndroidTest/processNormalDebugAndroidTestResources/r" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/normal/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/normal/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/normal/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/normal/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/normal/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/normal/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/normal/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/normal/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/normal/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/normal/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/normal/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/normal/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/normal/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormal/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormal/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormal/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormal/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormal/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormal/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testNormal/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/sans/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/sansDebug/processSansDebugResources/r" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/sans/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/sans/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/sans/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/sans/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/sans/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/sansDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/sansDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/sansDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/sansDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/sansDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/sansDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/sansDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/sans/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/sansDebugAndroidTest/processSansDebugAndroidTestResources/r" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/sans/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/sans/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/sans/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/sans/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/sans/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSansDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSansDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSansDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSansDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSansDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSansDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSansDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/sans/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testSansDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testSansDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testSansDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testSansDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testSansDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testSansDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testSansDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/sans/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/sans/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/sans/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/sans/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/sans/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/sans/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/sans/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSans/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSans/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSans/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSans/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSans/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSans/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestSans/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testSans/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testSans/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testSans/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testSans/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testSans/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testSans/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testSans/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@ -155,6 +155,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkNormalDebugClasspath" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@ -166,7 +167,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
@ -271,5 +272,8 @@
<orderEntry type="library" name="Gradle: androidx.print:print-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
<orderEntry type="module" module-name="appthemehelper" />
<orderEntry type="module" module-name="appthemehelper" />
<orderEntry type="module" module-name="appthemehelper" />
<orderEntry type="module" module-name="appthemehelper" />
</component>
</module>

15
app/build.gradle
View file

@ -102,7 +102,7 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.multidex:multidex:2.0.0'
implementation "androidx.fragment:fragment:$supportLibVersion"
implementation "androidx.appcompat:appcompat:1.0.2"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation "androidx.recyclerview:recyclerview:$supportLibVersion"
implementation "androidx.gridlayout:gridlayout:$supportLibVersion"
implementation "androidx.cardview:cardview:$supportLibVersion"
@ -112,18 +112,14 @@ dependencies {
implementation "androidx.legacy:legacy-support-v13:$supportLibVersion"
implementation "androidx.legacy:legacy-preference-v14:$supportLibVersion"
implementation "com.google.android.material:material:$supportLibVersion"
//For casting
implementation 'androidx.mediarouter:mediarouter:1.0.0'
implementation 'com.google.android.gms:play-services-cast-framework:16.1.0'
implementation "com.squareup.retrofit2:retrofit:2.4.0"
implementation "com.squareup.retrofit2:converter-gson:2.4.0"
implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0"
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
implementation "com.jakewharton:butterknife:$butterKnife"
annotationProcessor "com.jakewharton:butterknife-compiler:$butterKnife"
implementation "com.afollestad.material-dialogs:core:$materialDialog"
implementation "com.afollestad.material-dialogs:commons:$materialDialog"
implementation 'com.afollestad:material-cab:0.1.12'
@ -139,7 +135,6 @@ dependencies {
implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod'
implementation 'com.anjlab.android.iab.v3:library:1.0.44'
/*UI Library*/
implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
@ -149,8 +144,10 @@ dependencies {
implementation 'com.github.hannesa2:AndroidSlidingUpPanel:3.5.0'
implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
implementation 'org.nanohttpd:nanohttpd:2.3.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
mavenCentral()

4
app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.java
View file

@ -80,10 +80,10 @@ public abstract class AbsBaseActivity extends AbsThemeActivity {
}
@Override
/* @Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
}
}*/
@Nullable
protected String[] getPermissionsToRequest() {

BIN
app/src/main/res/font/.DS_Store vendored Normal file
View file

Binary file not shown.

BIN
app/src/main/res/font/circular_std_black.otf Executable file
View file

Binary file not shown.

BIN
app/src/main/res/font/circular_std_book.otf Executable file
View file

Binary file not shown.

11
app/src/main/res/font/font.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/circular_std_book"
android:fontStyle="normal"
android:fontWeight="400" />
<font
android:font="@font/circular_std_black"
android:fontStyle="normal"
android:fontWeight="700" />
</font-family>

1
app/src/main/res/values/styles.xml
View file

@ -55,6 +55,7 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="fontPath">@string/circular_std_black</item>
<item name="android:textStyle">bold</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center</item>
</style>

4
app/src/main/res/values/styles_parents.xml
View file

@ -26,6 +26,7 @@
<item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
<item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
<item name="android:fontFamily">@font/font</item>
</style>
<style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
@ -67,6 +68,7 @@
<item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
<item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
<item name="android:fontFamily">@font/font</item>
</style>
<style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
@ -109,12 +111,14 @@
<item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
<item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
<item name="android:fontFamily">@font/font</item>
</style>
<style name="Theme.RetroMusic.Base.Color" parent="@style/Theme.RetroMusic.Base">
<item name="colorPrimary">@color/md_deep_purple_A400</item>
<item name="android:colorPrimary">?colorPrimary</item>
<item name="android:windowBackground">?colorPrimary</item>
<item name="android:fontFamily">@font/font</item>
</style>

7
app/src/sans/res/font/font.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/product_sans_regular"
android:fontStyle="normal"
android:fontWeight="400" />
</font-family>

BIN
app/src/sans/res/font/product_sans_regular.ttf Normal file
View file

Binary file not shown.