Author: Adam Pioterek <adam.pioterek@protonmail.ch>
DayNight
.idea/misc.xml | 2 .travis.yml | 3 app/build.gradle | 20 +- app/src/main/java/ml/adamsprogs/bimba/MainActivity.kt | 3 app/src/main/res/drawable/logo.xml | 79 +++--------- app/src/main/res/values-night/colors.xml | 2 app/src/main/res/values-night/styles.xml | 9 - | 2 app/src/main/res/values-notnight/styles.xml | 12 - app/src/main/res/values/styles.xml | 12 +
diff --git a/.idea/misc.xml b/.idea/misc.xml index 635999df1e86791ad3787e455b4524e4d8879b93..ba7052b8197ddf8ba8756022d905d03055c7ad60 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ </value> </option> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/.travis.yml b/.travis.yml index 731bd41f90cdd05a1a701176d61838c293ee5af2..11c7d19ec62053693595e5cbae536762f008e19f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,4 @@ install: - yes | $ANDROID_HOME/tools/bin/sdkmanager "tools" - yes | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" -licenses: - - 'android-sdk-license-.+' - script: ./gradlew build || (cat /home/travis/build/apiote/Bimba/app/build/reports/lint-results.html; false) diff --git a/app/build.gradle b/app/build.gradle index d77bfea55b0a41f0bd10089160b9177dcf8d85f7..2e2714592b81c6dd2bcf67f13bd73d83b1068430 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,18 +22,18 @@ } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:cardview-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.android.support:support-vector-drawable:25.3.1' - testCompile 'junit:junit:4.12' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - compile 'com.github.arimorty:floatingsearchview:2.1.1' + implementation 'com.android.support:appcompat-v7:25.3.1' + implementation 'com.android.support:cardview-v7:25.3.1' + implementation 'com.android.support:design:25.3.1' + implementation 'com.android.support:support-vector-drawable:25.3.1' + testImplementation 'junit:junit:4.12' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation 'com.github.arimorty:floatingsearchview:2.1.1' } repositories { maven { diff --git a/app/src/main/java/ml/adamsprogs/bimba/MainActivity.kt b/app/src/main/java/ml/adamsprogs/bimba/MainActivity.kt index 40075d65bc0b76db5a03373c5c3f2541da95c6fa..5972bef099e393a09cc67cde36e9118006ecb40a 100644 --- a/app/src/main/java/ml/adamsprogs/bimba/MainActivity.kt +++ b/app/src/main/java/ml/adamsprogs/bimba/MainActivity.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.os.Parcel import android.os.Parcelable import android.support.v7.app.AppCompatActivity +import android.support.v7.app.AppCompatDelegate import android.text.Html import android.widget.Toast import com.arlib.floatingsearchview.FloatingSearchView @@ -17,6 +18,8 @@ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO) + val context = this as Context val stops = listOf(Suggestion("Kołłątaja\n610 -> Dębiec"), Suggestion("Dębiecka\n610 -> Górczyn")) //todo get from db diff --git a/app/src/main/res/drawable/logo.xml b/app/src/main/res/drawable/logo.xml index 235d29e4958f2c5944427f6f3b288c1f2d4e280b..b6e67b51959159b1bd4c38e9dab4cd2e2b568ab8 100644 --- a/app/src/main/res/drawable/logo.xml +++ b/app/src/main/res/drawable/logo.xml @@ -1,55 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="512dp" - android:height="512dp" - android:viewportWidth="512" - android:viewportHeight="512"> - - <group - android:translateY="215"> - <path - android:fillColor="#00ff00" - android:strokeColor="#ffffff" - android:strokeAlpha="0.15463915" - android:strokeWidth="0.30951566" - android:pathData="M 0.15475783 -214.84525 H 511.84524783 V 296.84524 H 0.15475783 V -214.84525 Z" /> - <path - android:fillColor="#ffff00" - android:strokeColor="#ffffff" - android:strokeAlpha="0.15463915" - android:strokeWidth="0.26458332" - android:pathData="M 264.58334 -195.880935 C 286.293391181 -195.880935 303.892865 -178.281461181 303.892865 -156.57141 C 303.892865 -134.861358819 286.293391181 -117.261885 264.58334 -117.261885 C 242.873288819 -117.261885 225.273815 -134.861358819 225.273815 -156.57141 C 225.273815 -178.281461181 242.873288819 -195.880935 264.58334 -195.880935 Z" /> - <path - android:fillColor="#ffff00" - android:strokeColor="#ffffff" - android:strokeAlpha="0.15463915" - android:strokeWidth="0.26458332" - android:pathData="M 258.53571 216.869064 C 276.905753434 216.869064 291.797616 231.760926566 291.797616 250.13097 C 291.797616 268.501013434 276.905753434 283.392876 258.53571 283.392876 C 240.165666566 283.392876 225.273804 268.501013434 225.273804 250.13097 C 225.273804 231.760926566 240.165666566 216.869064 258.53571 216.869064 Z" /> - <path - android:fillColor="#ffff00" - android:strokeColor="#ffffff" - android:strokeAlpha="0.15463915" - android:strokeWidth="0.26458332" - android:pathData="M 2.4384184 66.288048 H 19.0693714 V 350.526148 H 2.4384184 V 66.288048 Z" /> - <path - android:fillColor="#ffff00" - android:strokeColor="#ffffff" - android:strokeAlpha="0.15463915" - android:strokeWidth="0.26458332" - android:pathData="M 66.288048 -286.67651 H 82.919001 V -2.43841 H 66.288048 V -286.67651 Z" /> - <group> - <path - android:fillColor="#ffff00" - android:strokeColor="#ffffff" - android:strokeAlpha="0.15463915" - android:strokeWidth="0.26458332" - android:pathData="M 143.47235 236.35587 H 160.103303 V 520.59397 H 143.47235 V 236.35587 Z" /> - <path - android:fillColor="#ffff00" - android:strokeColor="#ffffff" - android:strokeAlpha="0.15463915" - android:strokeWidth="0.26458332" - android:pathData="M 236.35587 -427.71045 H 252.986823 V -143.47235 H 236.35587 V -427.71045 Z" /> - </group> - </group> -</vector> \ No newline at end of file +<vector android:height="24dp" android:viewportHeight="512.0" + android:viewportWidth="512.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillAlpha="1" android:fillColor="#17ff00" + android:pathData="M0.1,0.1h511.7v511.7h-511.7z" + android:strokeAlpha="0" android:strokeColor="#ffffff" android:strokeWidth="0.26262632"/> + <path android:fillAlpha="1" android:fillColor="#ffff00" + android:pathData="M257.1,53.7m-40.6,0a40.6,40.6 49.3,1 1,81.3 0a40.6,40.6 49.3,1 1,-81.3 0" + android:strokeAlpha="0" android:strokeColor="#ffffff" android:strokeWidth="0.26458332"/> + <path android:fillAlpha="1" android:fillColor="#ffff00" + android:pathData="M262.9,450.9m-40.6,0a40.6,40.6 105.4,1 1,81.3 0a40.6,40.6 0,1 1,-81.3 0" + android:strokeAlpha="0" android:strokeColor="#ffffff" android:strokeWidth="0.26458332"/> + <path android:fillAlpha="1" android:fillColor="#ffff00" + android:pathData="M47.4,256.3l14.2,-14.2l211.1,211.1l-14.2,14.2z" + android:strokeAlpha="0" android:strokeColor="#ffffff" android:strokeWidth="0.08697488"/> + <path android:fillAlpha="1" android:fillColor="#ffff00" + android:pathData="M258.5,45.1l14.2,14.2l-211.1,211.1l-14.2,-14.2z" + android:strokeAlpha="0" android:strokeColor="#ffffff" android:strokeWidth="0.08697488"/> + <path android:fillAlpha="1" android:fillColor="#ffff00" + android:pathData="M469.6,256.3l-14.2,14.2l-211.1,-211.1l14.2,-14.2z" + android:strokeAlpha="0" android:strokeColor="#ffffff" android:strokeWidth="0.08697488"/> + <path android:fillAlpha="1" android:fillColor="#ffff00" + android:pathData="M258.5,467.4l-14.2,-14.2l211.1,-211.1l14.2,14.2z" + android:strokeAlpha="0" android:strokeColor="#ffffff" android:strokeWidth="0.08697488"/> +</vector> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..cb09b5ec1dcf85902afbcd9184086909c71f0d34 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="colorPrimary">#3F51B5</color> + <color name="colorPrimaryDark">#303F9F</color> + <color name="colorAccent">#FF4081</color> +</resources> \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000000000000000000000000000000000000..ea2446c6caecb1a1d773a10eded21d0081c93c9f --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + +<!-- Base application theme. --> +<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar"> + <!-- Customize your theme here. --> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <item name="colorAccent">@color/colorAccent</item> +</style> + +</resources> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml deleted file mode 100644 index a6b3daec9354f9ae75cdf8d94a67446c6227dd96..0000000000000000000000000000000000000000 --- a/app/src/main/res/values-night/colors.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources></resources> \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml deleted file mode 100644 index cf79209801eec4a7fa1c0f8fe8b75478f187f057..0000000000000000000000000000000000000000 --- a/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="AppTheme" parent="Theme.AppCompat.NoActionBar"> - <!-- Customize your theme here. --> - <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> - <item name="colorAccent">@color/colorAccent</item> - </style> -</resources> \ No newline at end of file diff --git a/app/src/main/res/values-notnight/colors.xml b/app/src/main/res/values-notnight/colors.xml deleted file mode 100644 index 3ab3e9cbce07f7cdc941fc8ba424c05e83ed80f0..0000000000000000000000000000000000000000 --- a/app/src/main/res/values-notnight/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <color name="colorPrimary">#3F51B5</color> - <color name="colorPrimaryDark">#303F9F</color> - <color name="colorAccent">#FF4081</color> -</resources> diff --git a/app/src/main/res/values-notnight/styles.xml b/app/src/main/res/values-notnight/styles.xml deleted file mode 100644 index 01eb5f588d1855d7fc90b2f6ef8d8dc97c260303..0000000000000000000000000000000000000000 --- a/app/src/main/res/values-notnight/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <!-- Base application theme. --> - <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> - <!-- Customize your theme here. --> - <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> - <item name="colorAccent">@color/colorAccent</item> - </style> - -</resources>