phoenix/mear
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

UI improvements. Completed #14 and #20

Browse Source
This commit is contained in:
amazing-username
2019-03-05 21:39:23 -05:00
parent 4effe37517
commit 48d4ffe5df
21 changed files with 280 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_main.xml
+25 -7
View File
@@ -8,19 +8,37 @@
tools:context=".activities.MainActivity">
<android.support.design.widget.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_width="324dp"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
android:baselineAligned="false"
app:popupTheme="@style/AppTheme.PopupOverlay" />
<ImageButton
android:id="@+id/SettingsLink"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:contentDescription="@string/settings_link"
app:srcCompat="@android:drawable/ic_menu_manage" />
</LinearLayout>
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_main"/>
<include
android:id="@+id/include"
layout="@layout/content_main" />
</android.support.design.widget.CoordinatorLayout>
app/src/main/res/layout/activity_setting.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/activity_settings.xml
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.SettingsActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_settings" />
</android.support.design.widget.CoordinatorLayout>
app/src/main/res/layout/content_main.xml
+1
View File
@@ -21,4 +21,5 @@
<include
layout="@layout/fragment_play_controls"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/content_settings.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".activities.SettingsActivity"
tools:showIn="@layout/activity_settings">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/dm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/RefreshLibrary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:lineSpacingExtra="12sp"
android:text="@string/update_library"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
</FrameLayout>
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/fragment_play_controls.xml
+28 -22
View File
@@ -5,36 +5,42 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<Button
<ImageButton
android:id="@+id/PreviousTrack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="66dp"
android:layout_height="66dp"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="@string/previous_button"
android:background="@android:drawable/screen_background_light_transparent"
android:tint="@color/colorPrimaryDark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@android:drawable/ic_media_previous" />
<Button
<ImageButton
android:id="@+id/PlayTrack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="64dp"
android:layout_marginBottom="8dp"
android:text="@string/play_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/PreviousTrack" />
<Button
android:id="@+id/NextTrack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_width="66dp"
android:layout_height="66dp"
android:layout_marginStart="96dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="@string/next_button"
android:background="@android:drawable/screen_background_light_transparent"
android:tint="@color/color_player_not_initialized"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/NextTrack"
app:layout_constraintHorizontal_bias="0.021"
app:layout_constraintStart_toEndOf="@+id/PreviousTrack"
app:srcCompat="@android:drawable/ic_media_play" />
<ImageButton
android:id="@+id/NextTrack"
android:layout_width="66dp"
android:layout_height="66dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@android:drawable/screen_background_light_transparent"
android:tint="@color/colorPrimaryDark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.864"
app:layout_constraintStart_toEndOf="@+id/PlayTrack" />
app:srcCompat="@android:drawable/ic_media_next" />
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/fragment_track_elapsing.xml
+8 -7
View File
@@ -6,34 +6,35 @@
<SeekBar
android:id="@+id/seekBar2"
android:layout_width="261dp"
android:layout_height="27dp"
android:layout_width="284dp"
android:layout_height="26dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/TrackDuration"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.889" />
app:layout_constraintVertical_bias="0.869" />
<TextView
android:id="@+id/CurrentPosition"
android:layout_width="63dp"
android:layout_width="50dp"
android:layout_height="22dp"
android:layout_marginStart="4dp"
android:layout_marginBottom="84dp"
android:text="TextView"
android:text="@string/track_start"
android:textAlignment="viewStart"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/TrackDuration"
android:layout_width="63dp"
android:layout_width="50dp"
android:layout_height="22dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="84dp"
android:text="TextView"
android:text="@string/track_end"
android:textAlignment="textEnd"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/fragment_track_flow.xml
+2 -2
View File
@@ -11,7 +11,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp"
android:text="S"
android:text="@string/shuffle_off"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/RepeatTrack"
app:layout_constraintTop_toTopOf="parent"
@@ -24,7 +24,7 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp"
android:text="R"
android:text="ROff"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app/src/main/res/values/colors.xml
+3 -2
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#008577</color>
<color name="colorPrimary">#6A6A6A</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
<color name="colorAccent">#ED0057</color>
<color name="color_player_not_initialized">#585858</color>
</resources>
app/src/main/res/values/strings.xml
+15 -6
View File
@@ -6,17 +6,26 @@
<string name="nav_header_subtitle">android.studio@android.com</string>
<string name="nav_header_desc">Navigation header</string>
<string name="action_settings">Settings</string>
<string name="title_activity_main">MainActivity</string>
<string name="title_activity_main">Mear</string>
<string name="shuffle_on">Shuffle On</string>
<string name="shuffle_off">Shuffle Off</string>
<string name="shuffle_on">SOn</string>
<string name="shuffle_off">SOff</string>
<string name="title_activity_settings">Settings</string>
<string name="track_start">0:00</string>
<string name="track_end">0:00</string>
<string name="play_button">Play</string>
<string name="next_button">Next</string>
<string name="previous_button">Previous </string>
<string name="previous_button">Previous</string>
<string name="settings_link">Settings list</string>
<!-- Strings related to Settings -->
<!-- Strings related to SettingsActivity -->
<string name="update_library">Update Music Library</string>
<string name="update_library_description">Clear your music databas
e and search for musiczf
dhdfhfdhdfh
</string>
<!-- Example General settings -->
<string name="pref_header_general">General</string>
@@ -74,7 +83,7 @@
<item>3</item>
</string-array>
<string-array name="multi_select_list_preference_default_value"/>
<string-array name="multi_select_list_preference_default_value" />
<string name="pref_title_system_sync_settings">System sync settings</string>
app/src/main/res/values/styles.xml
+5 -2
View File
@@ -7,11 +7,14 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources>
app/src/main/res/xml/pref_headers.xml
+3 -3
View File
@@ -3,17 +3,17 @@
<!-- These settings headers are only used on tablets. -->
<header
android:fragment="com.example.mear.activities.SettingsActivity$GeneralPreferenceFragment"
android:fragment="com.example.mear.activities.fdh$GeneralPreferenceFragment"
android:title="@string/pref_header_general"
android:icon="@drawable/ic_info_black_24dp"/>
<header
android:fragment="com.example.mear.activities.SettingsActivity$NotificationPreferenceFragment"
android:fragment="com.example.mear.activities.fdh$NotificationPreferenceFragment"
android:title="@string/pref_header_notifications"
android:icon="@drawable/ic_notifications_black_24dp"/>
<header
android:fragment="com.example.mear.activities.SettingsActivity$DataSyncPreferenceFragment"
android:fragment="com.example.mear.activities.fdh$DataSyncPreferenceFragment"
android:title="@string/pref_header_data_sync"
android:icon="@drawable/ic_sync_black_24dp"/>