diff --git a/KdeConnect/src/main/AndroidManifest.xml b/KdeConnect/src/main/AndroidManifest.xml index 8f5f8ca2..700c6414 100644 --- a/KdeConnect/src/main/AndroidManifest.xml +++ b/KdeConnect/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/KdeConnect/src/main/java/org/kde/connect/Plugins/BatteryPlugin/BatteryPlugin.java b/KdeConnect/src/main/java/org/kde/connect/Plugins/BatteryPlugin/BatteryPlugin.java index 8a4b6a28..8a69e814 100644 --- a/KdeConnect/src/main/java/org/kde/connect/Plugins/BatteryPlugin/BatteryPlugin.java +++ b/KdeConnect/src/main/java/org/kde/connect/Plugins/BatteryPlugin/BatteryPlugin.java @@ -13,7 +13,7 @@ import android.widget.Button; import org.kde.connect.NetworkPackage; import org.kde.connect.Plugins.Plugin; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; public class BatteryPlugin extends Plugin { diff --git a/KdeConnect/src/main/java/org/kde/connect/Plugins/ClibpoardPlugin/ClipboardPlugin.java b/KdeConnect/src/main/java/org/kde/connect/Plugins/ClibpoardPlugin/ClipboardPlugin.java index e8dabe17..b699aba3 100644 --- a/KdeConnect/src/main/java/org/kde/connect/Plugins/ClibpoardPlugin/ClipboardPlugin.java +++ b/KdeConnect/src/main/java/org/kde/connect/Plugins/ClibpoardPlugin/ClipboardPlugin.java @@ -12,7 +12,7 @@ import android.widget.Button; import org.kde.connect.NetworkPackage; import org.kde.connect.Plugins.Plugin; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; public class ClipboardPlugin extends Plugin { diff --git a/KdeConnect/src/main/java/org/kde/connect/Plugins/MprisPlugin/MprisActivity.java b/KdeConnect/src/main/java/org/kde/connect/Plugins/MprisPlugin/MprisActivity.java index 6ecad2e9..9b717443 100644 --- a/KdeConnect/src/main/java/org/kde/connect/Plugins/MprisPlugin/MprisActivity.java +++ b/KdeConnect/src/main/java/org/kde/connect/Plugins/MprisPlugin/MprisActivity.java @@ -18,7 +18,7 @@ import org.kde.connect.ComputerLinks.BaseComputerLink; import org.kde.connect.Device; import org.kde.connect.LinkProviders.BaseLinkProvider; import org.kde.connect.NetworkPackage; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; import java.util.ArrayList; diff --git a/KdeConnect/src/main/java/org/kde/connect/Plugins/MprisPlugin/MprisPlugin.java b/KdeConnect/src/main/java/org/kde/connect/Plugins/MprisPlugin/MprisPlugin.java index b082818b..1c4ad4c0 100644 --- a/KdeConnect/src/main/java/org/kde/connect/Plugins/MprisPlugin/MprisPlugin.java +++ b/KdeConnect/src/main/java/org/kde/connect/Plugins/MprisPlugin/MprisPlugin.java @@ -13,7 +13,7 @@ import android.widget.Button; import org.kde.connect.NetworkPackage; import org.kde.connect.Plugins.Plugin; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; import java.util.ArrayList; diff --git a/KdeConnect/src/main/java/org/kde/connect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/KdeConnect/src/main/java/org/kde/connect/Plugins/NotificationsPlugin/NotificationsPlugin.java index d0d0866d..cab1c201 100644 --- a/KdeConnect/src/main/java/org/kde/connect/Plugins/NotificationsPlugin/NotificationsPlugin.java +++ b/KdeConnect/src/main/java/org/kde/connect/Plugins/NotificationsPlugin/NotificationsPlugin.java @@ -20,7 +20,7 @@ import org.kde.connect.Helpers.AppsHelper; import org.kde.connect.Helpers.ImagesHelper; import org.kde.connect.NetworkPackage; import org.kde.connect.Plugins.Plugin; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; import java.io.ByteArrayOutputStream; import java.nio.charset.Charset; diff --git a/KdeConnect/src/main/java/org/kde/connect/Plugins/PingPlugin/PingPlugin.java b/KdeConnect/src/main/java/org/kde/connect/Plugins/PingPlugin/PingPlugin.java index 80ab4cd5..574a35a6 100644 --- a/KdeConnect/src/main/java/org/kde/connect/Plugins/PingPlugin/PingPlugin.java +++ b/KdeConnect/src/main/java/org/kde/connect/Plugins/PingPlugin/PingPlugin.java @@ -1,6 +1,5 @@ package org.kde.connect.Plugins.PingPlugin; -import android.R; import android.app.Activity; import android.app.AlertDialog; import android.app.Notification; @@ -13,6 +12,7 @@ import android.widget.Button; import org.kde.connect.NetworkPackage; import org.kde.connect.Plugins.Plugin; +import org.kde.kdeconnect_tp.R; public class PingPlugin extends Plugin { diff --git a/KdeConnect/src/main/java/org/kde/connect/Plugins/TelephonyPlugin/TelephonyPlugin.java b/KdeConnect/src/main/java/org/kde/connect/Plugins/TelephonyPlugin/TelephonyPlugin.java index f89d3248..ae3fdcd4 100644 --- a/KdeConnect/src/main/java/org/kde/connect/Plugins/TelephonyPlugin/TelephonyPlugin.java +++ b/KdeConnect/src/main/java/org/kde/connect/Plugins/TelephonyPlugin/TelephonyPlugin.java @@ -16,7 +16,7 @@ import android.widget.Button; import org.kde.connect.Helpers.ContactsHelper; import org.kde.connect.NetworkPackage; import org.kde.connect.Plugins.Plugin; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; public class TelephonyPlugin extends Plugin { diff --git a/KdeConnect/src/main/java/org/kde/connect/UserInterface/DeviceActivity.java b/KdeConnect/src/main/java/org/kde/connect/UserInterface/DeviceActivity.java index 9acd146d..7091e874 100644 --- a/KdeConnect/src/main/java/org/kde/connect/UserInterface/DeviceActivity.java +++ b/KdeConnect/src/main/java/org/kde/connect/UserInterface/DeviceActivity.java @@ -20,7 +20,7 @@ import org.kde.connect.Plugins.Plugin; import org.kde.connect.UserInterface.List.ButtonItem; import org.kde.connect.UserInterface.List.ListAdapter; import org.kde.connect.UserInterface.List.SectionItem; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; import java.util.ArrayList; import java.util.Collection; diff --git a/KdeConnect/src/main/java/org/kde/connect/UserInterface/ImageListAdapter.java b/KdeConnect/src/main/java/org/kde/connect/UserInterface/ImageListAdapter.java index 6a76335b..c354fce7 100644 --- a/KdeConnect/src/main/java/org/kde/connect/UserInterface/ImageListAdapter.java +++ b/KdeConnect/src/main/java/org/kde/connect/UserInterface/ImageListAdapter.java @@ -10,7 +10,7 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.TextView; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; import java.util.ArrayList; diff --git a/KdeConnect/src/main/java/org/kde/connect/UserInterface/List/DeviceItem.java b/KdeConnect/src/main/java/org/kde/connect/UserInterface/List/DeviceItem.java index d7148275..7d93df62 100644 --- a/KdeConnect/src/main/java/org/kde/connect/UserInterface/List/DeviceItem.java +++ b/KdeConnect/src/main/java/org/kde/connect/UserInterface/List/DeviceItem.java @@ -10,7 +10,7 @@ import android.widget.TextView; import org.kde.connect.Device; import org.kde.connect.UserInterface.DeviceActivity; import org.kde.connect.UserInterface.PairActivity; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; public class DeviceItem implements ListAdapter.Item { diff --git a/KdeConnect/src/main/java/org/kde/connect/UserInterface/List/SectionItem.java b/KdeConnect/src/main/java/org/kde/connect/UserInterface/List/SectionItem.java index 7f462c0b..4d49f2ce 100644 --- a/KdeConnect/src/main/java/org/kde/connect/UserInterface/List/SectionItem.java +++ b/KdeConnect/src/main/java/org/kde/connect/UserInterface/List/SectionItem.java @@ -4,7 +4,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; public class SectionItem implements ListAdapter.Item { diff --git a/KdeConnect/src/main/java/org/kde/connect/UserInterface/MainActivity.java b/KdeConnect/src/main/java/org/kde/connect/UserInterface/MainActivity.java index 87f5ab53..7d9e80e8 100644 --- a/KdeConnect/src/main/java/org/kde/connect/UserInterface/MainActivity.java +++ b/KdeConnect/src/main/java/org/kde/connect/UserInterface/MainActivity.java @@ -1,6 +1,7 @@ package org.kde.connect.UserInterface; +import android.content.res.Resources; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; @@ -17,7 +18,7 @@ import org.kde.connect.Device; import org.kde.connect.UserInterface.List.DeviceItem; import org.kde.connect.UserInterface.List.ListAdapter; import org.kde.connect.UserInterface.List.SectionItem; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; import java.util.ArrayList; import java.util.Collection; diff --git a/KdeConnect/src/main/java/org/kde/connect/UserInterface/PairActivity.java b/KdeConnect/src/main/java/org/kde/connect/UserInterface/PairActivity.java index d5bfbe49..1d9ef356 100644 --- a/KdeConnect/src/main/java/org/kde/connect/UserInterface/PairActivity.java +++ b/KdeConnect/src/main/java/org/kde/connect/UserInterface/PairActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import org.kde.connect.BackgroundService; import org.kde.connect.Device; -import org.kde.kdeconnect.R; +import org.kde.kdeconnect_tp.R; public class PairActivity extends ActionBarActivity {