Differential D10951

Rename MaterialActivity to MainActivity
ClosedPublic
Actions

Authored by nicolasfella on Mar 1 2018, 4:39 PM.

Tags

Subscribers

mtijink, KDE Connect

Details

Reviewers

Group Reviewers

Commits

R225:e72e0f61dd78: Rename MaterialActivity to MainActivity

Summary

Its more descriptive

Diff Detail

Repository

R225 KDE Connect - Android application

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

nicolasfella requested review of this revision.Mar 1 2018, 4:39 PM

nicolasfella created this revision.

nicolasfella edited the summary of this revision. (Show Details)Mar 1 2018, 4:40 PM

nicolasfella added a dependency: D10905: Apply coding style to whole project.

I got some merge conflicts when trying to check this out.

This revision now requires changes to proceed.Mar 3 2018, 3:12 PM

Resolve merge conflict

nicolasfella edited the summary of this revision. (Show Details)Mar 3 2018, 3:31 PM

nicolasfella removed dependencies: D10905: Apply coding style to whole project, D10948: Remove unused imports.

I assume you only pushed the "rename class" button? If not, please specify what you changed besides that.

This revision is now accepted and ready to land.Mar 3 2018, 3:41 PM

Proper diff

Yep, I just did that

Closed by commit R225:e72e0f61dd78: Rename MaterialActivity to MainActivity (authored by nicolasfella). · Explain WhyMar 3 2018, 6:35 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			AndroidManifest.xml (26 lines)
M			res/layout/activity_list.xml (2 lines)
M			res/layout/activity_main.xml (2 lines)
M			src/org/kde/kdeconnect/Device.java (12 lines)
M			src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java (4 lines)
M			src/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java (6 lines)
M			src/org/kde/kdeconnect/Plugins/ReceiveNotificationsPlugin/ReceiveNotificationsPlugin.java (6 lines)
M			src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardService.java (4 lines)
M			src/org/kde/kdeconnect/UserInterface/DeviceFragment.java (10 lines)
V			src/org/kde/kdeconnect/UserInterface/{MainActivity.java ← MaterialActivity.java} (30 lines)
V			src/org/kde/kdeconnect/UserInterface/{MaterialActivity.java → MainActivity.java}
M			src/org/kde/kdeconnect/UserInterface/PairingFragment.java (4 lines)

Diff 28510

AndroidManifest.xml

Loading...

res/layout/activity_list.xml

Loading...

res/layout/activity_main.xml

Loading...

src/org/kde/kdeconnect/Device.java

Loading...

src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java

Loading...

src/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java

Loading...

src/org/kde/kdeconnect/Plugins/ReceiveNotificationsPlugin/ReceiveNotificationsPlugin.java

Loading...

src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardService.java

Loading...

src/org/kde/kdeconnect/UserInterface/DeviceFragment.java

Loading...

src/org/kde/kdeconnect/UserInterface/MainActivity.java

Loading...

src/org/kde/kdeconnect/UserInterface/MaterialActivity.java

Loading...

src/org/kde/kdeconnect/UserInterface/PairingFragment.java

Loading...