Skip to content

Commit

Permalink
Merge branch 'master' into upgrade_compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@gogins
gogins authored Sep 7, 2023
2 parents b2ece32 + a1f9545 commit 8958d51
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 46 deletions.
2 changes: 0 additions & 2 deletions CsoundForAndroid/CsoundForAndroid/.idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions CsoundForAndroid/CsoundForAndroid/CsoundApplication/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ android {
applicationId "com.csounds.Csound6"
minSdkVersion 22
targetSdkVersion 33
versionCode 38
versionCode 39
versionName '6.18.1'
multiDexEnabled true
signingConfig signingConfigs.release
Expand Down Expand Up @@ -70,5 +70,4 @@ dependencies {
implementation('com.google.android.material:material:1.9.0')
implementation('androidx.preference:preference:1.2.1')
implementation('androidx.fragment:fragment:1.6.1')

}
22 changes: 15 additions & 7 deletions CsoundForAndroid/CsoundForAndroid/CsoundApplication/src/main/assets/Csound6_User_Guide.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title></title>
<meta name="generator" content="LibreOffice 7.4.2.3 (MacOSX)"/>
<meta name="created" content="2013-06-11T00:00:00.020113632"/>
<meta name="changed" content="2023-09-01T14:03:30.182697098"/>
<meta name="changed" content="2023-09-07T08:55:18.330275334"/>
<meta name="created" content="00:00:00">
<meta name="created" content="00:00:00">
<style type="text/css">
Expand Down Expand Up @@ -42,12 +42,20 @@
should be just enough to get you started if you already have some
experience with Csound or, at least, some other “Music N” type
software synthesizer.</p>
<h1 class="western" style="line-height: 115%">Changes in This Version</h1>
<p>This is the Android for Csound app, version code 38. This is a bug
fix release from 37, which was the first major release of this app
since 2021.</p>
<p>The Csound for Android app now targets Android version 13. This
has required adding <font face="Courier New, monospace">MANAGE_EXTERNAL_STORAGE</font>
<h1 class="western" style="line-height: 115%">Release Notes</h1>
<h2 class="western">Version 39</h2>
<p>This is a bug fix release. The sizes and spacings of the buttons,
labels, and sliders in the <i><b>Widgets</b></i> tab have been
refined in order to display more widgets on smartphones.</p>
<h2 class="western">Version 38</h2>
<p>This is a bug fix release. The editor size was misbehaving when
the mobile keyboard appeared or disappeared; fixed by changing the
host element for the editor back to <font face="Courier New, monospace">&lt;div&gt;</font>
from <font face="Courier New, monospace">&lt;pre&gt;</font>.</p>
<h1 class="western">Introduction</h1>
<p>The Csound for Android app now targets Android version 13; this is
the first major release of the app since 2021. This has required
adding <font face="Courier New, monospace">MANAGE_EXTERNAL_STORAGE</font>
permission, so that the app can now read and write all files on a
device. Be assured that the app does not, on its own, read any
private data, or send any private data anywhere, or download any data
Expand Down
Binary file modified CsoundForAndroid/CsoundForAndroid/CsoundApplication/src/main/assets/Csound6_User_Guide.pdf
View file
Binary file not shown.
56 changes: 28 additions & 28 deletions CsoundForAndroid/CsoundForAndroid/CsoundApplication/src/main/res/layout/main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -102,7 +102,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider1"
Expand All @@ -119,7 +119,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -131,7 +131,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider2"
Expand All @@ -148,7 +148,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -160,7 +160,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider3"
Expand All @@ -177,7 +177,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -189,7 +189,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider4"
Expand All @@ -206,7 +206,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -218,7 +218,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider5"
Expand All @@ -235,7 +235,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -247,7 +247,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider6"
Expand All @@ -264,7 +264,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -276,7 +276,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider7"
Expand All @@ -293,7 +293,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -305,7 +305,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider8"
Expand All @@ -322,7 +322,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -334,7 +334,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider9"
Expand All @@ -351,7 +351,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -363,7 +363,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider10"
Expand All @@ -380,7 +380,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -392,7 +392,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider11"
Expand All @@ -409,7 +409,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
android:layout_marginVertical="2dp"
android:orientation="horizontal">

<Button
Expand All @@ -421,7 +421,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
style="@style/csoundSeekBar"
style="@style/csoundLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slider12"
Expand Down Expand Up @@ -455,8 +455,8 @@
android:id="@+id/messageTextViewSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:padding="5dp"
android:layout_margin="2dp"
android:padding="2dp"
android:textColor="#00ff00"
android:textSize="10sp"
android:typeface="monospace" />
Expand All @@ -473,8 +473,8 @@
android:id="@+id/messageTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:padding="5dp"
android:layout_margin="2dp"
android:padding="2dp"
android:textColor="#00ff00"
android:textSize="10sp"
android:typeface="monospace" />
Expand Down
35 changes: 28 additions & 7 deletions CsoundForAndroid/CsoundForAndroid/CsoundApplication/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="csoundSeekBar" parent="android:Widget.SeekBar">
<item name="android:paddingLeft">5dp</item>
<item name="android:paddingRight">5dp</item>
<item name="android:minHeight">17dp</item>
<item name="android:maxHeight">17dp</item>
<item name="android:padding">2dp</item>
<item name="android:textSize">10sp</item>
<item name="android:layout_centerHorizontal">true</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:minHeight">10dp</item>
<item name="android:maxHeight">10dp</item>
</style>

<style name="csoundButtonStyle" parent="@android:style/Widget.Button.Small">
<item name="android:padding">0dp</item>
<item name="android:textSize">12sp</item>
<item name="android:padding">2dp</item>
<item name="android:textSize">10sp</item>
<item name="android:layout_centerHorizontal">true</item>
<item name="android:layout_centerVertical">true</item>
<item name="backgroundTint">#aaabaa</item>
<item name="android:layout_margin">-2.5dp</item>
<item name="android:minWidth">60dp</item>
<item name="android:maxWidth">60dp</item>
<item name="android:minHeight">10dp</item>
<item name="android:maxHeight">10dp</item>
</style>

<style name="csoundLabelStyle" parent="@android:style/Widget.Button.Small">
<item name="android:padding">2dp</item>
<!-- <item name="android:layout_margin">-2dp</item> -->
<item name="android:textSize">10sp</item>
<item name="android:layout_centerHorizontal">true</item>
<item name="android:layout_centerVertical">true</item>
<!-- <item name="android:background">@android:color/darker_gray</item> -->
<item name="android:textColor">@android:color/white</item>
<item name="android:minWidth">60dp</item>
<item name="android:maxWidth">60dp</item>
<item name="android:minHeight">10dp</item>
<item name="android:maxHeight">10dp</item>
</style>
D
<style name="csoundTheme" parent="@style/Theme.AppCompat.NoActionBar">
Expand Down

0 comments on commit 8958d51

Please sign in to comment.