소스 검색

new color scheme

master
Flo Smilari 3 년 전
부모
커밋
5f6eb4686e
25개의 변경된 파일75개의 추가작업 그리고 37개의 파일을 삭제
  1. BIN
      .gradle/7.3.3/executionHistory/executionHistory.bin
  2. BIN
      .gradle/7.3.3/executionHistory/executionHistory.lock
  3. BIN
      .gradle/7.3.3/fileHashes/fileHashes.bin
  4. BIN
      .gradle/7.3.3/fileHashes/fileHashes.lock
  5. BIN
      .gradle/7.3.3/fileHashes/resourceHashesCache.bin
  6. BIN
      .gradle/buildOutputCleanup/buildOutputCleanup.lock
  7. 3
    2
      .idea/misc.xml
  8. 17
    14
      .idea/workspace.xml
  9. 2
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/ArcherySetupConfigurationActivity.java
  10. 2
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java
  11. 2
    0
      app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/SightConfigurationActivity.java
  12. 5
    0
      app/src/main/res/color/fita_tabs_icon_color_selector.xml
  13. 9
    0
      app/src/main/res/drawable-v24/as_icon_backgrd.xml
  14. 4
    4
      app/src/main/res/drawable/side_nav_bar.xml
  15. 1
    1
      app/src/main/res/layout/activity_equipment_configuration.xml
  16. 1
    1
      app/src/main/res/layout/activity_riser_configuration.xml
  17. 1
    1
      app/src/main/res/layout/activity_sight_configuration.xml
  18. 1
    0
      app/src/main/res/layout/content_main.xml
  19. 3
    1
      app/src/main/res/layout/fragment_calcsight.xml
  20. 4
    4
      app/src/main/res/layout/fragment_calcsight_parameters.xml
  21. 1
    1
      app/src/main/res/layout/fragment_calcsight_sightsetting.xml
  22. 3
    3
      app/src/main/res/layout/fragment_equipment_choose.xml
  23. 3
    3
      app/src/main/res/layout/fragment_userguide.xml
  24. 11
    0
      app/src/main/res/values/colors.xml
  25. 2
    2
      app/src/main/res/values/themes.xml

BIN
.gradle/7.3.3/executionHistory/executionHistory.bin 파일 보기


BIN
.gradle/7.3.3/executionHistory/executionHistory.lock 파일 보기


BIN
.gradle/7.3.3/fileHashes/fileHashes.bin 파일 보기


BIN
.gradle/7.3.3/fileHashes/fileHashes.lock 파일 보기


BIN
.gradle/7.3.3/fileHashes/resourceHashesCache.bin 파일 보기


BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock 파일 보기


+ 3
- 2
.idea/misc.xml 파일 보기

@@ -3,6 +3,7 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable-v24/as_icon_backgrd.xml" value="0.352" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable-v24/avd_anim.xml" value="0.2825" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable-v24/ic_launcher_round.xml" value="0.25" />
@@ -37,7 +38,7 @@
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/drawable/side_nav_bar.xml" value="0.285" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_default_settings.xml" value="0.25" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_equipment_configuration.xml" value="0.1994535519125683" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_main.xml" value="0.28072916666666664" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_main.xml" value="0.22" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_riser_configuration.xml" value="0.2" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_sight_configuration.xml" value="0.1994535519125683" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_test_basic.xml" value="0.15833333333333333" />
@@ -45,7 +46,7 @@
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_user_guide_riser.xml" value="0.2" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/activity_user_guide_sight.xml" value="0.22" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/app_bar_main.xml" value="0.15" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/content_main.xml" value="0.14" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/content_main.xml" value="0.2" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/content_test_basic.xml" value="0.15833333333333333" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_about.xml" value="0.22" />
<entry key="..\:/Work/Java Projects/Android/RecurveBowSight/V2/app/src/main/res/layout/fragment_calcsight.xml" value="0.15812841530054644" />

+ 17
- 14
.idea/workspace.xml 파일 보기

