Skip to content

Commit 818f78a

Browse files
committed
Revert to use Xamarin.Android layout.xml
1 parent 534244d commit 818f78a

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

src/AndroidClient/androidchat/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="servicestack.net.androidchat">
44

5+
<uses-sdk />
56
<uses-permission android:name="android.permission.INTERNET" />
7+
<uses-permission android:name="android.permission.VIBRATE" />
68

79
<application
810
android:name=".App"

src/AndroidClient/androidchat/src/main/java/servicestack/net/androidchat/ChatActionBarDrawerToggle.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ public class ChatActionBarDrawerToggle extends ActionBarDrawerToggle {
2121
private boolean rightIsClosed = true;
2222
private boolean leftIsClosed = true;
2323

24-
public ChatActionBarDrawerToggle(AppCompatActivity host, DrawerLayout drawerLayout, Toolbar toolbar, @StringRes int openedResource, @StringRes int closedResource) {
24+
public ChatActionBarDrawerToggle(
25+
AppCompatActivity host,
26+
DrawerLayout drawerLayout,
27+
Toolbar toolbar,
28+
@StringRes int openedResource,
29+
@StringRes int closedResource) {
2530
super(host, drawerLayout, toolbar, openedResource, closedResource);
2631

2732
hostActivity = host;

src/AndroidClient/androidchat/src/main/java/servicestack/net/androidchat/MainActivity.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import android.widget.EditText;
1717
import android.widget.ImageView;
1818
import android.widget.ListView;
19-
import android.widget.TextView;
2019
import android.widget.Toast;
2120

2221
import net.servicestack.android.AndroidServerEventsClient;
@@ -65,7 +64,6 @@ public AndroidServerEventsClient getClient(){
6564
@Override
6665
protected void onCreate(Bundle savedInstanceState) {
6766
super.onCreate(savedInstanceState);
68-
6967
setContentView(R.layout.activity_main);
7068

7169
Button sendButton = (Button)findViewById(R.id.sendMessageButton);

src/AndroidClient/androidchat/src/main/res/layout/activity_main.xml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
xmlns:app="http://schemas.android.com/apk/lib/servicestack.net.androidchat"
5-
android:id="@+id/activity_main"
6-
android:layout_width="match_parent"
7-
android:layout_height="match_parent"
8-
android:paddingBottom="@dimen/activity_vertical_margin"
9-
android:paddingLeft="@dimen/activity_horizontal_margin"
10-
android:paddingRight="@dimen/activity_horizontal_margin"
11-
android:paddingTop="@dimen/activity_vertical_margin"
12-
tools:context="servicestack.net.androidchat.MainActivity">
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:orientation="vertical"
5+
android:layout_width="fill_parent"
6+
android:layout_height="fill_parent">
137

148
<android.support.v7.widget.Toolbar
159
android:id="@+id/toolbar"
@@ -20,6 +14,7 @@
2014
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
2115
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"
2216
android:showAsAction="always" />
17+
2318
<android.support.v4.widget.DrawerLayout
2419
android:id="@+id/drawer_layout"
2520
android:layout_width="match_parent"
@@ -95,4 +90,5 @@
9590
android:divider="#E2E2E2"
9691
android:dividerHeight="1dp"
9792
android:background="@android:color/white" />
98-
</android.support.v4.widget.DrawerLayout></RelativeLayout>
93+
</android.support.v4.widget.DrawerLayout>
94+
</LinearLayout>

0 commit comments

Comments
 (0)