mirror of
https://github.com/zoriya/Opus.git
synced 2025-12-06 06:26:15 +00:00
Styling the toolbar and adding some translations.
This commit is contained in:
Tristan Roux
@@ -95,7 +95,7 @@ namespace Opus
|
||||
bottomNavigation.NavigationItemSelected += PreNavigate;
|
||||
|
||||
SetSupportActionBar(FindViewById<Toolbar>(Resource.Id.toolbar));
|
||||
SupportActionBar.Title = "Opus";
|
||||
SupportActionBar.SetDisplayShowTitleEnabled(false);
|
||||
|
||||
contentRefresh = FindViewById<SwipeRefreshLayout>(Resource.Id.contentRefresh);
|
||||
|
||||
@@ -125,7 +125,7 @@ namespace Opus
|
||||
notificationManager.CreateNotificationChannel(channel);
|
||||
}
|
||||
|
||||
//CheckForUpdate(this, false);
|
||||
CheckForUpdate(this, false);
|
||||
HandleIntent(Intent);
|
||||
Login();
|
||||
SyncPlaylists();
|
||||
|
||||
@@ -884,6 +884,9 @@
|
||||
<ItemGroup>
|
||||
<AndroidResource Include="Resources\drawable\semiDarkLinear.xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AndroidResource Include="Resources\drawable\long_icon.xml" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
|
||||
<Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
|
||||
<Import Project="..\packages\Xamarin.Android.Support.v7.Preference.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Preference.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.Preference.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Preference.targets')" />
|
||||
|
||||
@@ -34,6 +34,8 @@ namespace Opus.Resources.Portable_Class
|
||||
base.OnActivityCreated(savedInstanceState);
|
||||
MainActivity.instance.contentRefresh.Refresh += OnRefresh;
|
||||
|
||||
MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(true);
|
||||
MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Gone;
|
||||
MainActivity.instance.DisplaySearch();
|
||||
}
|
||||
|
||||
@@ -267,7 +269,8 @@ namespace Opus.Resources.Portable_Class
|
||||
{
|
||||
MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false);
|
||||
MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false);
|
||||
MainActivity.instance.SupportActionBar.Title = "Opus";
|
||||
MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false);
|
||||
MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
|
||||
MainActivity.instance.HideSearch();
|
||||
base.OnDestroyView();
|
||||
}
|
||||
|
||||
@@ -56,6 +56,8 @@ namespace Opus.Resources.Portable_Class
|
||||
|
||||
MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(true);
|
||||
MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(true);
|
||||
MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(true);
|
||||
MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Gone;
|
||||
MainActivity.instance.SupportActionBar.Title = playlistName;
|
||||
}
|
||||
|
||||
@@ -249,7 +251,8 @@ namespace Opus.Resources.Portable_Class
|
||||
MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false);
|
||||
MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false);
|
||||
MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(true);
|
||||
MainActivity.instance.SupportActionBar.Title = "Opus";
|
||||
MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false);
|
||||
MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
|
||||
|
||||
MainActivity.instance.contentRefresh.Refresh -= OnRefresh;
|
||||
Activity.FindViewById<AppBarLayout>(Resource.Id.appbar).RemoveOnOffsetChangedListener(this);
|
||||
|
||||
1024
Opus/Resources/Resource.Designer.cs
generated
1024
Opus/Resources/Resource.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
35
Opus/Resources/drawable/long_icon.xml
Normal file
35
Opus/Resources/drawable/long_icon.xml
Normal file
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:viewportWidth="886.95"
|
||||
android:viewportHeight="264"
|
||||
android:width="886.95dp"
|
||||
android:height="264dp">
|
||||
<group
|
||||
android:translateX="-56.52"
|
||||
android:translateY="-368">
|
||||
<path
|
||||
android:pathData="M339.24 381.86h78.1q49.74 0 70.79 13.74 26.77 17.22 26.78 47.83 0 18.61 -10.26 32.35T476 495.61q-18.43 6.09 -58.61 6.08h-21.4v84.19L417.16 605H336.29l24.17 -20.35V514.91c-1.39 -0.11 -2.38 -0.17 -2.95 -0.17a55.92 55.92 0 0 0 -24 5.39L331.94 517q11.64 -6.61 20.87 -6.61h6.26l1.39 -0.17v-8.53a53.67 53.67 0 0 0 -5.39 -0.52q-18.61 0 -29.74 9.05l-1.74 -2.61q10.61 -19.49 34.09 -19.48h2.78V402.9ZM506 400.47q10.6 5.22 17.05 18.35t6.43 29.83q0 37.74 -29.22 54.26 -22.08 12.52 -75.48 12.52 -8.88 0 -15 -0.34v71.83l27.31 32.35H350l-4.7 -4.7h81.92L405 588.83V510.39q15.13 0.87 32.18 0.87 44.86 0 66.61 -15.83t21.74 -48.52q0 -13.57 -4.17 -23.57T506 400.47Zm-110.1 -0.7v87.14h2.27l4.52 0.17a21.83 21.83 0 0 0 2.26 -0.17V409.34h19.13q22.26 0 31.4 3.91t15.56 16.26A34.31 34.31 0 0 0 455 417.08q-9.64 -3.57 -27.22 -3.57H409.86v73.4q34.44 0 50.53 -10.09t16.08 -31.65q0 -24.18 -14.35 -35.14T416 399.08Q407.76 399.08 395.94 399.77Z"
|
||||
android:fillColor="#FFFFFF" />
|
||||
</group>
|
||||
<group
|
||||
android:translateX="-56.52"
|
||||
android:translateY="-368">
|
||||
<path
|
||||
android:pathData="M739.8 381.86l-31.13 24.87V519.09q0 31 -2 44.52t-7.91 22.27q-15 22.26 -58.1 22.26 -45.57 0 -63.65 -22.26 -14.44 -17.57 -14.44 -67.32V403.08l-23.65 -21.22H621L597.36 405V518.74l0.34 26.78q0 25.92 10.79 36.79t36.35 10.87q28.17 0 38.79 -16.52 8.52 -13.39 8.52 -57.4l0.69 -112.53 -27.13 -24.87Zm5.92 11.82l-23.66 19.66v108q0 53.05 -8.34 69.22 -17.06 32.7 -66.62 32.7 -42.79 0 -64.35 -21.39l1.39 0.69 6.09 3.48q21.39 12.53 55 12.53 48 0 63.66 -30.27 8.34 -16.35 8.34 -65.74V411.25L743.11 390Zm-117.41 -2.43l-17 17.22V537.7l-0.17 12 5.39 22.09q4 6.62 15.13 16l0.35 1.56q-14.61 -5.91 -20.18 -17.21t-5.56 -35V406.73l19.65 -19.13Z"
|
||||
android:fillColor="#FFFFFF" />
|
||||
</group>
|
||||
<group
|
||||
android:translateX="-56.52"
|
||||
android:translateY="-368">
|
||||
<path
|
||||
android:pathData="M919.82 383.77a115.89 115.89 0 0 0 -14.43 25.39q-10.62 26.1 -14.09 32l-0.87 1c-0.47 -1.27 -0.81 -2.26 -1 -3q-4.86 -15.64 -8 -21.74A40.48 40.48 0 0 0 872 405.86q-15.82 -14.08 -36 -14.09 -18.62 0 -31 10.35t-12.35 26q0 29.22 44 39.83l29.4 7.13q62.79 15.14 62.79 66.27 0 28.53 -21.48 47.92t-53.14 19.39q-19.83 0 -44.35 -6.09l-20.35 -5q-12.36 -3 -20.35 -3 -10.62 0 -21.92 6.79l-1.39 -2.44Q767.46 566.4 776.16 537l3.13 0.87q3.65 27.32 21.91 42.44T849 595.44q23.31 0 37.05 -10.78t13.74 -29q0 -21 -19.13 -34.78 -13.74 -9.75 -56.36 -18.09 -32.87 -6.44 -47.65 -21.4t-14.79 -41.57q0 -27.47 19.74 -44.61T833 378q20.36 0 47.48 7.3 12.71 3.5 18.79 3.48 8.52 0 18.61 -5.91Zm0 111q23.65 17.91 23.66 49 0 33.21 -25.75 56.26T855.12 623.1a138.62 138.62 0 0 1 -33.92 -3.83l-27.83 -6.78a86 86 0 0 0 -20.87 -2.44 41.81 41.81 0 0 0 -18.26 4l-2.09 -5a43.65 43.65 0 0 1 18.44 -4.18A106.46 106.46 0 0 1 794.42 608l26.78 6.44A144.78 144.78 0 0 0 855 618.23q34.78 0 59.22 -22.18t24.44 -53.66q0 -26.61 -18.79 -46.61Zm-145.58 -6.27l5.92 3.31q5.73 10.26 33.57 17.05l28 6.95q28.51 7.14 38 12.26a28.83 28.83 0 0 1 13.48 15.57l-1.22 0.7a50.2 50.2 0 0 0 -17 -13.22q-9.13 -4.19 -35 -10.26 -37.57 -8.7 -50.44 -15.05T774.24 488.47ZM796 544.83q6.43 31.3 34.44 44.35v1.39q-32.35 -9.39 -39.13 -44.87Zm83.84 -119.14q-19.14 -20.35 -41.05 -20.35 -13.21 0 -21.91 7.65a24.8 24.8 0 0 0 -8.7 19.48q0 12.87 17.57 26.44l1.39 0.87 -0.87 1.39q-23 -10.26 -23 -29.74 0 -13.57 9.74 -22.09t25.39 -8.53q15 0 26.18 6.35A38.31 38.31 0 0 1 881 425Zm50.79 -34.62L929 393.68a247.42 247.42 0 0 0 -12.17 23q-12.18 25.58 -13.75 28.53l-0.86 1.21 -4.18 -1.74 0.7 -1.56q5 -11.47 14.61 -29.92l11.82 -23 0.87 -1.39Z"
|
||||
android:fillColor="#FFFFFF" />
|
||||
</group>
|
||||
<group
|
||||
android:translateX="-56.52"
|
||||
android:translateY="-368">
|
||||
<path
|
||||
android:pathData="M188.52 368a132 132 0 1 0 132 132A132 132 0 0 0 188.52 368Zm-20 223h-9V409h9V591Zm20 -0.09V562.5a62.5 62.5 0 0 0 0 -125V409.09a90.91 90.91 0 0 1 0 181.82Z"
|
||||
android:fillColor="#FFFFFF" />
|
||||
</group>
|
||||
</vector>
|
||||
@@ -35,7 +35,16 @@
|
||||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
|
||||
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
|
||||
app:layout_collapseMode="pin"
|
||||
android:id="@+id/toolbar" />
|
||||
android:id="@+id/toolbar" >
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/toolbarLogo"
|
||||
android:paddingTop="15dp"
|
||||
android:paddingBottom="15dp"
|
||||
android:adjustViewBounds="true"
|
||||
android:src="@drawable/long_icon" />
|
||||
</android.support.v7.widget.Toolbar>
|
||||
</Opus.CollapsingToolbarLayout>
|
||||
<android.support.design.widget.TabLayout
|
||||
android:id="@+id/tabs"
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
<string name="minutes">minutes</string>
|
||||
<string name="hour">heure</string>
|
||||
<string name="hours">heures</string>
|
||||
<string name="timer">Timer d\'arret</string>
|
||||
<string name="open_youtube">Regarder le clip sur youtube</string>
|
||||
|
||||
<!--Queue-->
|
||||
<string name="playing">Lecture en cours</string>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<string name="hour">hour</string>
|
||||
<string name="hours">hours</string>
|
||||
<string name="timer">Sleep timer</string>
|
||||
<string name="open_youtube">Open in the youtube app</string>
|
||||
<string name="open_youtube">Watch clip on youtube</string>
|
||||
|
||||
<!--Queue-->
|
||||
<string name="playing">Playing</string>
|
||||
|
||||
Reference in New Issue
Block a user