Fix UI camera notch clipping, embed Bürgerforum Oggau logo, and align branding with Bürgerliste Oggau
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="H:\oggauer_gemeindetrommler\android\app\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="H:\oggauer_gemeindetrommler\android\app\src\main\res"><file name="launch_background" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\drawable\launch_background.xml" qualifiers="" type="drawable"/><file name="launch_background" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\drawable-v21\launch_background.xml" qualifiers="v21" type="drawable"/><file name="ic_launcher" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-anydpi-v26\ic_launcher.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="ic_launcher" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_back" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-hdpi\ic_launcher_adaptive_back.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_fore" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-hdpi\ic_launcher_adaptive_fore.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_back" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-mdpi\ic_launcher_adaptive_back.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_fore" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-mdpi\ic_launcher_adaptive_fore.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_back" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xhdpi\ic_launcher_adaptive_back.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_fore" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xhdpi\ic_launcher_adaptive_fore.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_back" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xxhdpi\ic_launcher_adaptive_back.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_fore" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xxhdpi\ic_launcher_adaptive_fore.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xxxhdpi\ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_back" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xxxhdpi\ic_launcher_adaptive_back.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_launcher_adaptive_fore" path="H:\oggauer_gemeindetrommler\android\app\src\main\res\mipmap-xxxhdpi\ic_launcher_adaptive_fore.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file path="H:\oggauer_gemeindetrommler\android\app\src\main\res\values\styles.xml" qualifiers=""><style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
|
||||
|
||||
<item name="android:windowBackground">@drawable/launch_background</item>
|
||||
</style><style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
|
||||
<item name="android:windowBackground">?android:colorBackground</item>
|
||||
</style></file><file path="H:\oggauer_gemeindetrommler\android\app\src\main\res\values-night\styles.xml" qualifiers="night-v8"><style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
|
||||
|
||||
<item name="android:windowBackground">@drawable/launch_background</item>
|
||||
</style><style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
|
||||
<item name="android:windowBackground">?android:colorBackground</item>
|
||||
</style></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="H:\oggauer_gemeindetrommler\android\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="H:\oggauer_gemeindetrommler\android\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="H:\oggauer_gemeindetrommler\android\app\build\generated\res\resValues\debug"/><source path="H:\oggauer_gemeindetrommler\android\app\build\generated\res\processDebugGoogleServices"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="H:\oggauer_gemeindetrommler\android\app\build\generated\res\resValues\debug"/><source path="H:\oggauer_gemeindetrommler\android\app\build\generated\res\processDebugGoogleServices"><file path="H:\oggauer_gemeindetrommler\android\app\build\generated\res\processDebugGoogleServices\values\values.xml" qualifiers=""><string name="default_web_client_id" translatable="false">576683162451-pl7mb5k00rj5dhg3krqcqh8bpvn8ijbq.apps.googleusercontent.com</string><string name="gcm_defaultSenderId" translatable="false">576683162451</string><string name="google_api_key" translatable="false">AIzaSyAWjSjX1f2rGUGHLbXQS873DYY_oXqcHhs</string><string name="google_app_id" translatable="false">1:576683162451:android:48edba9829ee7925083fa6</string><string name="google_crash_reporting_api_key" translatable="false">AIzaSyAWjSjX1f2rGUGHLbXQS873DYY_oXqcHhs</string><string name="google_storage_bucket" translatable="false">gemeinde-trommler.appspot.com</string><string name="project_id" translatable="false">gemeinde-trommler</string></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="res-processDebugGoogleServices$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="res-processDebugGoogleServices" generated-set="res-processDebugGoogleServices$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
|
||||
Reference in New Issue
Block a user