mirror of
https://github.com/keymanapp/keyman.git
synced 2026-08-19 23:07:42 +00:00
changed splash_screen logo
This commit is contained in:
parent
b0399d3089
commit
cdc4c0b6b4
6 changed files with 13 additions and 25 deletions
|
|
@ -80,14 +80,11 @@ import android.graphics.drawable.BitmapDrawable;
|
|||
import android.graphics.drawable.Drawable;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
<<<<<<< Updated upstream
|
||||
|
||||
import androidx.drawerlayout.widget.DrawerLayout;
|
||||
=======
|
||||
|
||||
import androidx.core.content.ContextCompat;
|
||||
>>>>>>> Stashed changes
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
|
||||
import android.util.TypedValue;
|
||||
import android.view.KeyEvent;
|
||||
|
|
@ -175,21 +172,19 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
|
|||
toolbar = (Toolbar) findViewById(R.id.titlebar);
|
||||
setSupportActionBar(toolbar);
|
||||
getSupportActionBar().setTitle(null);
|
||||
<<<<<<< Updated upstream
|
||||
|
||||
getSupportActionBar().setDisplayUseLogoEnabled(true);
|
||||
getSupportActionBar().setDisplayShowHomeEnabled(true);
|
||||
getSupportActionBar().setLogo(R.drawable.keyman_logo);
|
||||
=======
|
||||
<<<<<<< Updated upstream
|
||||
|
||||
getSupportActionBar().setDisplayUseLogoEnabled(false);
|
||||
getSupportActionBar().setDisplayShowHomeEnabled(false);
|
||||
=======
|
||||
|
||||
getSupportActionBar().setDisplayUseLogoEnabled(true);
|
||||
getSupportActionBar().setDisplayShowHomeEnabled(true);
|
||||
getSupportActionBar().setLogo(R.drawable.keyman_logo_mode);
|
||||
// getSupportActionBar().setLogo(R.drawable.keyman_logo);
|
||||
>>>>>>> Stashed changes
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
getSupportActionBar().setDisplayShowTitleEnabled(false);
|
||||
getSupportActionBar().setBackgroundDrawable(getActionBarDrawable(this));
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
|
@ -10,7 +10,7 @@
|
|||
android:bottom="@dimen/product_logo_bottom"
|
||||
>
|
||||
<bitmap
|
||||
android:src="@drawable/keyman_logo_splash"
|
||||
android:src="@drawable/keyman_logo_splash_dark_mode"
|
||||
android:gravity="center"/>
|
||||
</item>
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 8 KiB After Width: | Height: | Size: 13 KiB |
|
|
@ -24,20 +24,13 @@
|
|||
android:title="@string/action_overflow"
|
||||
android:icon="@drawable/ic_action_overflow_mode"
|
||||
>
|
||||
<!-- <item android:id="@+id/action_shared"-->
|
||||
<!-- app:showAsAction="always"-->
|
||||
<!-- android:title="@string/action_share"-->
|
||||
<!-- android:icon="@drawable/ic_light_action_share" />-->
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
<menu>
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
<item android:id="@+id/action_share"
|
||||
app:showAsAction="always"
|
||||
android:title="@string/action_share"
|
||||
android:icon="@drawable/ic_light_action_share" />
|
||||
=======
|
||||
<menu
|
||||
>
|
||||
>>>>>>> Stashed changes
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
<item
|
||||
android:id="@+id/action_text_size"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="yellow_background">#171717</color>
|
||||
<color name="yellow_background">#131313</color>
|
||||
|
||||
<color name="iconColor">#FFFFFF</color>
|
||||
<color name="toolbarColor">@color/ms_black</color>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue