From 34d5ad2e389e038587c35331de748c369bafe006 Mon Sep 17 00:00:00 2001 From: EDmitry Date: Tue, 27 Apr 2021 14:07:21 +0500 Subject: [PATCH 1/2] main menu v1 --- .idea/.name | 1 + app/src/main/AndroidManifest.xml | 3 +- app/src/main/assets/index.html | 22 +++ .../java/com/nibble/musspeed/MainActivity.kt | 34 ++++- .../res/drawable-v24/default_track_img.png | Bin 0 -> 6300 bytes app/src/main/res/drawable/btn_bg.xml | 9 ++ .../res/drawable/ic_baseline_pause_24.xml | 5 + .../drawable/ic_baseline_play_arrow_24.xml | 5 + .../res/drawable/ic_baseline_skip_next_24.xml | 5 + app/src/main/res/layout/activity_main.xml | 142 ++++++++++++++++-- app/src/main/res/values/colors.xml | 1 + build.gradle | 2 +- 12 files changed, 214 insertions(+), 15 deletions(-) create mode 100644 .idea/.name create mode 100644 app/src/main/assets/index.html create mode 100644 app/src/main/res/drawable-v24/default_track_img.png create mode 100644 app/src/main/res/drawable/btn_bg.xml create mode 100644 app/src/main/res/drawable/ic_baseline_pause_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_play_arrow_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_skip_next_24.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..64233a9 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +index.html \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 665aab3..b428aef 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - + - \ No newline at end of file diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html new file mode 100644 index 0000000..094f2da --- /dev/null +++ b/app/src/main/assets/index.html @@ -0,0 +1,22 @@ + + + + API карт 2ГИС + + + + +
+ + \ No newline at end of file diff --git a/app/src/main/java/com/nibble/musspeed/MainActivity.kt b/app/src/main/java/com/nibble/musspeed/MainActivity.kt index 0a89f53..5b232ed 100644 --- a/app/src/main/java/com/nibble/musspeed/MainActivity.kt +++ b/app/src/main/java/com/nibble/musspeed/MainActivity.kt @@ -1,10 +1,42 @@ package com.nibble.musspeed -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.webkit.WebView +import android.widget.ProgressBar +import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity + + class MainActivity : AppCompatActivity() { + + private lateinit var webView : WebView; + private var progress : Int? = 0 + private var progressBar: ProgressBar? = null + private var textViewProgressBar: TextView? = null + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + //2gis API + webView = findViewById(R.id.webView) + //webView.webViewClient = MyWebViewClient() + webView.settings.javaScriptEnabled = true + webView.loadUrl("file:///android_asset/index.html") + + //progressBar + progressBar = findViewById(R.id.path_progress_bar); + textViewProgressBar = findViewById(R.id.text_view_path_progress_bar); + } + private fun postProgress(progress: Int) { + val strProgress = "Вы прошли: $progress% пути" + progressBar?.progress = progress + if (progress == 0) { + progressBar?.secondaryProgress = 0 + } else { + progressBar?.secondaryProgress = progress + 5 + } + textViewProgressBar?.text = strProgress } } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/default_track_img.png b/app/src/main/res/drawable-v24/default_track_img.png new file mode 100644 index 0000000000000000000000000000000000000000..9a830e22c63431a5660c11882a9b6c4c09206814 GIT binary patch literal 6300 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 BhaUg{ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/btn_bg.xml b/app/src/main/res/drawable/btn_bg.xml new file mode 100644 index 0000000..13148ba --- /dev/null +++ b/app/src/main/res/drawable/btn_bg.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_pause_24.xml b/app/src/main/res/drawable/ic_baseline_pause_24.xml new file mode 100644 index 0000000..6daeb98 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_pause_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_play_arrow_24.xml b/app/src/main/res/drawable/ic_baseline_play_arrow_24.xml new file mode 100644 index 0000000..f2fd651 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_play_arrow_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_skip_next_24.xml b/app/src/main/res/drawable/ic_baseline_skip_next_24.xml new file mode 100644 index 0000000..39ee00d --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_skip_next_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4fc2444..1a3fd2a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,18 +1,138 @@ - + android:layout_height="wrap_content" + android:orientation="vertical"> - + + + + + + + + + + + + + android:layout_below="@+id/btn_start" + android:visibility="visible" > + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..ec3559a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,5 @@ #FF018786 #FF000000 #FFFFFFFF + #4CAF50 \ No newline at end of file diff --git a/build.gradle b/build.gradle index ef7bd27..a33d7ea 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath "com.android.tools.build:gradle:4.1.2" + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong From aa2b9df6817c38bab9f773c201ef3e2b82a2289c Mon Sep 17 00:00:00 2001 From: EDmitry Date: Thu, 29 Apr 2021 16:29:09 +0500 Subject: [PATCH 2/2] skelet --- .idea/.name | 1 - app/src/main/AndroidManifest.xml | 13 +- .../nibble/musspeed/BodySelectionActivity.kt | 51 ++++ .../java/com/nibble/musspeed/MainActivity.kt | 42 ---- .../nibble/musspeed/MusicSelectionActivity.kt | 50 ++++ .../com/nibble/musspeed/PathRunActivity.kt | 72 ++++++ .../nibble/musspeed/PathSelectionActivity.kt | 50 ++++ .../musspeed/WorkoutSelectionActivity.kt | 50 ++++ .../res/drawable-v24/default_track_img.png | Bin 6300 -> 0 bytes app/src/main/res/drawable/ic_body.xml | 5 + .../main/res/drawable/ic_body_inactive.xml | 6 + app/src/main/res/drawable/ic_map.xml | 7 + app/src/main/res/drawable/ic_map_inactive.xml | 8 + app/src/main/res/drawable/ic_music.xml | 11 + .../main/res/drawable/ic_music_inactive.xml | 6 + app/src/main/res/drawable/ic_run.xml | 7 + app/src/main/res/drawable/ic_run_inactive.xml | 8 + .../main/res/drawable/ic_workout_inactive.xml | 14 ++ .../res/layout/activity_body_selection.xml | 160 ++++++++++++ app/src/main/res/layout/activity_main.xml | 138 ----------- .../res/layout/activity_music_selection.xml | 87 +++++++ app/src/main/res/layout/activity_path_run.xml | 213 ++++++++++++++++ .../res/layout/activity_path_selection.xml | 85 +++++++ .../res/layout/activity_workout_selection.xml | 228 ++++++++++++++++++ app/src/main/res/values-night/themes.xml | 5 + app/src/main/res/values/attrs.xml | 6 + app/src/main/res/values/colors.xml | 5 + app/src/main/res/values/strings.xml | 5 + app/src/main/res/values/styles.xml | 11 + app/src/main/res/values/themes.xml | 11 + 30 files changed, 1173 insertions(+), 182 deletions(-) delete mode 100644 .idea/.name create mode 100644 app/src/main/java/com/nibble/musspeed/BodySelectionActivity.kt delete mode 100644 app/src/main/java/com/nibble/musspeed/MainActivity.kt create mode 100644 app/src/main/java/com/nibble/musspeed/MusicSelectionActivity.kt create mode 100644 app/src/main/java/com/nibble/musspeed/PathRunActivity.kt create mode 100644 app/src/main/java/com/nibble/musspeed/PathSelectionActivity.kt create mode 100644 app/src/main/java/com/nibble/musspeed/WorkoutSelectionActivity.kt delete mode 100644 app/src/main/res/drawable-v24/default_track_img.png create mode 100644 app/src/main/res/drawable/ic_body.xml create mode 100644 app/src/main/res/drawable/ic_body_inactive.xml create mode 100644 app/src/main/res/drawable/ic_map.xml create mode 100644 app/src/main/res/drawable/ic_map_inactive.xml create mode 100644 app/src/main/res/drawable/ic_music.xml create mode 100644 app/src/main/res/drawable/ic_music_inactive.xml create mode 100644 app/src/main/res/drawable/ic_run.xml create mode 100644 app/src/main/res/drawable/ic_run_inactive.xml create mode 100644 app/src/main/res/drawable/ic_workout_inactive.xml create mode 100644 app/src/main/res/layout/activity_body_selection.xml delete mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/activity_music_selection.xml create mode 100644 app/src/main/res/layout/activity_path_run.xml create mode 100644 app/src/main/res/layout/activity_path_selection.xml create mode 100644 app/src/main/res/layout/activity_workout_selection.xml create mode 100644 app/src/main/res/values/attrs.xml create mode 100644 app/src/main/res/values/styles.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 64233a9..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -index.html \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b428aef..281b6d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,9 @@ + + - + + + + + @@ -17,4 +27,5 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/nibble/musspeed/BodySelectionActivity.kt b/app/src/main/java/com/nibble/musspeed/BodySelectionActivity.kt new file mode 100644 index 0000000..e3ab3e2 --- /dev/null +++ b/app/src/main/java/com/nibble/musspeed/BodySelectionActivity.kt @@ -0,0 +1,51 @@ +package com.nibble.musspeed + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.view.View +import android.widget.ImageButton + +class BodySelectionActivity : AppCompatActivity() { + private lateinit var btnToRun : ImageButton + private lateinit var btnToMap : ImageButton + private lateinit var btnToBody : ImageButton + private lateinit var btnToMus : ImageButton + private lateinit var btnToWorkout : ImageButton + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_body_selection) + btnToRun = findViewById(R.id.to_path_run) + btnToRun.setOnClickListener { toRun() } + btnToMap = findViewById(R.id.to_path_selector) + btnToMap.setOnClickListener { toMap() } + btnToBody = findViewById(R.id.to_body_selector) + btnToBody.setOnClickListener { toBody() } + btnToMus = findViewById(R.id.to_music_selector) + btnToMus.setOnClickListener { toMus() } + btnToWorkout = findViewById(R.id.to_workout_selector) + btnToWorkout.setOnClickListener { toWorkout() } + } + + private fun toRun(){ + val intent = Intent(this, PathRunActivity::class.java) + startActivity(intent) + } + private fun toMap(){ + val intent = Intent(this, PathSelectionActivity::class.java) + startActivity(intent) + } + private fun toBody(){ + val intent = Intent(this, BodySelectionActivity::class.java) + startActivity(intent) + } + private fun toMus(){ + val intent = Intent(this, MusicSelectionActivity::class.java) + startActivity(intent) + } + private fun toWorkout(){ + val intent = Intent(this, WorkoutSelectionActivity::class.java) + startActivity(intent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nibble/musspeed/MainActivity.kt b/app/src/main/java/com/nibble/musspeed/MainActivity.kt deleted file mode 100644 index 5b232ed..0000000 --- a/app/src/main/java/com/nibble/musspeed/MainActivity.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.nibble.musspeed - -import android.os.Bundle -import android.webkit.WebView -import android.widget.ProgressBar -import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity - - -class MainActivity : AppCompatActivity() { - - private lateinit var webView : WebView; - private var progress : Int? = 0 - private var progressBar: ProgressBar? = null - private var textViewProgressBar: TextView? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - setContentView(R.layout.activity_main) - - //2gis API - webView = findViewById(R.id.webView) - //webView.webViewClient = MyWebViewClient() - webView.settings.javaScriptEnabled = true - webView.loadUrl("file:///android_asset/index.html") - - //progressBar - progressBar = findViewById(R.id.path_progress_bar); - textViewProgressBar = findViewById(R.id.text_view_path_progress_bar); - } - private fun postProgress(progress: Int) { - val strProgress = "Вы прошли: $progress% пути" - progressBar?.progress = progress - if (progress == 0) { - progressBar?.secondaryProgress = 0 - } else { - progressBar?.secondaryProgress = progress + 5 - } - textViewProgressBar?.text = strProgress - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nibble/musspeed/MusicSelectionActivity.kt b/app/src/main/java/com/nibble/musspeed/MusicSelectionActivity.kt new file mode 100644 index 0000000..381d9d8 --- /dev/null +++ b/app/src/main/java/com/nibble/musspeed/MusicSelectionActivity.kt @@ -0,0 +1,50 @@ +package com.nibble.musspeed + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.widget.ImageButton + +class MusicSelectionActivity : AppCompatActivity() { + private lateinit var btnToRun : ImageButton + private lateinit var btnToMap : ImageButton + private lateinit var btnToBody : ImageButton + private lateinit var btnToMus : ImageButton + private lateinit var btnToWorkout : ImageButton + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_music_selection) + btnToRun = findViewById(R.id.to_path_run) + btnToRun.setOnClickListener { toRun() } + btnToMap = findViewById(R.id.to_path_selector) + btnToMap.setOnClickListener { toMap() } + btnToBody = findViewById(R.id.to_body_selector) + btnToBody.setOnClickListener { toBody() } + btnToMus = findViewById(R.id.to_music_selector) + btnToMus.setOnClickListener { toMus() } + btnToWorkout = findViewById(R.id.to_workout_selector) + btnToWorkout.setOnClickListener { toWorkout() } + } + + private fun toRun(){ + val intent = Intent(this, PathRunActivity::class.java) + startActivity(intent) + } + private fun toMap(){ + val intent = Intent(this, PathSelectionActivity::class.java) + startActivity(intent) + } + private fun toBody(){ + val intent = Intent(this, BodySelectionActivity::class.java) + startActivity(intent) + } + private fun toMus(){ + val intent = Intent(this, MusicSelectionActivity::class.java) + startActivity(intent) + } + private fun toWorkout(){ + val intent = Intent(this, WorkoutSelectionActivity::class.java) + startActivity(intent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nibble/musspeed/PathRunActivity.kt b/app/src/main/java/com/nibble/musspeed/PathRunActivity.kt new file mode 100644 index 0000000..5219e19 --- /dev/null +++ b/app/src/main/java/com/nibble/musspeed/PathRunActivity.kt @@ -0,0 +1,72 @@ +package com.nibble.musspeed + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.webkit.WebView +import android.widget.ImageButton +import android.widget.ProgressBar +import android.widget.TextView + +class PathRunActivity : AppCompatActivity() { + private lateinit var btnToRun : ImageButton + private lateinit var btnToMap : ImageButton + private lateinit var btnToBody : ImageButton + private lateinit var btnToMus : ImageButton + private lateinit var btnToWorkout : ImageButton + private lateinit var webView : WebView; + private var progress : Int? = 0 + private var progressBar: ProgressBar? = null + private var textViewProgressBar: TextView? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_path_run) + btnToRun = findViewById(R.id.to_path_run) + btnToRun.setOnClickListener { toRun() } + btnToMap = findViewById(R.id.to_path_selector) + btnToMap.setOnClickListener { toMap() } + btnToBody = findViewById(R.id.to_body_selector) + btnToBody.setOnClickListener { toBody() } + btnToMus = findViewById(R.id.to_music_selector) + btnToMus.setOnClickListener { toMus() } + btnToWorkout = findViewById(R.id.to_workout_selector) + btnToWorkout.setOnClickListener { toWorkout() } + webView = findViewById(R.id.webView) + webView.settings.javaScriptEnabled = true + webView.loadUrl("file:///android_asset/index.html") + progressBar = findViewById(R.id.path_progress_bar); + textViewProgressBar = findViewById(R.id.text_view_path_progress_bar); + } + + private fun postProgress(progress: Int) { + val strProgress = "Вы прошли: $progress% пути" + progressBar?.progress = progress + if (progress == 0) { + progressBar?.secondaryProgress = 0 + } else { + progressBar?.secondaryProgress = progress + 5 + } + textViewProgressBar?.text = strProgress + } + private fun toRun(){ + val intent = Intent(this, PathRunActivity::class.java) + startActivity(intent) + } + private fun toMap(){ + val intent = Intent(this, PathSelectionActivity::class.java) + startActivity(intent) + } + private fun toBody(){ + val intent = Intent(this, BodySelectionActivity::class.java) + startActivity(intent) + } + private fun toMus(){ + val intent = Intent(this, MusicSelectionActivity::class.java) + startActivity(intent) + } + private fun toWorkout(){ + val intent = Intent(this, WorkoutSelectionActivity::class.java) + startActivity(intent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nibble/musspeed/PathSelectionActivity.kt b/app/src/main/java/com/nibble/musspeed/PathSelectionActivity.kt new file mode 100644 index 0000000..6325aa9 --- /dev/null +++ b/app/src/main/java/com/nibble/musspeed/PathSelectionActivity.kt @@ -0,0 +1,50 @@ +package com.nibble.musspeed + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.widget.ImageButton + +class PathSelectionActivity : AppCompatActivity() { + private lateinit var btnToRun : ImageButton + private lateinit var btnToMap : ImageButton + private lateinit var btnToBody : ImageButton + private lateinit var btnToMus : ImageButton + private lateinit var btnToWorkout : ImageButton + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_path_selection) + btnToRun = findViewById(R.id.to_path_run) + btnToRun.setOnClickListener { toRun() } + btnToMap = findViewById(R.id.to_path_selector) + btnToMap.setOnClickListener { toMap() } + btnToBody = findViewById(R.id.to_body_selector) + btnToBody.setOnClickListener { toBody() } + btnToMus = findViewById(R.id.to_music_selector) + btnToMus.setOnClickListener { toMus() } + btnToWorkout = findViewById(R.id.to_workout_selector) + btnToWorkout.setOnClickListener { toWorkout() } + } + + private fun toRun(){ + val intent = Intent(this, PathRunActivity::class.java) + startActivity(intent) + } + private fun toMap(){ + val intent = Intent(this, PathSelectionActivity::class.java) + startActivity(intent) + } + private fun toBody(){ + val intent = Intent(this, BodySelectionActivity::class.java) + startActivity(intent) + } + private fun toMus(){ + val intent = Intent(this, MusicSelectionActivity::class.java) + startActivity(intent) + } + private fun toWorkout(){ + val intent = Intent(this, WorkoutSelectionActivity::class.java) + startActivity(intent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nibble/musspeed/WorkoutSelectionActivity.kt b/app/src/main/java/com/nibble/musspeed/WorkoutSelectionActivity.kt new file mode 100644 index 0000000..709a3ad --- /dev/null +++ b/app/src/main/java/com/nibble/musspeed/WorkoutSelectionActivity.kt @@ -0,0 +1,50 @@ +package com.nibble.musspeed + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.widget.ImageButton + +class WorkoutSelectionActivity : AppCompatActivity() { + private lateinit var btnToRun : ImageButton + private lateinit var btnToMap : ImageButton + private lateinit var btnToBody : ImageButton + private lateinit var btnToMus : ImageButton + private lateinit var btnToWorkout : ImageButton + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_workout_selection) + btnToRun = findViewById(R.id.to_path_run) + btnToRun.setOnClickListener { toRun() } + btnToMap = findViewById(R.id.to_path_selector) + btnToMap.setOnClickListener { toMap() } + btnToBody = findViewById(R.id.to_body_selector) + btnToBody.setOnClickListener { toBody() } + btnToMus = findViewById(R.id.to_music_selector) + btnToMus.setOnClickListener { toMus() } + btnToWorkout = findViewById(R.id.to_workout_selector) + btnToWorkout.setOnClickListener { toWorkout() } + } + + private fun toRun(){ + val intent = Intent(this, PathRunActivity::class.java) + startActivity(intent) + } + private fun toMap(){ + val intent = Intent(this, PathSelectionActivity::class.java) + startActivity(intent) + } + private fun toBody(){ + val intent = Intent(this, BodySelectionActivity::class.java) + startActivity(intent) + } + private fun toMus(){ + val intent = Intent(this, MusicSelectionActivity::class.java) + startActivity(intent) + } + private fun toWorkout(){ + val intent = Intent(this, WorkoutSelectionActivity::class.java) + startActivity(intent) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/default_track_img.png b/app/src/main/res/drawable-v24/default_track_img.png deleted file mode 100644 index 9a830e22c63431a5660c11882a9b6c4c09206814..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6300 zcmai3dpJ~U+h?4|DLF;dRvAr6YfNYyJIS^UcBaUAp{B;EttoOSW`shtOSMK}x2ut& z)Q}j5nQT;+rWz@Pt+LwAX&gfMo_Y86UDx-%-}S!lAG18qvz~R|_jBLB-|ua+jGF5n7%gcj;g8I%Y z{~#l?!r67#_Pr;%MtXXVYV((;hn#&VvMQ&A^X^EcR-0OYi$# z55{MLZf6*@6+J=MA`7S8k~ffhX5eY<`c}__+-_@jr~8TZo}qIZ=&2pNVv+-^)9vw> zVp3KvJiXi^%c+3#NQrmlOB)aIfrsEzXW-c7^@(~+b^7LhDO+kXE8l%VMX$oRtyU<*LYJ$phHLz7w z&J5L`RgzkL4!#4=X;2N&4=Pj+I_ZE|BGV>6hAy6)LL==m#kNSHV6PCZ$I%qYN7jOy zroii9B6JWMefNT0a-P!?t4B>kC+{kA@!Tjup3wZDJdMklDp8f^%5&XIRJihVqK_8! z61~Hk6$s;-2KDmCi5|o7n4n!)3T`XX7mg`$HMrwz5ksW1pl(wHo0!6Rt3_2o-|sGv z4tjT~c)~xy)}kbBp^mV$!3=VShWVInN(q~BOT${2Cz$MdO#p)tJNfFieT%_@8 z21UpUs(aj*LS%OatwlB;{?1f8;NX`SAZz=7hXl@ni2r2@&CU^vo1YP9ChD-C}6rE*THr}{K2NR4Wy;}T8kXTIazBSgfNT}ltp|nl5RZYYcN@h9EWETo?W6` z2AX$Zy1x>ris#Jp)RGj+>eJ6G$~A^LnvK@Oi=ShEPnmt#o!K?;OCn?nef~wBro<~# z#nI$>fhBk@p56;+5pNhRg<->PV5IE*E@+=6?-Pj)5K&VBjCZxG;Apbqp4$2-P)pyg zTj!+C-#%}c^Gr>^I8PpZzwn_#nSQco7vPCR8Su?Ig_z1``ceV?59%Y^93@iU*N5W zJFr$tAgQs>fcodqYhAvObH1-9kj61#p0I)$byHEId7AQ2m3qC9lCidlVT|g61^7e9 zAyx1Z-`J-K_~|7Qj*= z@C6oMEYlvTo%x44mZbW|{;iyPP#WZ0P@LMCBZs3YFr^y183K?H3v`~m|685oJy2b~ z;J^^4>^IjK!+#Otf9^`ufU2hrasI99|9#`3>WF9h?wI@!TmJq20JEQ2Ktmjz;(yY8 z5ZyA~3giF*(MLF=`k>s898M^Lz(cAey>M)s6U4MVy6q?U5N&5Q4 z0@6i)L9BckKcpCZEL8#Zyc6grN0VdTF8IL)2wuj^EkIg~!mnIL_X;EP6@c8BoT7wF z$y@VAo|lZ8R6diF&V&9TUtBgo?6oaGT-90_ezB}6U(xr)ac)z;XPynwqexCtNI-hR zIwr6^+UO$5Gaudnr$cQDEC5V~ltvpu6#?$Q1+*jsI0CuU5vYwv<*NZ!Np6GSuw{!r zR_b62nAfg^r*kNqOk;rWyBI@S$C|r`7L&jA28Z}-@dZIj%%OI}jq2;5kMBzqXgCQ! zdKr*L?>5mE-Ueh!B8u&8Q-$kSVfHKKfi_eie@K`4q&7_(s8+X@8K7cFOtA`m90@Uu zk@Ds~fdpI?YZbGIEQAnF`2lUJCYSjw1zZpgSwT zvhEFYW}bZMI2Q=7K^|}k8`bwh;>wl4KqK2~n=LXZ161L)I)I(6tqJ)cBt8y!&fLG) zzE2g7Wf{ba+J%v$=F;gaEon;3enlYEmVoe@X@M|q3Z*3ZtoLYzEx;Kk;4#>q3_wFo z5tx((r=JL0;9wl^*&Jv}z3l&o|55h zL`^y@UTUsxj8j2hKoR;+Pi0qU!m;U{_eSTd>JmG{jXpnt%q88-v__+KM`btZO13?< z|MS!0k%1YKeCF8J3D>T8-@5RLJ%Leig%`{d-8zo&U1zWSnxl%HIdp6FDLeJyD!4f# zzT#E)E5_qnIPwnEIee)rSp186KmQs!W8wt9n(v3H~y<3@&T|l z|39Jrm*{;Jb~{}B&w@{hiOjTjc~c;dCby_n?eJQcRxRYp42q>;i_~0 ziS~+oY~Pviz@;*IvIg~1v}2tF;~!)(vU$U>gw;N{7n$+GXjy%P9!z&>Ra?pXD|p5^IQ;6X&qpqpp4n&@Fl^`n?fk=h-pA)r zOA*e=@bH4aLR^~){RCoqYbj8WbmZpfrm%^fGk7pEcjoJ6S^wPdOQ>9o1F$sx|q?|gA^~o=iJI-mN(2Mo6=1#*2BTPs7M2lm6p-Bp5 z+#qU*|9s4SBJo&L0m}0bsQsz)y4JAgTNdfA*VERYSd@8UmBYF*KTB(xmI#5M%@ zIhvL?>@^nUHl40AErl`S!J_mLBa`Ndn(RTmJ9Nl4&1T$Pv#tnfN{%QN zTpQ5Iyz18NHf~0rT>w)Xi8p8a$BwQ*ZBM08W{EmGi-w{@exVknQYMJEmF)DmO3W_W zdUN;qB2D^tWT^j8OsnS#q0uCw=`xcJ?>^`2=cmb)rv_%9%vPe|=<%MR_Q)D&r5n^D zxb|p-D}Ep3{lLh=>)NXIg!p+NN_O;pX0kMSZr3+eGaB2#kZW-SGDem|$HPa>6JU+i z`%cx$D5D5z%HQhxa;gf#;jN+?AZM-MpM(K3{wXr_ZHTX3$#OuBi{a`x;OZ@Nh($S! z+9R~42g8xB(bzS!9We=l+kJ|D6-wB5q~vN`p)%6we5q=DLY5p$y;RLHTS%bd#hblARIsL(CAcdH!t{65&Z zQSEw)YfQo!;>eqkpCD(LP%VM+LKOE(j+rv0OhG~+@y{J=!A5sa9kk1CT)o8RSTWxT zby7HXn%re*d!p1Bo2bMySWF?xkeP~9B4Se3AEvv%0Xbdab>_pd1|(jUyNnt*mZ;2C zL)YCt7z|Hmaz5u16?j7jg?TK_>B@9X)bW7@l0uZ_jY)?X4u}^-Yq6r?xi!Zts3Zg& z6R9@CkLj7h$U{e2L|FG-fodrTeD1?-Ce#EIdQ*rBWI37|H^>fjF*s9bA7ClWUJb@H zumWk+zM!AS=ImGH>Y!*UQBl$y52e9Fm9jK7`j}9Mhewt63vO;b=}Q&nr5b!vr3-7# zds##!vJy>$D=it-2qfU{oIYX+9XZT73XKc$QaLMuH$U+6PW6Qj!W|c@1$ivjR$z_V zSN(%3qEozC7?28#RDp;p;O88f%R0e9{+~oK&7s5&_}1(GpuGS09^4$_jO26 zYP@A{{#NK5PO`T>?!hr0T-Y4Y!eRsq?9XvrURy4ubjp%*BDg0NK|-9s&5B>M>8pkI z#%qNY{*b4OCV=5WDR8V1voJjsF6}5u>F!M{9)0KiLp4`+?U!X{e>k=dSw*EF zm;oxDAZVcB(W?M%%lg00@qa$R6we(z|V!><>(oYbL1opS#I8CMiu-M zgY(D$WfQMooie17Hc3o>&8F-Palao1-Up6Ufb1KR(^UeeRlr(LfkIJzL>PE`;<^d) z*o-T1ra@bm8N?5%QC8g6tpMW8n$QG}dT;=81C90&|Br5Es0hp*e9pKG$DXz653A7y zK)QR7@H^@L;WF2$LalfOl$0rMyGM`>n{$Een%AA6@^CydSAC_}R)PNZuw2U)5geNn z|0nXsR2$7ft_On`lGvQ#a?-FHI0J|B9ZlLV&#KX9PH0=x$s|qGgQRLi1D^`g>s;Lz ztd9Vb6_n&@T5*}@Z-da44_WtS- zeIwMu^3jS50K8R!J0xq40PD7Kth$ik$zJ`nVZDme=_iYYwOdzNr)kQGolM~%qpVZb zKcJ1=EpX83_+hyxlgT=WL#Uw+riVICyc8*>Fs|UyASB9Zr3}4#QWbS1F_bRI9^(zw zKpC4$EAJa~0Lt&oFMpWL)dO!8 z4CS}fkHbx`;pwad<6Sm$UIvRFEUieV5QkRdqgb8f;Wrue!GS{^RfcR=i%Oj4d_ns zwXp4U-f^M*5a-3E@sBn6IP7-Qpf#OW)_<4#iA6a;{mOydkNe}W^Lq~U zwy|e_*M~JuE-RQfxE$d(^J@ylp6+Me_RI%wB`FjdSr1hW@_pZWy9tc85<0p|^shu} zLoSpbDT<*nXP2QzanEjU{9Y@Db7If8dsOE<4eCxf%^*#s7DXHXIwiuRTAIIih|AV~ z-E4^N(Y)~K)E#%-1+d?aZGT9=MwxR=THF~(!M+{0p7M6MVSF;KLQ~yG993-!6Ms#3yfI%EMHkyqnSY};t*2oZ$YwnpQaxr9RH}eGAyc`{b^zU>S8HsIq zUa&`Y$?MuXk!o3ttd&#+>=SYcD@Vp&S_rSL;0-ZG&yWAPq5B{XGe=zVQ)@kMu9z>q zpnyo=JD+&vD@NR%E}0@q=-Jk2zd9>Br5Ov@aQrgJdPUP<(ZqGH!K}f|;G+9MM`EeR zk8I2gLIz%bmaCg3?VIy;_<5A&`~72(Zh|blp>o3gV{N3q^KhG&*&}X%`VEt~C+$OvlEW>p$N2tR+LqU)K&`*O!|oQ1X8L}w z5##G#f{!*0TkYTu-75q5x@DwRmpxe*c&$-~rtatIyG`zBiu6CU5LCAGPQG@oZ2@0b z4nAwoFHG!S-%z{lW_X@m8;z|DwH7NEVTsP460iR;5}XyH84v^O*%Xdn6+LP`{(S&l zT&OfAT`$H06=FSVll#UScHgHrBqt}UkF6tm#J$(KH`^b>-spwKHg9n}3Y`UC8_Z-0 zTGTbjE=ahJ?J9p!8T7naT0{?RY5&v3Wx7k6)pOPnA^tD>z<(EHT%A33-P-}P{|9%t BhaUg{ diff --git a/app/src/main/res/drawable/ic_body.xml b/app/src/main/res/drawable/ic_body.xml new file mode 100644 index 0000000..07ab00c --- /dev/null +++ b/app/src/main/res/drawable/ic_body.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_body_inactive.xml b/app/src/main/res/drawable/ic_body_inactive.xml new file mode 100644 index 0000000..1309179 --- /dev/null +++ b/app/src/main/res/drawable/ic_body_inactive.xml @@ -0,0 +1,6 @@ + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml new file mode 100644 index 0000000..8f39fdb --- /dev/null +++ b/app/src/main/res/drawable/ic_map.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map_inactive.xml b/app/src/main/res/drawable/ic_map_inactive.xml new file mode 100644 index 0000000..ceb79b4 --- /dev/null +++ b/app/src/main/res/drawable/ic_map_inactive.xml @@ -0,0 +1,8 @@ + + + + diff --git a/app/src/main/res/drawable/ic_music.xml b/app/src/main/res/drawable/ic_music.xml new file mode 100644 index 0000000..c90939f --- /dev/null +++ b/app/src/main/res/drawable/ic_music.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_music_inactive.xml b/app/src/main/res/drawable/ic_music_inactive.xml new file mode 100644 index 0000000..3ee5d6a --- /dev/null +++ b/app/src/main/res/drawable/ic_music_inactive.xml @@ -0,0 +1,6 @@ + + + diff --git a/app/src/main/res/drawable/ic_run.xml b/app/src/main/res/drawable/ic_run.xml new file mode 100644 index 0000000..95f9296 --- /dev/null +++ b/app/src/main/res/drawable/ic_run.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/drawable/ic_run_inactive.xml b/app/src/main/res/drawable/ic_run_inactive.xml new file mode 100644 index 0000000..e60bd62 --- /dev/null +++ b/app/src/main/res/drawable/ic_run_inactive.xml @@ -0,0 +1,8 @@ + + + + diff --git a/app/src/main/res/drawable/ic_workout_inactive.xml b/app/src/main/res/drawable/ic_workout_inactive.xml new file mode 100644 index 0000000..1929aab --- /dev/null +++ b/app/src/main/res/drawable/ic_workout_inactive.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_body_selection.xml b/app/src/main/res/layout/activity_body_selection.xml new file mode 100644 index 0000000..f4f369a --- /dev/null +++ b/app/src/main/res/layout/activity_body_selection.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 1a3fd2a..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_music_selection.xml b/app/src/main/res/layout/activity_music_selection.xml new file mode 100644 index 0000000..d32f704 --- /dev/null +++ b/app/src/main/res/layout/activity_music_selection.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_path_run.xml b/app/src/main/res/layout/activity_path_run.xml new file mode 100644 index 0000000..524a43c --- /dev/null +++ b/app/src/main/res/layout/activity_path_run.xml @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_path_selection.xml b/app/src/main/res/layout/activity_path_selection.xml new file mode 100644 index 0000000..17a4b77 --- /dev/null +++ b/app/src/main/res/layout/activity_path_selection.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_workout_selection.xml b/app/src/main/res/layout/activity_workout_selection.xml new file mode 100644 index 0000000..7800cba --- /dev/null +++ b/app/src/main/res/layout/activity_workout_selection.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index b5b71d8..a5f1545 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -13,4 +13,9 @@ ?attr/colorPrimaryVariant + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml new file mode 100644 index 0000000..e52391d --- /dev/null +++ b/app/src/main/res/values/attrs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ec3559a..935e17a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,4 +8,9 @@ #FF000000 #FFFFFFFF #4CAF50 + #FF039BE5 + #FF01579B + #FF40C4FF + #FF00B0FF + #66000000 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f9aeeb5..94cb0bd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,8 @@ MuSSpeed + FullscreenActivity + Dummy Button + DUMMY\nCONTENT + FullscreenActivity + MuSSpeed \ 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 0000000..c1926a6 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 67c7170..1fa74f6 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -13,4 +13,15 @@ ?attr/colorPrimaryVariant + + + + \ No newline at end of file