Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose)
alias(libs.plugins.hilt)
alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.ksp)
}
Expand Down Expand Up @@ -115,7 +114,6 @@ dependencies {
testImplementation(platform(libs.androidx.compose.bom))
testImplementation(libs.androidx.compose.ui.test.junit4)
testImplementation(libs.androidx.navigation.testing)
testImplementation(libs.hilt.android.testing)
testImplementation(libs.kotlin.test)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.robolectric)
Expand Down
19 changes: 2 additions & 17 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,22 +1,7 @@
-dontwarn org.bouncycastle.jsse.BCSSLParameters
-dontwarn org.bouncycastle.jsse.BCSSLSocket
-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
-dontwarn org.conscrypt.Conscrypt$Version
-dontwarn org.conscrypt.Conscrypt
-dontwarn org.conscrypt.ConscryptHostnameVerifier
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
-dontwarn org.openjsse.net.ssl.OpenJSSE

# Fix for Retrofit issue https://github.com/square/retrofit/issues/3751
# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
# Keep the generic signature of Call (R8 full mode strips signatures from non-kept items).
# Retrofit's own rules already keep Response and kotlin.coroutines.Continuation.
-keep,allowobfuscation,allowshrinking interface retrofit2.Call
-keep,allowobfuscation,allowshrinking class retrofit2.Response

# With R8 full mode generic signatures are stripped for classes that are not
# kept. Suspend functions are wrapped in continuations where the type argument
# is used.
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation

# Keep DataStore fields
-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite* {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.nativeapptemplate.nativeapptemplatefree.di.modules

import androidx.tracing.trace
import com.nativeapptemplate.nativeapptemplatefree.BuildConfig
import com.nativeapptemplate.nativeapptemplatefree.NativeAppTemplateConstants
import com.nativeapptemplate.nativeapptemplatefree.data.item_tag.ItemTagApi
Expand All @@ -17,7 +16,6 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import kotlinx.serialization.json.Json
import okhttp3.Call
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
Expand Down Expand Up @@ -89,21 +87,6 @@ class NetModule {

@Provides
fun provideItemTagApi(retrofit: Retrofit): ItemTagApi = ItemTagApi.create(retrofit)

@Provides
@Singleton
fun okHttpCallFactory(): Call.Factory = trace("NativeAppTemplateOkHttpClient") {
OkHttpClient.Builder()
.addInterceptor(
HttpLoggingInterceptor()
.apply {
if (BuildConfig.DEBUG) {
setLevel(HttpLoggingInterceptor.Level.BODY)
}
},
)
.build()
}
}

/**
Expand Down
63 changes: 0 additions & 63 deletions app/src/main/res/drawable/ic_placeholder_default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

This file was deleted.

Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 0 additions & 6 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,13 @@
<string name="change_app_language_in_settings">端末の設定で変更</string>
<string name="app_language_emails_too">メールもこの言語で届きます。</string>
<string name="not_connected">⚠️ インターネットに接続されていません</string>
<string name="instructions">手順</string>
<string name="open">開く</string>
<string name="are_you_sure">よろしいですか?</string>
<string name="full_name">名前</string>
<string name="full_name_is_required">名前を入力してください。</string>
<string name="email_is_required">メールアドレスを入力してください。</string>
<string name="email_is_invalid">メールアドレスの形式が正しくありません。</string>
<string name="password_is_required">パスワードを入力してください。</string>
<string name="password_is_invalid">パスワードが正しくありません。</string>
<string name="role">権限</string>
<string name="unauthorized">この操作を行う権限がありません。</string>
<string name="cancel">キャンセル</string>
<string name="button_label_ok">OK</string>
<!-- The button on the Accept Terms / Accept Privacy screens. -->
<string name="accept">同意する</string>
Expand Down Expand Up @@ -83,7 +78,6 @@
<string name="add_shop">店舗を追加</string>
<string name="shops">店舗</string>
<string name="shop_name">店舗名</string>
<string name="shop_name_is_required">店舗名を入力してください。</string>
<string name="shop_name_is_invalid">店舗名が正しくありません。</string>
<string name="shop_description_is_invalid">店舗の説明が正しくありません。</string>
<string name="shop_name_help">名前は1〜%1$d文字で入力してください。</string>
Expand Down
10 changes: 2 additions & 8 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,13 @@
<string name="language_english" translatable="false">English</string>
<string name="language_japanese" translatable="false">日本語</string>
<string name="not_connected">⚠️ You aren’t connected to the internet</string>
<string name="instructions">Instructions</string>
<string name="open">Open</string>
<string name="are_you_sure">Are you sure?</string>
<string name="full_name">Full Name</string>
<string name="full_name_is_required">Full name is required.</string>
<string name="email_is_required">Email is required.</string>
<string name="email_is_invalid">Email is invalid.</string>
<string name="password_is_required">Password is required.</string>
<string name="password_is_invalid">Password is invalid.</string>
<string name="role">Role</string>
<string name="unauthorized">You are not authorized to perform this action.</string>
<string name="cancel">Cancel</string>
<string name="button_label_ok">OK</string>
<string name="accept">Accept</string>

Expand All @@ -51,13 +46,13 @@
<string name="forgot_password">Forgot your password?</string>

<!-- Forgot Password screen -->
<string name="sent_reset_password_instruction">An email has been sent the email containing instructions for resetting your password."</string>
<string name="sent_reset_password_instruction">An email with instructions for resetting your password has been sent.</string>
<string name="button_send_me_reset_password_instructions">Send me reset password instructions</string>

<!-- Resend Confirmation Instructions screen -->
<string name="button_send_me_confirmation_instructions">Resend confirmation instructions</string>
<string name="didnt_receive_confirmation_instructions">Didn\'t receive confirmation instructions?</string>
<string name="sent_confirmation_instruction">An email has been sent the email containing instructions for confirming your email address.</string>
<string name="sent_confirmation_instruction">An email with instructions for confirming your email address has been sent.</string>

<!-- Need App Updates screen -->
<string name="update_app">Update App</string>
Expand All @@ -78,7 +73,6 @@
<string name="add_shop">Add Shop</string>
<string name="shops">Shops</string>
<string name="shop_name">Shop Name</string>
<string name="shop_name_is_required">Shop name is required.</string>
<string name="shop_name_is_invalid">Shop name is invalid.</string>
<string name="shop_description_is_invalid">Shop description is invalid.</string>
<string name="shop_name_help">Name must be 1-%1$d characters.</string>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading