Peertube/peertube-live-streaming
1
1
Fork 0
mirror of https://codeberg.org/Schoumi/PeerTubeLive.git synced 2024-12-30 12:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request 'Bump release-v1.3' (#60) from release-v1.3 into master

Browse Source 
Reviewed-on: https://codeberg.org/Schoumi/PeerTubeLive/pulls/60
Fixes #58
This commit is contained in:
Schoumi 2024-05-28 23:51:23 +00:00
commit c86ca10eda
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
applicationId "fr.mobdev.peertubelive"
minSdkVersion 21
targetSdkVersion 34
versionCode 3
versionName "1.2"
versionCode 4
versionName "1.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

2
app/src/main/AndroidManifest.xml
View File

@ -27,7 +27,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="fr.mobdev.peertubelive.activity.StreamActivity" android:screenOrientation="portrait"/>
<activity android:name="fr.mobdev.peertubelive.activity.StreamActivity" android:screenOrientation="portrait" android:theme="@style/AppThemeStream"/>
<activity android:name="fr.mobdev.peertubelive.activity.CreateLiveActivity" />
</application>

14
app/src/main/res/values/styles.xml
View File

@ -1,7 +1,6 @@
<resources>
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorSecondary">@color/colorSecondary</item>
@ -9,16 +8,26 @@
<item name="alertDialogTheme">@style/DialogButton</item>
<!--<item name="android:editTextColor">@color/colorAccent</item>-->
</style>
<style name="AppThemeStream" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorSecondary">@color/colorSecondary</item>
<item name="colorOnSecondary">@color/colorOnSecondary</item>
<item name="alertDialogTheme">@style/DialogButton</item>
<!--<item name="android:editTextColor">@color/colorAccent</item>-->
</style>
<style name="DialogButton" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="buttonBarNegativeButtonStyle">@style/buttonStyle</item>
<item name="buttonBarPositiveButtonStyle">@style/buttonStyle</item>
<item name="buttonBarNeutralButtonStyle">@style/buttonStyle</item>
</style>
<style name="buttonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
<item name="android:textColor">@color/colorSecondary</item>
</style>
<style name="AppTheme.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="floatingActionButtonStyle">@style/floatingActionButtonStyle</item>
</style>
@ -28,6 +37,7 @@
<item name="colorSecondary">@color/colorPrimary</item>
<item name="colorOnSecondary">@color/colorOnSecondary</item>
</style>
<style name="floatingActionButtonStyle" parent="Widget.MaterialComponents.FloatingActionButton">
<item name="materialThemeOverlay">@style/customFabColor</item>
</style>