2
0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 09:56:22 +01:00

resources: copy mipmaps to drawable, ensure mipmap used on 19+ and xml icon on 26+ when possible

This commit is contained in:
mittorn 2020-07-08 01:03:18 +07:00
parent d6c715c5c3
commit addd2f76ef
12 changed files with 75 additions and 47 deletions

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/sunset_orange" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon>

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:src="@mipmap/ic_launcher"/>

View File

@ -9,12 +9,17 @@
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:weightSum="1"> android:weightSum="1">
<ImageView <!--<ImageView
android:layout_width="89dp" android:layout_width="89dp"
android:layout_height="89dp" android:layout_height="89dp"
android:id="@+id/aboutIcon" android:id="@+id/aboutIcon"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:src="@drawable/ic_launcher" /> android:src="@drawable/ic_launcher" />-->
<include
android:layout_width="89dp"
android:layout_height="89dp"
android:layout_gravity="center_horizontal"
layout="@layout/logo" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

View File

@ -14,12 +14,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" > android:layout_margin="5dp" >
<ImageView <!--<ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="2dp" android:layout_margin="2dp"
android:src="@drawable/ic_launcher" android:src="@drawable/ic_launcher"
android:id="@+id/launcherIcon" /> android:id="@+id/launcherIcon" />-->
<include
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
layout="@layout/logo" />
<TextView <TextView
android:id="@+id/textView_tittle" android:id="@+id/textView_tittle"
android:layout_width="fill_parent" android:layout_width="fill_parent"

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:src="@drawable/ic_launcher"/>

View File

@ -60,12 +60,12 @@ public class LauncherActivity extends Activity
setContentView(R.layout.activity_launcher); setContentView(R.layout.activity_launcher);
if( sdk > 17 ) /* if( sdk > 17 )
{ {
ImageView icon = (ImageView) findViewById(R.id.launcherIcon); ImageView icon = (ImageView) findViewById(R.id.launcherIcon);
icon.setImageDrawable(getResources().getDrawable(R.mipmap.ic_launcher)); icon.setImageDrawable(getResources().getDrawable(R.mipmap.ic_launcher));
} }
*/
TabHost tabHost = (TabHost) findViewById(R.id.tabhost); TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
tabHost.setup(); tabHost.setup();
@ -439,12 +439,12 @@ public class LauncherActivity extends Activity
dialog.setContentView(R.layout.about); dialog.setContentView(R.layout.about);
dialog.setCancelable(true); dialog.setCancelable(true);
dialog.show(); dialog.show();
if( sdk > 17 ) /* if( sdk > 17 )
{ {
ImageView icon = (ImageView) dialog.findViewById(R.id.aboutIcon); ImageView icon = (ImageView) dialog.findViewById(R.id.aboutIcon);
icon.setImageDrawable(getResources().getDrawable(R.mipmap.ic_launcher)); icon.setImageDrawable(getResources().getDrawable(R.mipmap.ic_launcher));
} }
*/
TextView tView6 = (TextView) dialog.findViewById(R.id.textView6); TextView tView6 = (TextView) dialog.findViewById(R.id.textView6);
tView6.setMovementMethod(LinkMovementMethod.getInstance()); tView6.setMovementMethod(LinkMovementMethod.getInstance());
((Button)dialog.findViewById( R.id.button_about_ok )).setOnClickListener(new View.OnClickListener(){ ((Button)dialog.findViewById( R.id.button_about_ok )).setOnClickListener(new View.OnClickListener(){