浏览代码

added app logo, snackbar logo and change success color to green

Khubaib 1 年之前
父节点
当前提交
4077d83d96

+ 1 - 1
.idea/deploymentTargetDropDown.xml

@@ -18,7 +18,7 @@
               </deviceKey>
             </Target>
           </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-04-20T23:46:53.708745435Z" />
+          <timeTargetWasSelectedWithDropDown value="2024-04-21T12:04:35.123570812Z" />
         </State>
       </entry>
     </value>

+ 2 - 2
app/src/main/AndroidManifest.xml

@@ -27,9 +27,9 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/app_logo_square"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/app_logo_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.FastestVPN"
         tools:targetApi="31"

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/screens/ForgotPassword.kt

@@ -93,7 +93,7 @@ fun ForgotPassword(navHostController: NavHostController) {
 //        contentAlignment = Alignment.Center
 
     ) {
-        ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
+        ShowCustomSnackBar(snackBarState, R.color.switch_green, R.color.white)
         ShowCustomSnackBar(snackBarStateRed, R.color.Red, R.color.white)
 
         Column (

+ 2 - 2
app/src/main/java/com/vpn/fastestvpnservice/screens/LoginScreen.kt

@@ -135,7 +135,7 @@ fun Login(navHostController: NavHostController) {
                         }
                     },
             ) {
-                ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
+                ShowCustomSnackBar(snackBarState, R.color.switch_green, R.color.white)
                 ShowCustomSnackBar(snackBarStateRed, R.color.Red, R.color.white)
 
                 if (loginViewModel.liveDataLoginStatus.value == true) {
@@ -701,7 +701,7 @@ fun ColumnScope.SignInButton(
                 response.message?.let {
 //                    Log.d("test_login_msg", "${response.message}")
                     coroutineScope.launch {
-                        snackBarState.showSnackbar(it)
+                        snackBarStateRed.showSnackbar(it)
                     }
                 }
             }

+ 2 - 2
app/src/main/java/com/vpn/fastestvpnservice/screens/SignUpScreen.kt

@@ -131,7 +131,7 @@ fun SignUp(navHostController: NavHostController) {
                     }
                     ,
             ) {
-                ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
+                ShowCustomSnackBar(snackBarState, R.color.switch_green, R.color.white)
                 ShowCustomSnackBar(snackBarStateRed, R.color.Red, R.color.white)
 
                 if (signUpViewModel.liveDataSignUpStatus.value == true) {
@@ -726,7 +726,7 @@ fun ColumnScope.SignUpButton(
             } else {
                response.message?.let {
                    coroutineScope.launch {
-                       snackBarState.showSnackbar(it)
+                       snackBarStateRed.showSnackbar(it)
                    }
                }
 //                Toast.makeText(context, response.message, Toast.LENGTH_SHORT).show()

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/screens/accountScreensAll/ChangePasswordScreen.kt

@@ -97,7 +97,7 @@ fun ChangePassword(navHostController: NavHostController) {
                 }
             }
     ) {
-        ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
+        ShowCustomSnackBar(snackBarState, R.color.switch_green, R.color.white)
         ShowCustomSnackBar(snackBarStateRed, R.color.Red, R.color.white)
 
         HeaderRowCP(navHostController = navHostController)

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/screens/helpScreensAll/EmailUsScreen.kt

@@ -64,7 +64,7 @@ fun EmailUsScreen(navHostController: NavHostController) {
             .background(MaterialTheme.colorScheme.onPrimary)
             .fillMaxSize()
     ) {
-        ShowCustomSnackBar(snackBarState, R.color.yellow_text, R.color.dark_blue_gray_text)
+        ShowCustomSnackBar(snackBarState, R.color.switch_green, R.color.white)
         ShowCustomSnackBar(snackBarStateRed, R.color.Red, R.color.white)
 
         Column(

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/views/CustomSnackBar.kt

@@ -39,7 +39,7 @@ fun ShowCustomSnackBar(snackBarState: SnackbarHostState, color: Int, textColor:
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = Modifier
                 ) {
-                    Icon(painter = painterResource(id = R.drawable.logo_black),
+                    Icon(painter = painterResource(id = R.drawable.app_logo_square),
                         contentDescription = "Error",
                         tint = Color.Unspecified,
                         modifier = Modifier.size(16.dp)

二进制
app/src/main/res/drawable/app_logo_round.png


二进制
app/src/main/res/drawable/app_logo_square.png