Skip to content

Commit

Permalink
v1.1. Fullscreen and landscape
Browse files Browse the repository at this point in the history
  • Loading branch information
@Galakart
Galakart committed Jan 30, 2014
1 parent f60c26a commit da96035
Show file tree
Hide file tree
Showing 10 changed files with 321 additions and 125 deletions.
16 changes: 6 additions & 10 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="https://schemas.android.com/apk/res/android"
package="ru.galakart.majordroid"
android:versionCode="1"
android:versionName="1.0" >
android:versionCode="2"
android:versionName="1.1" >

<uses-permission android:name="android.permission.INTERNET" />

Expand All @@ -17,8 +17,7 @@
android:theme="@android:style/Theme.Black.NoTitleBar" >
<activity
android:name="ru.galakart.majordroid.MainActivity"
android:label="@string/app_name"
android:screenOrientation="portrait" >
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -27,18 +26,15 @@
</activity>
<activity
android:name="ru.galakart.majordroid.ControsActivity"
android:label="@string/title_activity_contros"
android:screenOrientation="portrait" >
android:label="@string/title_activity_contros" >
</activity>
<activity
android:name="ru.galakart.majordroid.Prefs"
android:label="@string/action_settings"
android:screenOrientation="portrait" >
android:label="@string/action_settings">
</activity>
<activity
android:name="ru.galakart.majordroid.AboutActivity"
android:label="@string/title_activity_about"
android:screenOrientation="portrait" >
android:label="@string/title_activity_about" >
</activity>
</application>

Expand Down
54 changes: 54 additions & 0 deletions res/layout-land/activity_about.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<RelativeLayout xmlns:android="https://schemas.android.com/apk/res/android"
xmlns:tools="https://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".AboutActivity" >



<TextView
android:id="@+id/tv_donate"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="95dp"
android:gravity="center_horizontal"
android:scrollbars="vertical"
android:text="@string/about_donate" />

<Button
android:id="@+id/btn_rate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="30dp"
android:onClick="btn_rate_exec"
android:text="@string/title_btn_rate" />

<TextView
android:id="@+id/tv_url"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="5dp"
android:autoLink="web"
android:text="@string/about_url" />
<ImageView
android:id="@+id/imageView1"
android:layout_width="120dp"
android:layout_height="80dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="false"
android:layout_marginBottom="1dp"
android:gravity="center_horizontal"
android:src="@drawable/logo_about" />

</RelativeLayout>
103 changes: 103 additions & 0 deletions res/layout-land/activity_contros.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<LinearLayout xmlns:android="https://schemas.android.com/apk/res/android"

android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical"
android:paddingLeft="10dip"
android:paddingRight="10dip" >

<TableLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:shrinkColumns="*"
android:stretchColumns="*" >

<TableRow>

<ImageView
android:id="@+id/imgb_script1"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script1_exec"
android:src="@drawable/cooltext1" />

<ImageView
android:id="@+id/imgb_script2"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script2_exec"
android:src="@drawable/cooltext2" />

<ImageView
android:id="@+id/imgb_script3"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script3_exec"
android:src="@drawable/cooltext3" />
</TableRow>

<TableRow>

<ImageView
android:id="@+id/imgb_script4"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script4_exec"
android:src="@drawable/cooltext4" />

<ImageView
android:id="@+id/imgb_script5"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script5_exec"
android:src="@drawable/cooltext5" />

<ImageView
android:id="@+id/imgb_script6"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script6_exec"
android:src="@drawable/cooltext6" />
</TableRow>

<TableRow>

<ImageView
android:id="@+id/imgb_script7"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script7_exec"
android:src="@drawable/cooltext7" />

<ImageView
android:id="@+id/imgb_script8"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script8_exec"
android:src="@drawable/cooltext8" />

<ImageView
android:id="@+id/imgb_script9"
android:layout_width="80dp"
android:layout_height="80dp"
android:onClick="imgb_script9_exec"
android:src="@drawable/cooltext9" />
</TableRow>

<TextView
android:id="@+id/textView_legend"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scrollbars="vertical" />
</TableLayout>

<WebView
android:id="@+id/webPost"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:visibility="invisible" />


</LinearLayout>
17 changes: 9 additions & 8 deletions res/layout/activity_about.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,32 @@

<ImageView
android:id="@+id/imageView1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="130dp"
android:layout_height="100dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginTop="1dp"
android:src="@drawable/logo_about" />

<TextView
android:id="@+id/tv_text"
android:id="@+id/tv_donate"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="125dp"
android:layout_marginBottom="105dp"
android:gravity="center_horizontal"
android:text="@string/about_text" />
android:scrollbars="vertical"
android:text="@string/about_donate" />

<Button
android:id="@+id/btn_rate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:layout_marginBottom="40dp"
android:onClick="btn_rate_exec"
android:text="@string/title_btn_rate" />

Expand All @@ -44,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="15dp"
android:layout_marginBottom="10dp"
android:autoLink="web"
android:text="@string/about_url" />

Expand Down
Loading

0 comments on commit da96035

Please sign in to comment.