Skip to content

Commit ae29018

Browse files
committed
replace C++ arg style
1 parent a9c677b commit ae29018

File tree

3 files changed

+38
-38
lines changed

3 files changed

+38
-38
lines changed

AndroidXamarinChat/ChatActionBarDrawerToggle.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ namespace AndroidXamarinChat
99
{
1010
public class ChatActionBarDrawerToggle : ActionBarDrawerToggle
1111
{
12-
private AppCompatActivity mHostActivity;
12+
private AppCompatActivity hostActivity;
1313
private readonly DrawerLayout drawerLayout;
14-
private int mOpenedResource;
15-
private int mClosedResource;
14+
private int openedResource;
15+
private int closedResource;
1616

1717
private bool rightIsClosed = true;
1818
private bool leftIsClosed = true;
@@ -24,10 +24,10 @@ public ChatActionBarDrawerToggle(AppCompatActivity host,
2424
int closedResource)
2525
: base(host, drawerLayout, toolbar, openedResource, closedResource)
2626
{
27-
mHostActivity = host;
27+
hostActivity = host;
2828
this.drawerLayout = drawerLayout;
29-
mOpenedResource = openedResource;
30-
mClosedResource = closedResource;
29+
this.openedResource = openedResource;
30+
this.closedResource = closedResource;
3131
}
3232

3333
public override void OnDrawerOpened(View drawerView)
@@ -37,7 +37,7 @@ public override void OnDrawerOpened(View drawerView)
3737
if (drawerType == 0)
3838
{
3939
base.OnDrawerOpened(drawerView);
40-
mHostActivity.SupportActionBar.SetTitle(mOpenedResource);
40+
hostActivity.SupportActionBar.SetTitle(openedResource);
4141
}
4242

4343
if (drawerView.Id == Resource.Id.nav_view)
@@ -54,7 +54,7 @@ public override void OnDrawerClosed(View drawerView)
5454
if (drawerType == 0)
5555
{
5656
base.OnDrawerClosed(drawerView);
57-
mHostActivity.SupportActionBar.SetTitle(mClosedResource);
57+
hostActivity.SupportActionBar.SetTitle(closedResource);
5858
}
5959

6060
if (drawerView.Id == Resource.Id.nav_view)
@@ -68,8 +68,8 @@ public override void OnDrawerSlide(View drawerView, float slideOffset)
6868
{
6969
int drawerType = (int)drawerView.Tag;
7070

71-
var leftDrawer = mHostActivity.FindViewById<NavigationView>(Resource.Id.nav_view);
72-
var rightDrawer = mHostActivity.FindViewById<ListView>(Resource.Id.right_drawer);
71+
var leftDrawer = hostActivity.FindViewById<NavigationView>(Resource.Id.nav_view);
72+
var rightDrawer = hostActivity.FindViewById<ListView>(Resource.Id.right_drawer);
7373
switch (drawerView.Id)
7474
{
7575
case Resource.Id.right_drawer:

AndroidXamarinChat/LoginActivity.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ protected override void OnCreate(Bundle savedInstanceState)
3333
// Set our view from the "main" layout resource
3434
SetContentView(Resource.Layout.login);
3535

36-
SupportToolbar mToolbar = FindViewById<SupportToolbar>(Resource.Id.loginToolbar);
37-
SetSupportActionBar(mToolbar);
36+
SupportToolbar toolbar = FindViewById<SupportToolbar>(Resource.Id.loginToolbar);
37+
SetSupportActionBar(toolbar);
3838
SupportActionBar.SetHomeButtonEnabled(true);
3939
SupportActionBar.SetDisplayShowTitleEnabled(true);
4040

AndroidXamarinChat/MainActivity.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ namespace AndroidXamarinChat
2323
public class MainActivity : AppCompatActivity
2424
{
2525
public const string BaseUrl = "http://chat.servicestack.net/";
26-
private ChatActionBarDrawerToggle mDrawerToggle;
27-
private DrawerLayout mDrawerLayout;
28-
private ListView mRightDrawer;
26+
private ChatActionBarDrawerToggle drawerToggle;
27+
private DrawerLayout drawerLayout;
28+
private ListView rightDrawer;
2929
private NavigationView navigationView;
3030

3131
private EditText messageBox;
@@ -58,16 +58,16 @@ protected override void OnCreate(Bundle bundle)
5858
// and attach an event to it
5959
Button sendButton = FindViewById<Button>(Resource.Id.sendMessageButton);
6060
messageBox = FindViewById<EditText>(Resource.Id.message);
61-
SupportToolbar mToolbar = FindViewById<SupportToolbar>(Resource.Id.toolbar);
62-
mDrawerLayout = FindViewById<DrawerLayout>(Resource.Id.drawer_layout);
61+
SupportToolbar toolbar = FindViewById<SupportToolbar>(Resource.Id.toolbar);
62+
drawerLayout = FindViewById<DrawerLayout>(Resource.Id.drawer_layout);
6363
navigationView = FindViewById<NavigationView>(Resource.Id.nav_view);
64-
mRightDrawer = FindViewById<ListView>(Resource.Id.right_drawer);
64+
rightDrawer = FindViewById<ListView>(Resource.Id.right_drawer);
6565
var messageHistoryList = FindViewById<ListView>(Resource.Id.messageHistory);
6666
var chatBackground = FindViewById<ImageView>(Resource.Id.chat_background);
6767
InitDefaultBackground(chatBackground);
6868

6969
navigationView.Tag = 0;
70-
mRightDrawer.Tag = 1;
70+
rightDrawer.Tag = 1;
7171

7272
var messageHistoryAdapter = new MessageListViewAdapter(this, new List<ChatMessage>(), () => this.subscriberList);
7373
messageHistoryList.Adapter = messageHistoryAdapter;
@@ -111,33 +111,33 @@ protected override void OnCreate(Bundle bundle)
111111
client.RegisterNamedReceiver<TvReciever>("tv");
112112
client.RegisterNamedReceiver<CssReceiver>("css");
113113

114-
SetSupportActionBar(mToolbar);
114+
SetSupportActionBar(toolbar);
115115

116-
var mRightDataSet = new List<string>(commands.Keys);
117-
var mRightAdapter = new ActionListViewAdapter(this, mRightDataSet);
118-
mRightDrawer.Adapter = mRightAdapter;
119-
mRightDrawer.ItemClick += (sender, args) =>
116+
var rightDataSet = new List<string>(commands.Keys);
117+
var rightAdapter = new ActionListViewAdapter(this, rightDataSet);
118+
rightDrawer.Adapter = rightAdapter;
119+
rightDrawer.ItemClick += (sender, args) =>
120120
{
121121
Application.SynchronizationContext.Post(_ =>
122122
{
123-
messageBox.Text = commands[mRightDataSet[args.Position]];
124-
mDrawerLayout.CloseDrawer(mRightDrawer);
123+
messageBox.Text = commands[rightDataSet[args.Position]];
124+
drawerLayout.CloseDrawer(rightDrawer);
125125
}, null);
126126
};
127127

128-
mDrawerToggle = new ChatActionBarDrawerToggle(
128+
drawerToggle = new ChatActionBarDrawerToggle(
129129
this, //Host Activity
130-
mDrawerLayout, //DrawerLayout
131-
mToolbar, // Instance of toolbar, if you use other ctor, the hamburger icon/arrow animation won't work..
130+
drawerLayout, //DrawerLayout
131+
toolbar, // Instance of toolbar, if you use other ctor, the hamburger icon/arrow animation won't work..
132132
Resource.String.openDrawer, //Opened Message
133133
Resource.String.closeDrawer //Closed Message
134134
);
135135

136136
SupportActionBar.SetHomeButtonEnabled(true);
137137
SupportActionBar.SetDisplayShowTitleEnabled(true);
138138

139-
mDrawerLayout.SetDrawerListener(mDrawerToggle);
140-
mDrawerToggle.SyncState();
139+
drawerLayout.SetDrawerListener(drawerToggle);
140+
drawerToggle.SyncState();
141141

142142
navigationView.NavigationItemSelected += OnChannelClick;
143143
sendButton.Click += OnSendClick;
@@ -179,7 +179,7 @@ public void OnChannelClick(object sender, NavigationView.NavigationItemSelectedE
179179
//Change channel
180180
client.ChangeChannel(itemText, cmdReceiver);
181181
}
182-
mDrawerLayout.CloseDrawer(navigationView);
182+
drawerLayout.CloseDrawer(navigationView);
183183
}
184184

185185
public void OnSendClick(object sender, EventArgs e)
@@ -233,16 +233,16 @@ public override bool OnOptionsItemSelected(IMenuItem item)
233233
switch (item.ItemId)
234234
{
235235
case Resource.Id.action_help:
236-
if (mDrawerLayout.IsDrawerOpen(mRightDrawer))
236+
if (drawerLayout.IsDrawerOpen(rightDrawer))
237237
{
238238
//Right Drawer is already open, close it
239-
mDrawerLayout.CloseDrawer(mRightDrawer);
239+
drawerLayout.CloseDrawer(rightDrawer);
240240
}
241241
else
242242
{
243243
//Right Drawer is closed, open it and just in case close left drawer
244-
mDrawerLayout.OpenDrawer(mRightDrawer);
245-
mDrawerLayout.CloseDrawer(navigationView);
244+
drawerLayout.OpenDrawer(rightDrawer);
245+
drawerLayout.CloseDrawer(navigationView);
246246
}
247247
return true;
248248
default:
@@ -262,15 +262,15 @@ protected override void OnPostCreate(Bundle savedInstanceState)
262262

263263
this.UpdateCookiesFromIntent(client);
264264

265-
mDrawerToggle.SyncState();
265+
drawerToggle.SyncState();
266266
UiHelpers.ResetChannelDrawer(this, navigationView, client.Channels);
267267
client.Connect().ConfigureAwait(false);
268268
}
269269

270270
public override void OnConfigurationChanged(Android.Content.Res.Configuration newConfig)
271271
{
272272
base.OnConfigurationChanged(newConfig);
273-
mDrawerToggle.OnConfigurationChanged(newConfig);
273+
drawerToggle.OnConfigurationChanged(newConfig);
274274
}
275275

276276
protected override void OnDestroy()

0 commit comments

Comments
 (0)