Skip to content

Commit

Permalink
fix: app launcher in manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
kamui-7 committed Jul 4, 2021
1 parent 3b82a60 commit 9368ece
Show file tree
Hide file tree
Showing 28 changed files with 50 additions and 271 deletions.
9 changes: 4 additions & 5 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
-keepattributes *Annotation*, InnerClasses
-dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
-dontnote kotlinx.serialization.AnnotationsKt

# Change here com.yourcompany.yourpackage
-keep,includedescriptorclasses class com.kamui.rin.**$$serializer { *; } # <-- change package name to your app's
-keepclassmembers class com.kamui.rin.** { # <-- change package name to your app's
-keep,includedescriptorclasses class com.kamui.rin.**$$serializer { *; }
-keepclassmembers class com.kamui.rin.* {
*** Companion;
}
-keepclasseswithmembers class com.kamui.rin.** { # <-- change package name to your app's
-keepclasseswithmembers class com.kamui.rin.* {
kotlinx.serialization.KSerializer serializer(...);
}
12 changes: 6 additions & 6 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
android:allowBackup="true">
<activity
android:name=".MainActivity"
android:label="@string/lookup">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
android:label="@string/app_name">
<intent-filter android:label="@string/lookup">
<action android:name="android.intent.action.PROCESS_TEXT" />

<category android:name="android.intent.category.LAUNCHER" />
<data android:mimeType="text/plain" />
</intent-filter>
<intent-filter>
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
<activity android:name=".SettingsActivity" />
<activity android:name=".WordDetailActivity" />
</application>
</manifest>
Expand Down
Binary file added app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion app/src/main/java/com/kamui/rin/WordDetailActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.cardview.widget.CardView
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.google.android.material.chip.Chip
import com.google.android.material.chip.ChipGroup
import com.kamui.rin.util.Tag
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/kamui/rin/fragment/LookupFragment.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.kamui.rin.fragment

import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import android.os.Build
Expand Down
170 changes: 0 additions & 170 deletions app/src/main/res/drawable/ic_launcher_background.xml

This file was deleted.

30 changes: 20 additions & 10 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="41.37931"
android:viewportHeight="41.37931"
android:tint="#E6E6E6">
<group
android:translateX="8.689655"
android:translateY="8.689655">
<path
android:fillColor="#FF000000"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
</group>
android:viewportWidth="108"
android:viewportHeight="108"
android:tint="#F5F5F5">
<group android:scaleX="1.9575"
android:scaleY="1.9575"
android:translateX="30.51"
android:translateY="30.51">
<path
android:fillColor="@android:color/white"
android:pathData="M21,5c-1.11,-0.35 -2.33,-0.5 -3.5,-0.5c-1.95,0 -4.05,0.4 -5.5,1.5c-1.45,-1.1 -3.55,-1.5 -5.5,-1.5S2.45,4.9 1,6v14.65c0,0.25 0.25,0.5 0.5,0.5c0.1,0 0.15,-0.05 0.25,-0.05C3.1,20.45 5.05,20 6.5,20c1.95,0 4.05,0.4 5.5,1.5c1.35,-0.85 3.8,-1.5 5.5,-1.5c1.65,0 3.35,0.3 4.75,1.05c0.1,0.05 0.15,0.05 0.25,0.05c0.25,0 0.5,-0.25 0.5,-0.5V6C22.4,5.55 21.75,5.25 21,5zM21,18.5c-1.1,-0.35 -2.3,-0.5 -3.5,-0.5c-1.7,0 -4.15,0.65 -5.5,1.5V8c1.35,-0.85 3.8,-1.5 5.5,-1.5c1.2,0 2.4,0.15 3.5,0.5V18.5z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M17.5,10.5c0.88,0 1.73,0.09 2.5,0.26V9.24C19.21,9.09 18.36,9 17.5,9c-1.7,0 -3.24,0.29 -4.5,0.83v1.66C14.13,10.85 15.7,10.5 17.5,10.5z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M13,12.49v1.66c1.13,-0.64 2.7,-0.99 4.5,-0.99c0.88,0 1.73,0.09 2.5,0.26V11.9c-0.79,-0.15 -1.64,-0.24 -2.5,-0.24C15.8,11.66 14.26,11.96 13,12.49z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M17.5,14.33c-1.7,0 -3.24,0.29 -4.5,0.83v1.66c1.13,-0.64 2.7,-0.99 4.5,-0.99c0.88,0 1.73,0.09 2.5,0.26v-1.52C19.21,14.41 18.36,14.33 17.5,14.33z"/>
</group>
</vector>
31 changes: 0 additions & 31 deletions app/src/main/res/layout/activity_settings.xml

This file was deleted.

9 changes: 5 additions & 4 deletions app/src/main/res/layout/activity_word_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
android:id="@+id/wordTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Title"
android:text=""
android:textAppearance="?attr/textAppearanceHeadline6"
android:textIsSelectable="true"
android:textSize="22sp" />
Expand All @@ -61,7 +61,7 @@
android:layout_height="match_parent"
android:gravity="end"
android:paddingTop="5dp"
android:text="Title"
android:text=""
android:textAlignment="textEnd"
android:textAppearance="?attr/textAppearanceHeadline2"
android:textSize="18sp" />
Expand Down Expand Up @@ -143,7 +143,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_scrollFlags="scroll|enterAlways"
app:title="JP Dictionary"
app:title="Rin"
app:titleTextColor="#f0f0f0" />

<ImageButton
Expand All @@ -158,6 +158,7 @@
app:layout_constraintBottom_toBottomOf="@+id/toolbar"
app:layout_constraintEnd_toEndOf="@+id/toolbar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0" />
app:layout_constraintVertical_bias="1.0"
android:layout_marginRight="16dp" />

</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/layout_listentry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
android:id="@+id/wordTextView"
android:layout_width="214dp"
android:layout_height="wrap_content"
android:text="Title"
android:text=""
android:textAppearance="?attr/textAppearanceHeadline6" />

<TextView
Expand All @@ -49,7 +49,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingTop="3dp"
android:text="Text"
android:text=""
android:textAlignment="textEnd"
android:gravity="end" />

Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/menu/word_app_bar.xml

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
4 changes: 2 additions & 2 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/src/main/res/values-v21/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,12 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowActivityTransitions">true</item>
</style>

<style name="AppTheme.Toolbar" parent="Theme.AppCompat.Light">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:textColorPrimary">@color/white</item>
<item name="android:textColorSecondary">@color/colorAccent</item>
</style>
</resources>
6 changes: 0 additions & 6 deletions app/src/main/res/values/arrays.xml

This file was deleted.

Loading

0 comments on commit 9368ece

Please sign in to comment.