@@ -29,20 +29,21 @@
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/RBSMainActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/ArcherySetupConfigurationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/ArcherySetupConfigurationActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/SightConfigurationActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/SightConfigurationActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideEquipmentActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideArcherySetupActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideRiserActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideRiserActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideSightActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserGuideSightActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/ch/spherIC/recurvebowsight/ui/userguide/UserguideFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_user_guide_archerysetup.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_user_guide_archerysetup.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_user_guide_sight.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_user_guide_sight.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/menu/main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/main.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/side_nav_bar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/side_nav_bar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_equipment_configuration.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_equipment_configuration.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_riser_configuration.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_riser_configuration.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_sight_configuration.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_sight_configuration.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_calcsight.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_calcsight.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_calcsight_parameters.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_calcsight_parameters.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_calcsight_sightsetting.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_calcsight_sightsetting.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_equipment_choose.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_equipment_choose.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_userguide.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_userguide.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/themes.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/themes.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -60,8 +61,8 @@
<list>
<option value="layoutResourceFile" />
<option value="Class" />
<option value="valueResourceFile" />
<option value="resourceFile" />
<option value="valueResourceFile" />
</list>
</option>
</component>
@@ -101,6 +102,8 @@
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/androidx.viewpager2/viewpager2/1.0.0/3c3569044e6969f1ee5c3aa03b08e6717a2d782f/viewpager2-1.0.0-sources.jar!/androidx/viewpager2/widget/ViewPager2.java_ViewPager2_DIMENSIONS" value="1080&#10;1920" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.flexbox/flexbox/3.0.0/ab0cfea1daeb94f54c8f0b4f5d1e34882d97e37b/flexbox-3.0.0-sources.jar!/com/google/android/flexbox/FlexboxLayout.java_FlexboxLayout_DIMENSIONS" value="1080&#10;1920" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.flexbox/flexbox/3.0.0/ab0cfea1daeb94f54c8f0b4f5d1e34882d97e37b/flexbox-3.0.0-sources.jar!/com/google/android/flexbox/FlexboxLayout.java_SELECTED" value="FlexboxLayout" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.6.1/d4d703885d24c61bc0ec39a9a705969e41d773ef/material-1.6.1-sources.jar!/com/google/android/material/tabs/TabLayout.java_SELECTED" value="TabLayout" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.6.1/d4d703885d24c61bc0ec39a9a705969e41d773ef/material-1.6.1-sources.jar!/com/google/android/material/tabs/TabLayout.java_TabLayout_DIMENSIONS" value="1080&#10;1920" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.6.1/d4d703885d24c61bc0ec39a9a705969e41d773ef/material-1.6.1-sources.jar!/com/google/android/material/textfield/TextInputLayout.java_SELECTED" value="TextInputLayout" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.6.1/d4d703885d24c61bc0ec39a9a705969e41d773ef/material-1.6.1-sources.jar!/com/google/android/material/textfield/TextInputLayout.java_TextInputLayout_DIMENSIONS" value="1080&#10;1920" />
<property name="android-custom-viewC:/Users/FSmilari/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.6.1/d4d703885d24c61bc0ec39a9a705969e41d773ef/material-1.6.1-sources.jar!/com/google/android/material/textview/MaterialTextView.java_MaterialTextView_DIMENSIONS" value="1080&#10;1920" />
@@ -132,7 +135,7 @@
<property name="code.cleanup.on.save" value="true" />
<property name="format.on.save" value="true" />
<property name="last_directory_selection" value="$PROJECT_DIR$/app/src/main/res/drawable" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/res/drawable" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/res/drawable-v24" />
<property name="optimize.imports.on.save" value="true" />
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.Java" />
</component>
@@ -141,11 +144,11 @@
<recent name="ch.spherIC.recurvebowsight.ui.configuration" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\res\drawable-v24" />
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\res\drawable" />
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\java\ch\spherIC\recurvebowsight\components" />
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\java\ch\spherIC\recurvebowsight\ui\calcsight" />
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\res\layout" />
<recent name="Z:\Work\Java Projects\Android\RecurveBowSight\V2\app\src\main\java\ch\spherIC\recurvebowsight\utilities" />
</key>
<key name="android.template.1093395407">
<recent name="ch.spherIC.recurvebowsight" />

+ 2
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/ArcherySetupConfigurationActivity.java 파일 보기

@@ -59,7 +59,9 @@ public class ArcherySetupConfigurationActivity extends AppCompatActivity {
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
MenuItem menuItemSettings = menu.findItem(R.id.action_settings);
MenuItem menuItemHelp = menu.findItem(R.id.action_help);
menuItemSettings.setEnabled(false);
menuItemHelp.setEnabled(true);
return true;
}

+ 2
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/RiserConfigurationActivity.java 파일 보기

@@ -53,7 +53,9 @@ public class RiserConfigurationActivity extends AppCompatActivity {
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
MenuItem menuItemSettings = menu.findItem(R.id.action_settings);
MenuItem menuItemHelp = menu.findItem(R.id.action_help);
menuItemSettings.setEnabled(false);
menuItemHelp.setEnabled(true);
return true;
}

+ 2
- 0
app/src/main/java/ch/spherIC/recurvebowsight/ui/configuration/SightConfigurationActivity.java 파일 보기

@@ -53,7 +53,9 @@ public class SightConfigurationActivity extends AppCompatActivity {
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
MenuItem menuItemSettings = menu.findItem(R.id.action_settings);
MenuItem menuItemHelp = menu.findItem(R.id.action_help);
menuItemSettings.setEnabled(false);
menuItemHelp.setEnabled(true);
return true;
}

+ 5
- 0
app/src/main/res/color/fita_tabs_icon_color_selector.xml 파일 보기

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/fita_red" android:state_selected="true" />
<item android:color="@color/white" />
</selector>

+ 9
- 0
app/src/main/res/drawable-v24/as_icon_backgrd.xml 파일 보기

@@ -0,0 +1,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="135"
android:startColor="@color/fita_yellow"
android:centerColor="@color/android_yellow"
android:endColor="@color/fita_red"
android:type="linear" />
</shape>

+ 4
- 4
app/src/main/res/drawable/side_nav_bar.xml 파일 보기

@@ -1,9 +1,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="135"
android:centerColor="#009688"
android:endColor="#00695C"
android:startColor="#4DB6AC"
android:angle="180"
android:startColor="@color/fita_blue"
android:centerColor="@color/fita_blue_dark"
android:endColor="@color/purple_700"
android:type="linear" />
</shape>

+ 1
- 1
app/src/main/res/layout/activity_equipment_configuration.xml 파일 보기

@@ -27,7 +27,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@color/purple_700"
android:background="@color/fita_blue_dark"
android:padding="4dp"
android:text="@string/asTitleArcherySetupConfig"
android:textAppearance="@style/TextAppearance.AppCompat.Large"

+ 1
- 1
app/src/main/res/layout/activity_riser_configuration.xml 파일 보기

@@ -27,7 +27,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@color/purple_700"
android:background="@color/fita_blue_dark"
android:padding="4dp"
android:text="@string/rcTitleRiserConfig"
android:textAppearance="@style/TextAppearance.AppCompat.Large"

+ 1
- 1
app/src/main/res/layout/activity_sight_configuration.xml 파일 보기

@@ -27,7 +27,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@color/purple_700"
android:background="@color/fita_blue_dark"
android:padding="4dp"
android:text="@string/scTitleSightConfig"
android:textAppearance="@style/TextAppearance.AppCompat.Large"

+ 1
- 0
app/src/main/res/layout/content_main.xml 파일 보기

@@ -12,6 +12,7 @@
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:outlineAmbientShadowColor="#0089E4"
app:defaultNavHost="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"

+ 3
- 1
app/src/main/res/layout/fragment_calcsight.xml 파일 보기

@@ -16,7 +16,9 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tabIconTint="@color/white">
app:tabIconTint="@color/fita_tabs_icon_color_selector"
app:tabIndicatorColor="@color/fita_red"
app:tabTextColor="@color/fita_tabs_icon_color_selector">

<com.google.android.material.tabs.TabItem
android:layout_width="match_parent"

+ 4
- 4
app/src/main/res/layout/fragment_calcsight_parameters.xml 파일 보기

@@ -30,7 +30,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@color/purple_700"
android:background="@color/fita_blue_dark"
android:padding="4dp"
android:text="@string/titleBowAndArrowParams"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
@@ -48,7 +48,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@color/purple_700"
android:background="@color/fita_blue_dark"
android:padding="4dp"
android:text="@string/titleAtmosphericalParams"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
@@ -66,7 +66,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@color/purple_700"
android:background="@color/fita_blue_dark"
android:padding="4dp"
android:text="@string/titleShootingParams"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
@@ -84,7 +84,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@color/purple_700"
android:background="@color/fita_blue_dark"
android:padding="4dp"
android:text="@string/titleCalculationParams"
android:textAppearance="@style/TextAppearance.AppCompat.Large"

+ 1
- 1
app/src/main/res/layout/fragment_calcsight_sightsetting.xml 파일 보기

@@ -28,7 +28,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@color/purple_700"
android:background="@color/fita_blue_dark"
android:padding="4dp"
android:text="@string/titleSightConfig"
android:textAppearance="@style/TextAppearance.AppCompat.Large"

+ 3
- 3
app/src/main/res/layout/fragment_equipment_choose.xml 파일 보기

@@ -13,7 +13,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:backgroundTint="@color/purple_700"
android:backgroundTint="@color/fita_blue_dark"
app:cardCornerRadius="20dp"
app:cardElevation="10dp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -33,7 +33,7 @@
android:layout_marginEnd="4dp"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
app:cardBackgroundColor="#00b4e4"
app:cardBackgroundColor="@color/fita_blue"
app:cardCornerRadius="16dp"
app:cardElevation="0dp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -117,7 +117,7 @@
android:id="@+id/setup_image"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/side_nav_bar"
android:background="@drawable/as_icon_backgrd"
android:contentDescription="@string/menu_equipment"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

+ 3
- 3
app/src/main/res/layout/fragment_userguide.xml 파일 보기

@@ -32,7 +32,7 @@
android:background="@android:drawable/btn_default"
android:clickable="true"
android:hapticFeedbackEnabled="true"
app:cardBackgroundColor="#00b4e4"
app:cardBackgroundColor="@color/fita_blue"
app:cardCornerRadius="16dp"
app:cardElevation="10dp"
app:contentPadding="8dp"
@@ -62,7 +62,7 @@
android:background="@android:drawable/btn_default"
android:clickable="true"
android:hapticFeedbackEnabled="true"
app:cardBackgroundColor="#00b4e4"
app:cardBackgroundColor="@color/fita_blue"
app:cardCornerRadius="16dp"
app:cardElevation="10dp"
app:contentPadding="8dp"
@@ -95,7 +95,7 @@
android:background="@android:drawable/btn_default"
android:clickable="true"
android:hapticFeedbackEnabled="true"
app:cardBackgroundColor="#00b4e4"
app:cardBackgroundColor="@color/fita_blue"
app:cardCornerRadius="16dp"
app:cardElevation="10dp"
app:contentPadding="8dp"

+ 11
- 0
app/src/main/res/values/colors.xml 파일 보기

@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="fita_yellow">#FFE552</color>
<color name="fita_red">#F65058</color>
<color name="fita_blue">#00b4e4</color>
<color name="fita_blue_dark">#1156CC</color>

<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
@@ -18,4 +23,10 @@
<color name="android_red">#FFFF4444</color>
<color name="android_red_dark">#FFCC0000</color>

<!-- <color name="fita_tab_icon_color_selector">
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/fita_red" android:state_selected="true" />
<item android:color="@color/white" />
</selector>
</color>-->
</resources>

+ 2
- 2
app/src/main/res/values/themes.xml 파일 보기

@@ -10,8 +10,8 @@
<!-- Base application theme. -->
<style name="Theme.RecurveBowSight" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorPrimary">@color/fita_blue_dark</item>
<item name="colorPrimaryVariant">@color/fita_blue</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>

Loading…
취소
저장