Skip to content
Snippets Groups Projects
Commit df874ef8 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fine-tune layout + update icons

parent 1ea9a40f
No related branches found
No related tags found
No related merge requests found
Showing
with 188 additions and 214 deletions
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.geuz.onelab"
android:versionCode="3"
android:versionName="1.0.2"
android:installLocation="auto"
>
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="17" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-feature android:glEsVersion="0x00010000" android:required="true" />
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:logo="@drawable/ic_launcher"
android:allowBackup="true" >
<activity
android:name=".SplashScreen"
android:label="@string/title_activity_main">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ModelList"
android:label="@string/title_activity_main" />
<activity
android:name=".AboutActivity"
android:label="@string/title_activity_about" />
<activity
android:name=".MainActivity"
android:label="@string/title_activity_main" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.msh" android:mimeType="*/*" />
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.geo" android:mimeType="*/*" />
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" />
</intent-filter>
</activity>
<activity
android:name=".PostProcessingActivity"
android:label="@string/title_activity_main" />
<activity
android:name=".OptionsActivity"
android:label="@string/title_activity_options" />
</application>
package="org.geuz.onelab"
android:versionCode="3"
android:versionName="1.0.5"
android:installLocation="auto" >
<uses-sdk android:minSdkVersion="14"
android:targetSdkVersion="17" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-feature android:glEsVersion="0x00010000" android:required="true" />
<application android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:logo="@drawable/ic_launcher"
android:allowBackup="true" >
<activity android:name=".SplashScreen"
android:label="@string/title_activity_main">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ModelList"
android:label="@string/title_activity_main" />
<activity android:name=".AboutActivity"
android:label="@string/title_activity_about" />
<activity android:name=".MainActivity"
android:label="@string/title_activity_main" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="file"
android:host="*"
android:pathPattern=".*\\.msh"
android:mimeType="*/*" />
<data android:scheme="file"
android:host="*"
android:pathPattern=".*\\.geo"
android:mimeType="*/*" />
<data android:scheme="file"
android:host="*"
android:pathPattern=".*\\.pro"
android:mimeType="*/*" />
</intent-filter>
</activity>
<activity android:name=".PostProcessingActivity"
android:label="@string/title_activity_main" />
<activity android:name=".OptionsActivity"
android:label="@string/title_activity_options" />
</application>
</manifest>
contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png

865 B | W: | H:

contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png

8.28 KiB | W: | H:

contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png
contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png
contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png
contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png

384 B | W: | H:

contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png

4.46 KiB | W: | H:

contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png
contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png
contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png
contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png

614 B | W: | H:

contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png

5.05 KiB | W: | H:

contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png
contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png
contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png
contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png

18 KiB | W: | H:

contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png

12.9 KiB | W: | H:

contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png
contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png
contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png
contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png
  • 2-up
  • Swipe
  • Onion skin
contrib/mobile/Android/res/drawable-mdpi/icon_translate.png

7.57 KiB | W: | H:

contrib/mobile/Android/res/drawable-mdpi/icon_translate.png

10.9 KiB | W: | H:

