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" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.geuz.onelab" package="org.geuz.onelab"
android:versionCode="3" android:versionCode="3"
android:versionName="1.0.2" android:versionName="1.0.5"
android:installLocation="auto" android:installLocation="auto" >
>
<uses-sdk <uses-sdk android:minSdkVersion="14"
android:minSdkVersion="14"
android:targetSdkVersion="17" /> android:targetSdkVersion="17" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-feature android:glEsVersion="0x00010000" android:required="true" /> <uses-feature android:glEsVersion="0x00010000" android:required="true" />
<application <application android:icon="@drawable/ic_launcher"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:logo="@drawable/ic_launcher" android:logo="@drawable/ic_launcher"
android:allowBackup="true" > android:allowBackup="true" >
<activity <activity android:name=".SplashScreen"
android:name=".SplashScreen"
android:label="@string/title_activity_main"> android:label="@string/title_activity_main">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity android:name=".ModelList"
android:name=".ModelList"
android:label="@string/title_activity_main" /> android:label="@string/title_activity_main" />
<activity <activity android:name=".AboutActivity"
android:name=".AboutActivity"
android:label="@string/title_activity_about" /> android:label="@string/title_activity_about" />
<activity <activity android:name=".MainActivity"
android:name=".MainActivity"
android:label="@string/title_activity_main" > android:label="@string/title_activity_main" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.msh" android:mimeType="*/*" /> <data android:scheme="file"
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.geo" android:mimeType="*/*" /> android:host="*"
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" /> 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> </intent-filter>
</activity> </activity>
<activity <activity android:name=".PostProcessingActivity"
android:name=".PostProcessingActivity"
android:label="@string/title_activity_main" /> android:label="@string/title_activity_main" />
<activity <activity android:name=".OptionsActivity"
android:name=".OptionsActivity"
android:label="@string/title_activity_options" /> android:label="@string/title_activity_options" />
</application> </application>
......
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
...@@ -8,20 +8,17 @@ ...@@ -8,20 +8,17 @@
android:orientation="horizontal" android:orientation="horizontal"
android:showDividers="middle" android:showDividers="middle"
tools:context=".MainActivity" > tools:context=".MainActivity" >
<FrameLayout android:id="@+id/parameter_fragment" <FrameLayout android:id="@+id/parameter_fragment"
android:name="org.geuz.onelab.OptionsDisplayFragment" android:name="org.geuz.onelab.OptionsDisplayFragment"
android:layout_marginTop="48dp" android:layout_marginTop="48dp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
<FrameLayout android:id="@+id/model_fragment" <FrameLayout android:id="@+id/model_fragment"
android:name="org.geuz.onelab.ModelFragment" android:name="org.geuz.onelab.ModelFragment"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:layout_weight="3" /> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
...@@ -6,34 +6,29 @@ ...@@ -6,34 +6,29 @@
android:background="@android:color/black" android:background="@android:color/black"
android:alpha=".50" android:alpha=".50"
android:gravity="center" > android:gravity="center" >
<SeekBar <SeekBar android:id="@+id/controlStepper"
android:id="@+id/controlStepper"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<LinearLayout <LinearLayout android:layout_width="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@android:color/black" android:background="@android:color/black"
android:alpha=".50" android:alpha=".50"
android:gravity="center" > android:gravity="center" >
<ImageButton <ImageButton android:id="@+id/controlPrev"
android:id="@+id/controlPrev"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_previous" android:src="@android:drawable/ic_media_previous"
android:contentDescription="previous" /> android:contentDescription="previous" />
<ImageButton <ImageButton android:id="@+id/controlPlay"
android:id="@+id/controlPlay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_play" android:src="@android:drawable/ic_media_play"
android:contentDescription="play" /> android:contentDescription="play" />
<ImageButton <ImageButton android:id="@+id/controlNext"
android:id="@+id/controlNext"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@android:drawable/ic_media_next" android:src="@android:drawable/ic_media_next"
......
...@@ -3,6 +3,4 @@ ...@@ -3,6 +3,4 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/displayOptionsList"> android:id="@+id/displayOptionsList">
</org.geuz.onelab.SeparatedListView> </org.geuz.onelab.SeparatedListView>
...@@ -9,5 +9,4 @@ ...@@ -9,5 +9,4 @@
style="?android:attr/listSeparatorTextViewStyle" style="?android:attr/listSeparatorTextViewStyle"
> >
</TextView> </TextView>
\ No newline at end of file
...@@ -2,22 +2,10 @@ ...@@ -2,22 +2,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent" >
<ImageView android:id="@+id/splashImage" <ImageView android:id="@+id/splashImage"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:src="@drawable/ic_launcher" /> 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> </RelativeLayout>
<resources> <resources>
<string name="app_name">Onelab</string> <string name="app_name">Onelab</string>
<string name="button_open_file">Open file</string> <string name="button_open_file">Open file</string>
<string name="button_ok">OK</string> <string name="button_ok">OK</string>
<string name="button_recalculate_param">Recalulate with new parameters</string> <string name="button_recalculate_param">Recompute with new parameters</string>
<string name="dialog_title_choosefile">Choose a file</string> <string name="dialog_title_choosefile">Choose a file</string>
<string name="error_nosdcard">No SDcard found on your device</string> <string name="error_nosdcard">No SDcard found on your device</string>
<string name="title_activity_main">Onelab</string> <string name="title_activity_main">Onelab</string>
......
<resources> <resources>
<style name="AppTheme" parent="android:Theme.Light" /> <style name="AppTheme" parent="android:Theme.Light" />
</resources> </resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment