Update drawable names

PojavLauncherTeam · Mar 8, 2022 · 7452dc3 · 7452dc3
1 parent 3abd2af
commit 7452dc3
Show file tree

Hide file tree

Showing 10 changed files with 609 additions and 5 deletions.
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftLEGLView.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftLEGLView.java
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Touchpad.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Touchpad.java
@@ -155,7 +155,7 @@ public void placeMouseAt(float x, float y) {
 
     private void init(){
         // Setup mouse pointer
-        mMousePointerImageView.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.mouse_pointer, getContext().getTheme()));
+        mMousePointerImageView.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_mouse_pointer, getContext().getTheme()));
         mMousePointerImageView.post(() -> {
             ViewGroup.LayoutParams params = mMousePointerImageView.getLayoutParams();
             params.width = (int) (36 / 100f * LauncherPreferences.PREF_MOUSESCALE);

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
@@ -117,7 +117,7 @@ public void doFrame(long frameTimeNanos) {
 
         Context ctx = contextView.getContext();
         mPointerImageView = new ImageView(contextView.getContext());
-        mPointerImageView.setImageDrawable(ResourcesCompat.getDrawable(ctx.getResources(), R.drawable.gamepad_pointer, ctx.getTheme()));
+        mPointerImageView.setImageDrawable(ResourcesCompat.getDrawable(ctx.getResources(), R.drawable.ic_gamepad_pointer, ctx.getTheme()));
         mPointerImageView.getDrawable().setFilterBitmap(false);
 
         int size = (int) ((22 * getMcScale()) / mScaleFactor);

diff --git a/...pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java b/...pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java
@@ -91,7 +91,7 @@ public HandleView(ControlButton view) {
         mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
         mContainer.setContentView(this);
 
-        mDrawableRtl = view.getContext().getDrawable(R.drawable.view_handle);
+        mDrawableRtl = view.getContext().getDrawable(R.drawable.ic_view_handle);
         mMinSize = view.getContext().getResources().getDimensionPixelSize(R.dimen.text_handle_min_size);
 
         setOnLongClickListener(this);

diff --git a/...src/main/res/drawable/gamepad_pointer.png → .../main/res/drawable/ic_gamepad_pointer.png b/...src/main/res/drawable/gamepad_pointer.png → .../main/res/drawable/ic_gamepad_pointer.png
diff --git a/...avlauncher/src/main/res/drawable/logo.png → ...auncher/src/main/res/drawable/ic_logo.png b/...avlauncher/src/main/res/drawable/logo.png → ...auncher/src/main/res/drawable/ic_logo.png
diff --git a/...r/src/main/res/drawable/mouse_pointer.png → ...rc/main/res/drawable/ic_mouse_pointer.png b/...r/src/main/res/drawable/mouse_pointer.png → ...rc/main/res/drawable/ic_mouse_pointer.png
diff --git a/...her/src/main/res/drawable/view_handle.xml → .../src/main/res/drawable/ic_view_handle.xml b/...her/src/main/res/drawable/view_handle.xml → .../src/main/res/drawable/ic_view_handle.xml
diff --git a/app_pojavlauncher/src/main/res/layout/activity_java_gui_launcher.xml b/app_pojavlauncher/src/main/res/layout/activity_java_gui_launcher.xml
@@ -23,7 +23,7 @@
 				android:id="@+id/main_mouse_pointer"
 				android:layout_width="18dp"
 				android:layout_height="27dp"
-				android:src="@drawable/mouse_pointer" />
+				android:src="@drawable/ic_mouse_pointer" />
 
 		</LinearLayout>
 

diff --git a/app_pojavlauncher/src/main/res/layout/activity_pojav_login.xml b/app_pojavlauncher/src/main/res/layout/activity_pojav_login.xml
@@ -39,7 +39,7 @@
         android:id="@+id/login_image_logo"
         android:layout_width="300dp"
         android:layout_height="48dp"
-        android:src="@drawable/logo"
+        android:src="@drawable/ic_logo"
 
         app:layout_constraintBottom_toTopOf="@+id/login_menu"
         app:layout_constraintEnd_toStartOf="@+id/guidelineLeft"