contrib/mobile/Android/res/drawable-mdpi/icon_translate.png
contrib/mobile/Android/res/drawable-mdpi/icon_translate.png
contrib/mobile/Android/res/drawable-mdpi/icon_translate.png
contrib/mobile/Android/res/drawable-mdpi/icon_translate.png
  • 2-up
  • Swipe
  • Onion skin
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/model_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" />
\ No newline at end of file
android:id="@+id/model_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" />
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/model_fragment"
android:name="org.geuz.onelab.ModelFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
tools:context=".MainActivity" />
\ No newline at end of file
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/model_fragment"
android:name="org.geuz.onelab.ModelFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
tools:context=".MainActivity" />
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:divider="?android:attr/dividerHorizontal"
android:orientation="horizontal"
android:showDividers="middle"
tools:context=".MainActivity" >
<FrameLayout android:id="@+id/parameter_fragment"
android:name="org.geuz.onelab.OptionsDisplayFragment"
android:layout_marginTop="48dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<FrameLayout android:id="@+id/model_fragment"
android:name="org.geuz.onelab.ModelFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_weight="3" />
</LinearLayout>
\ No newline at end of file
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:divider="?android:attr/dividerHorizontal"
android:orientation="horizontal"
android:showDividers="middle"
tools:context=".MainActivity" >
<FrameLayout android:id="@+id/parameter_fragment"
android:name="org.geuz.onelab.OptionsDisplayFragment"
android:layout_marginTop="48dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<FrameLayout android:id="@+id/model_fragment"
android:name="org.geuz.onelab.ModelFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_weight="2" />
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@android:color/black"
android:alpha=".50"
android:gravity="center" >
<SeekBar
android:id="@+id/controlStepper"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:background="@android:color/black"
android:alpha=".50"
android:gravity="center" >
<ImageButton
android:id="@+id/controlPrev"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_previous"
android:contentDescription="previous" />
<ImageButton
android:id="@+id/controlPlay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_play"
android:contentDescription="play" />
<ImageButton
android:id="@+id/controlNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_next"
android:contentDescription="next" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@android:color/black"
android:alpha=".50"
android:gravity="center" >
<SeekBar android:id="@+id/controlStepper"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:background="@android:color/black"
android:alpha=".50"
android:gravity="center" >
<ImageButton android:id="@+id/controlPrev"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_previous"
android:contentDescription="previous" />
<ImageButton android:id="@+id/controlPlay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_play"
android:contentDescription="play" />
<ImageButton android:id="@+id/controlNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_next"
android:contentDescription="next" />
</LinearLayout>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout android:id="@+id/options_fragment"
android:name="org.geuz.onelab.OptionsModelFragment"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1" />
<View android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray" />
<LinearLayout android:orientation="horizontal"
android:orientation="vertical"
android:padding="4dip"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout android:id="@+id/options_fragment"
android:name="org.geuz.onelab.OptionsModelFragment"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1" />
<View android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray" />
<LinearLayout android:orientation="horizontal"
android:gravity="center" android:measureWithLargestChild="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0">
<Button android:id="@+id/goto_options_model"
<Button android:id="@+id/goto_options_model"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Model">
</Button>
<Button android:id="@+id/goto_options_display"
</Button>
<Button android:id="@+id/goto_options_display"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Display">
</Button>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
</Button>
</LinearLayout>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<org.geuz.onelab.SeparatedListView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/displayOptionsList">
</org.geuz.onelab.SeparatedListView>
\ No newline at end of file
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/displayOptionsList">
</org.geuz.onelab.SeparatedListView>
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/list_header_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:paddingLeft="5dip"
style="?android:attr/listSeparatorTextViewStyle"
>
android:id="@+id/list_header_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:paddingLeft="5dip"
style="?android:attr/listSeparatorTextViewStyle"
>
</TextView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ImageView android:id="@+id/splashImage"
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_launcher" />
<TextView android:id="@+id/splashTitle"
android:layout_below="@id/splashImage"
android:layout_width="fill_parent"
android:gravity="center"
android:layout_height="wrap_content"
android:text="ONELAB for Android"
android:textSize="24dp"
android:textStyle="bold"/>
</RelativeLayout>
\ No newline at end of file
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ImageView android:id="@+id/splashImage"
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_launcher" />
</RelativeLayout>
<resources>
<string name="app_name">Onelab</string>
<string name="button_open_file">Open file</string>
<string name="button_ok">OK</string>
<string name="button_recalculate_param">Recalulate with new parameters</string>
<string name="dialog_title_choosefile">Choose a file</string>
<string name="error_nosdcard">No SDcard found on your device</string>
<string name="title_activity_main">Onelab</string>
<string name="title_activity_about">About</string>
<string name="title_activity_options">Parameters</string>
<string name="error_nomshfile">No compatible files or directories in this folder</string>
<string name="title_share">Share screenshot with &#8230;</string>
<string name="menu_share">Share screenshot</string>
<string name="menu_parameters">Parameters</string>
<string name="menu_run">Run</string>
<string name="menu_stop">Stop</string>
<string name="postpro_intervalstype">Intervals type</string>
<string name="postpro_intervals">Intervals</string>
<string name="postpro_raisez">Raise (Z)</string>
<string name="app_name">Onelab</string>
<string name="button_open_file">Open file</string>
<string name="button_ok">OK</string>
<string name="button_recalculate_param">Recompute with new parameters</string>
<string name="dialog_title_choosefile">Choose a file</string>
<string name="error_nosdcard">No SDcard found on your device</string>
<string name="title_activity_main">Onelab</string>
<string name="title_activity_about">About</string>
<string name="title_activity_options">Parameters</string>
<string name="error_nomshfile">No compatible files or directories in this folder</string>
<string name="title_share">Share screenshot with &#8230;</string>
<string name="menu_share">Share screenshot</string>
<string name="menu_parameters">Parameters</string>
<string name="menu_run">Run</string>
<string name="menu_stop">Stop</string>
<string name="postpro_intervalstype">Intervals type</string>
<string name="postpro_intervals">Intervals</string>
<string name="postpro_raisez">Raise (Z)</string>
</resources>
<resources>
<style name="AppTheme" parent="android:Theme.Light" />
</resources>
\ No newline at end of file
<style name="AppTheme" parent="android:Theme.Light" />
</resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment